Web: Files: Changed title for actions.

products/ASC.Files/Client/public/locales/ru/UploadPanel.json

@@ -2,5 +2,7 @@
   "Uploads": "Загрузки",
   "EnterPassword": "Введите пароль",
   "HideInput": "Скрыть ввод",
-  "Ready": "Готово"
+  "Ready": "Готово",
+  "UploadAndConvert": "Загрузки и конвертация",
+  "Conversion": "Конвертация"
 }

products/ASC.Files/Client/src/components/panels/UploadPanel/index.js

@@ -74,11 +74,19 @@ class UploadPanelComponent extends React.Component {
       uploadDataFiles,
       cancelUpload,
       cancelConversion,
+      isUploading,
+      isUploadingAndConversion,
     } = this.props;
 
     const visible = uploadPanelVisible;
     const zIndex = 310;
 
+    const title = isUploading
+      ? t("Uploads")
+      : isUploadingAndConversion
+      ? t("UploadAndConvert")
+      : t("Conversion");
+
     return (
       <StyledAsidePanel visible={visible}>
         <Backdrop
@@ -95,7 +103,7 @@ class UploadPanelComponent extends React.Component {
           <StyledContent>
             <StyledHeaderContent className="upload-panel_header-content">
               <Heading className="upload_panel-header" size="medium" truncate>
-                {t("Uploads")}
+                {title}
               </Heading>
               <div className="upload_panel-icons-container">
                 <div className="upload_panel-remove-icon">
@@ -159,6 +167,8 @@ export default inject(({ /* dialogsStore, */ uploadDataStore }) => {
     setUploadPanelVisible,
     files,
     primaryProgressDataStore,
+    isUploading,
+    isUploadingAndConversion,
   } = uploadDataStore;
 
   const { clearPrimaryProgressData } = primaryProgressDataStore;
@@ -176,5 +186,7 @@ export default inject(({ /* dialogsStore, */ uploadDataStore }) => {
     clearUploadedFiles,
     uploadDataFiles: files,
     clearPrimaryProgressData,
+    isUploading,
+    isUploadingAndConversion,
   };
 })(observer(UploadPanel));

products/ASC.Files/Client/src/store/UploadDataStore.js

@@ -41,6 +41,9 @@ class UploadDataStore {
   uploadPanelVisible = false;
   selectedUploadFile = [];
 
+  isUploading = false;
+  isUploadingAndConversion = false;
+
   constructor(
     formatsStore,
     treeFoldersStore,
@@ -100,6 +103,9 @@ class UploadDataStore {
     this.conversionPercent = 0;
     this.uploaded = true;
     this.converted = true;
+
+    this.isUploadingAndConversion = false;
+    this.isUploading = false;
   };
   removeFileFromList = (id) => {
     this.files = this.files.filter((obj) => {
@@ -115,6 +121,9 @@ class UploadDataStore {
       files: this.files.filter((x) => x.action !== "uploaded"),
     };
 
+    this.isUploadingAndConversion = false;
+    this.isUploading = false;
+
     this.setUploadData(uploadData);
   };
 
@@ -451,11 +460,19 @@ class UploadDataStore {
       convertSize += file.size;
     }
 
+    const countUploadingFiles = newFiles.length;
+    const countConversionFiles = this.tempConversionFiles.length;
+
+    if (countUploadingFiles && !countConversionFiles) {
+      this.isUploading = true;
+    } else {
+      this.isUploadingAndConversion = true;
+    }
     this.convertFilesSize = convertSize;
 
     //console.log("this.tempConversionFiles", this.tempConversionFiles);
 
-    if (this.tempConversionFiles.length)
+    if (countConversionFiles)
       this.settingsStore.hideConfirmConvertSave
         ? this.convertUploadedFiles(t)
         : this.dialogsStore.setConvertDialogVisible(true);
@@ -469,7 +486,7 @@ class UploadDataStore {
       converted: !!this.tempConversionFiles.length,
     };
 
-    if (this.uploaded && newFiles.length) {
+    if (this.uploaded && countUploadingFiles) {
       this.setUploadData(newUploadData);
       this.startUploadFiles(t);
     }
@@ -853,6 +870,8 @@ class UploadDataStore {
       } else {
         uploadData.files = [];
         uploadData.filesToConversion = [];
+        this.isUploadingAndConversion = false;
+        this.isUploading = false;
       }
 
       this.setUploadData(uploadData);