diff --git a/packages/client/src/components/dialogs/DeleteDialog/index.js b/packages/client/src/components/dialogs/DeleteDialog/index.js index 7cceec8d04..ac24b746d6 100644 --- a/packages/client/src/components/dialogs/DeleteDialog/index.js +++ b/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 ? "" diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js index bab0f7d845..6f9ab7fb9b 100644 --- a/packages/client/src/pages/Home/Section/Header/index.js +++ b/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) => diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js index 0c999e306a..05198ff5c5 100644 --- a/packages/client/src/store/FilesActionsStore.js +++ b/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 {