Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

packages/client/src/components/Article/MainButton/MobileView.js

@@ -62,6 +62,7 @@ const MobileView = ({
   onMainButtonClick,
   isRoomsFolder,
   mainButtonMobileVisible,
+  uploaded,
 }) => {
   const [isOpenButton, setIsOpenButton] = React.useState(false);
   const [percentProgress, setPercentProgress] = React.useState(0);
@@ -87,7 +88,7 @@ const MobileView = ({
     let currentPrimaryNumEl = primaryNumEl;
 
     const uploadedFileCount = files.filter(
-      (item) => item.percent >= 100 && !item.cancel,
+      (item) => item.percent === 100 && !item.cancel,
     ).length;
     const fileLength = files.filter((item) => !item.cancel).length;
 
@@ -124,7 +125,9 @@ const MobileView = ({
         icon: CrossSidebarReactSvgUrl,
         percent: primaryProgressDataPercent,
         status:
-          primaryProgressDataPercent === 100 && !primaryProgressDataErrors
+          primaryProgressDataPercent === 100 &&
+          !primaryProgressDataErrors &&
+          uploaded
             ? t("FilesUploaded")
             : `${uploadedFileCount}/${fileLength}`,
         onClick: showUploadPanel,
@@ -160,6 +163,7 @@ const MobileView = ({
     setPercentProgress(newPercentProgress);
     setProgressOptions([...newProgressOptions]);
   }, [
+    uploaded,
     files.length,
     showUploadPanel,
     clearUploadPanel,
@@ -206,6 +210,7 @@ export default inject(({ uploadDataStore, treeFoldersStore }) => {
     secondaryProgressDataStore,
     primaryProgressDataStore,
     clearUploadData,
+    uploaded,
   } = uploadDataStore;
 
   const {
@@ -243,5 +248,6 @@ export default inject(({ uploadDataStore, treeFoldersStore }) => {
     secondaryProgressDataStoreCurrentFilesCount,
     clearSecondaryProgressData,
     isRoomsFolder,
+    uploaded,
   };
 })(observer(MobileView));

packages/client/src/components/SpaceQuota/StyledComponent.js

@@ -7,13 +7,23 @@ const StyledBody = styled.div`
   max-width: max-content;
 
   display: flex;
+  flex-wrap: nowrap;
+
   p {
     padding-top: 8px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
   }
 
-  .combo-button {
-    padding-left: 8px;
-    padding-right: 0px;
+  .combobobox-space-quota {
+    flex: 1;
+    min-width: 0;
+    .combo-button {
+      padding-left: 8px;
+      padding-right: 0px;
+      width: auto;
+    }
   }
 `;
 

packages/client/src/components/SpaceQuota/index.js

@@ -148,11 +148,11 @@ const SpaceQuota = (props) => {
   }
 
   return (
-    <StyledBody hideColumns={hideColumns}>
+    <StyledBody hideColumns={hideColumns} className={className}>
       <Text fontWeight={600}>{usedQuota} / </Text>
 
       <ComboBox
-        className={className}
+        className="combobobox-space-quota"
         selectedOption={selectedOption}
         options={options}
         onSelect={onChange}

packages/client/src/store/UploadDataStore.js

@@ -959,7 +959,7 @@ class UploadDataStore {
       newPercent = this.getFilesPercent(uploadedSize);
     }
 
-    const percentCurrentFile = ((index + 1) / chunksLength) * 100;
+    const percentCurrentFile = (index / chunksLength) * 100;
 
     const fileIndex = this.uploadedFilesHistory.findIndex(
       (f) => f.uniqueId === this.files[indexOfFile].uniqueId