Fixed Bug 55056 - Client.Files. Removed the possibility of simultaneo…

…us operations with files.
ONLYOFFICE · Jan 24, 2022 · e865ee0 · e865ee0
1 parent 8863e41
commit e865ee0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js
@@ -663,8 +663,11 @@ class FilesActionStore {
     this.checkOperationConflict(operationData);
   };
 
-  checkFileConflicts = (destFolderId, folderIds, fileIds) =>
-    checkFileConflicts(destFolderId, folderIds, fileIds);
+  checkFileConflicts = (destFolderId, folderIds, fileIds) => {
+    this.filesStore.addActiveItems(fileIds);
+    this.filesStore.addActiveItems(null, folderIds);
+    return checkFileConflicts(destFolderId, folderIds, fileIds);
+  };
 
   setConflictDialogData = (conflicts, operationData) => {
     this.dialogsStore.setConflictResolveDialogItems(conflicts);
@@ -674,10 +677,7 @@ class FilesActionStore {
 
   checkOperationConflict = async (operationData) => {
     const { destFolderId, folderIds, fileIds } = operationData;
-    const { setBufferSelection, addActiveItems } = this.filesStore;
-
-    addActiveItems(fileIds);
-    addActiveItems(null, folderIds);
+    const { setBufferSelection } = this.filesStore;
 
     let conflicts;