Web: Files: Removed empty page when deleted all files at last page.

ONLYOFFICE · Nov 8, 2021 · c30597f · c30597f
1 parent 9d0de00
commit c30597f
Showing 1 changed file with 31 additions and 7 deletions.
diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js
@@ -56,15 +56,39 @@ class FilesActionStore {
     }
   };
 
-  updateCurrentFolder = () => {
+  isEmptyLastPageAfterOperation = (selectionLength) => {
+    const { filter, files, folders } = this.filesStore;
+
+    return (
+      filter.page > 0 &&
+      !filter.hasNext() &&
+      selectionLength === files.length + folders.length
+    );
+  };
+
+  updateCurrentFolder = (selectionLength) => {
     const {
       clearSecondaryProgressData,
     } = this.uploadDataStore.secondaryProgressDataStore;
 
     const { filter, fetchFiles } = this.filesStore;
-    fetchFiles(this.selectedFolderStore.id, filter, true, true).finally(() =>
-      setTimeout(() => clearSecondaryProgressData(), TIMEOUT)
-    );
+
+    let newFilter;
+
+    if (
+      selectionLength &&
+      this.isEmptyLastPageAfterOperation(selectionLength)
+    ) {
+      newFilter = filter.clone();
+      newFilter.page--;
+    }
+
+    fetchFiles(
+      this.selectedFolderStore.id,
+      newFilter ? newFilter : filter,
+      true,
+      true
+    ).finally(() => setTimeout(() => clearSecondaryProgressData(), TIMEOUT));
   };
 
   deleteAction = async (translations, newSelection = null) => {
@@ -113,7 +137,7 @@ class FilesActionStore {
               label: translations.deleteOperation,
             };
             await this.uploadDataStore.loopFilesOperations(data, pbData);
-            this.updateCurrentFolder();
+            this.updateCurrentFolder(selection.length);
           }
         );
       } catch (err) {
@@ -312,7 +336,7 @@ class FilesActionStore {
         label: translations.deleteOperation,
         alert: false,
       });
-
+      debugger;
       try {
         await this.deleteItemOperation(isFile, itemId, translations);
       } catch (err) {
@@ -331,7 +355,7 @@ class FilesActionStore {
       icon: "trash",
       label: translations.deleteOperation,
     };
-
+    console.log("deleteItemOperation");
     if (isFile) {
       this.isMediaOpen();
       return deleteFile(itemId)