Merge pull request #924 from ONLYOFFICE/bugfix/fixed-folder-deletion

Bugfix/fixed folder deletion

packages/client/src/components/dialogs/DeleteDialog/index.js

@@ -95,10 +95,12 @@ const DeleteDialogComponent = (props) => {
   };
 
   const moveToTrashNoteText = () => {
+    const isFolder = selection[0]?.isFolder || !!selection[0]?.parentId;
+
     if (selection.length > 1) {
       return t("MoveToTrashItems");
     } else {
-      return !selection[0]?.isFolder
+      return !isFolder
         ? t("MoveToTrashFile")
         : personal
         ? ""

packages/client/src/pages/Home/Section/Header/index.js

@@ -267,6 +267,7 @@ class SectionHeaderContent extends React.Component {
         deleteOperation: t("Translations:DeleteOperation"),
         deleteFromTrash: t("Translations:DeleteFromTrash"),
         deleteSelectedElem: t("Translations:DeleteSelectedElem"),
+        FolderRemoved: t("Files:FolderRemoved"),
       };
 
       deleteAction(translations, [currentFolderId], true).catch((err) =>

packages/client/src/store/FilesActionsStore.js

@@ -296,7 +296,7 @@ class FilesActionStore {
               return toastr.success(translations.FolderRemoved);
             };
 
-            if (withPaging) {
+            if (withPaging || this.dialogsStore.isFolderActions) {
               this.updateCurrentFolder(fileIds, folderIds, false);
               showToast();
             } else {