IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed update tree folders after remove

Browse Source
This commit is contained in:
Nikita Gopienko 2020-05-26 14:31:11 +03:00
parent b0ae0b5270
commit ead15da793
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
View File

@ -156,7 +156,7 @@ class SectionBodyContent extends React.Component {
const deleteProgress = res.find(x => x.id === id); const deleteProgress = res.find(x => x.id === id);
if(deleteProgress && deleteProgress.progress !== 100) { if(deleteProgress && deleteProgress.progress !== 100) {
setProgressValue(deleteProgress.progress); setProgressValue(deleteProgress.progress);
setTimeout(() => this.loopDeleteProgress(id, folderId), 1000); setTimeout(() => this.loopDeleteProgress(id, folderId, isFolder), 1000);
} else { } else {
fetchFiles(folderId, filter, store.dispatch).then(data => { fetchFiles(folderId, filter, store.dispatch).then(data => {
if (currentFolderType !== "Trash" && isFolder) { if (currentFolderType !== "Trash" && isFolder) {

3
products/ASC.Files/Client/src/store/files/selectors.js
View File

@ -168,7 +168,8 @@ const renameTreeFolder = (folders, newItems, currentFolder) => {
} }
const removeTreeFolder = (folders, newItems, foldersCount) => { 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; let currentFolder;
if(folders) { if(folders) {
currentFolder = folders.find((x) => x.id === folder.id); currentFolder = folders.find((x) => x.id === folder.id);