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

Merge pull request #432 from ONLYOFFICE/bugfix/Bug53344

Browse Source 
Fix bug 53344: file selection after restore
This commit is contained in:
Nikita Gopienko 2021-10-27 13:53:24 +03:00 committed by GitHub
commit 3389d2035e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Client/src/store/FilesActionsStore.js
View File

@ -577,13 +577,14 @@ class FilesActionStore {
setConflictResolveDialogVisible,
setConflictResolveDialogItems,
} = this.dialogsStore;
const { setBufferSelection } = this.filesStore;
let conflicts;
try {
conflicts = await checkFileConflicts(destFolderId, folderIds, fileIds);
} catch (err) {
this.filesStore.setBufferSelection(null);
setBufferSelection(null);
return toastr.error(err.message ? err.message : err);
}
@ -595,10 +596,12 @@ class FilesActionStore {
try {
await this.uploadDataStore.itemOperationToFolder(operationData);
} catch (err) {
this.filesStore.setBufferSelection(null);
setBufferSelection(null);
return toastr.error(err.message ? err.message : err);
}
}
setBufferSelection(null);
};
isAvailableOption = (option) => {

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

@ -227,6 +227,9 @@ class FilesStore {
};
setSelected = (selected) => {
if (selected === "close" || selected === "none")
this.setBufferSelection(null);
this.selected = selected;
const files = this.files.concat(this.folders);
this.selection = this.getFilesBySelected(files, selected);