From 02c21e50ea1f7db81e845bc473acf2bba6586b27 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Wed, 17 Nov 2021 16:29:47 +0300 Subject: [PATCH] Web: Files: added file loader for emty trash operation --- .../Client/src/store/FilesActionsStore.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js index a6500e5168..e6aa85e708 100644 --- a/products/ASC.Files/Client/src/store/FilesActionsStore.js +++ b/products/ASC.Files/Client/src/store/FilesActionsStore.js @@ -138,10 +138,20 @@ class FilesActionStore { }; emptyTrash = async (translations) => { + const { + secondaryProgressDataStore, + loopFilesOperations, + clearActiveOperations, + } = this.uploadDataStore; const { setSecondaryProgressBarData, clearSecondaryProgressData, - } = this.uploadDataStore.secondaryProgressDataStore; + } = secondaryProgressDataStore; + const { addActiveItems, files, folders } = this.filesStore; + + const fileIds = files.map((f) => f.id); + const folderIds = folders.map((f) => f.id); + addActiveItems(fileIds, folderIds); setSecondaryProgressBarData({ icon: "trash", @@ -159,10 +169,11 @@ class FilesActionStore { icon: "trash", label: translations.deleteOperation, }; - await this.uploadDataStore.loopFilesOperations(data, pbData); + await loopFilesOperations(data, pbData, fileIds, folderIds); this.updateCurrentFolder(); }); } catch (err) { + clearActiveOperations(fileIds, folderIds); setSecondaryProgressBarData({ visible: true, alert: true,