From ead15da7937d1b836d2e9fb8b6329251591d6f63 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 26 May 2020 14:31:11 +0300 Subject: [PATCH] Web: Files: fixed update tree folders after remove --- .../Client/src/components/pages/Home/Section/Body/index.js | 2 +- products/ASC.Files/Client/src/store/files/selectors.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js index 19c6feea16..e0b31c91ac 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js @@ -156,7 +156,7 @@ class SectionBodyContent extends React.Component { const deleteProgress = res.find(x => x.id === id); if(deleteProgress && deleteProgress.progress !== 100) { setProgressValue(deleteProgress.progress); - setTimeout(() => this.loopDeleteProgress(id, folderId), 1000); + setTimeout(() => this.loopDeleteProgress(id, folderId, isFolder), 1000); } else { fetchFiles(folderId, filter, store.dispatch).then(data => { if (currentFolderType !== "Trash" && isFolder) { diff --git a/products/ASC.Files/Client/src/store/files/selectors.js b/products/ASC.Files/Client/src/store/files/selectors.js index a3314f81f8..3c422b2d05 100644 --- a/products/ASC.Files/Client/src/store/files/selectors.js +++ b/products/ASC.Files/Client/src/store/files/selectors.js @@ -168,7 +168,8 @@ const renameTreeFolder = (folders, newItems, currentFolder) => { } const removeTreeFolder = (folders, newItems, foldersCount) => { - for (let folder of newItems.folders) { + const newFolders = JSON.parse(JSON.stringify(newItems.folders)); + for (let folder of newFolders) { let currentFolder; if(folders) { currentFolder = folders.find((x) => x.id === folder.id);