Web: Files: moved TreeFolders selectedKeys to store

products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js

@@ -157,7 +157,8 @@ class TreeFolders extends React.Component {
       return false;
     }
 
-    if (draggableItems.find((x) => x.id === item.id)) return false;
+    if (!draggableItems || draggableItems.find((x) => x.id === item.id))
+      return false;
 
     // const isMy = rootFolderType === FolderType.USER;
     // const isCommon = rootFolderType === FolderType.COMMON;
@@ -462,7 +463,10 @@ TreeFolders.defaultProps = {
 };
 
 export default inject(
-  ({ auth, filesStore, treeFoldersStore, selectedFolderStore }, props) => {
+  (
+    { auth, filesStore, treeFoldersStore, selectedFolderStore },
+    { useDefaultSelectedKeys, selectedKeys }
+  ) => {
     const {
       filter,
       selection,
@@ -484,14 +488,6 @@ export default inject(
     } = treeFoldersStore;
     const { id /* rootFolderType */ } = selectedFolderStore;
 
-    const selectedNode = treeFoldersStore.selectedTreeNode;
-    const selectedKeys =
-      selectedNode.length > 0 &&
-      selectedNode[0] !== "@my" &&
-      selectedNode[0] !== "@common"
-        ? selectedNode
-        : [selectedFolderStore.id + ""];
-
     return {
       isAdmin: auth.isAdmin,
       isDesktop: auth.settingsStore.isDesktopClient,
@@ -502,10 +498,12 @@ export default inject(
       commonId: commonFolderId,
       isPrivacy: isPrivacyFolder,
       filter,
-      draggableItems: dragging ? selection : [],
+      draggableItems: dragging ? selection : null,
       expandedKeys,
       treeFolders,
-      selectedKeys: props.selectedKeys ? props.selectedKeys : selectedKeys,
+      selectedKeys: useDefaultSelectedKeys
+        ? treeFoldersStore.selectedKeys
+        : selectedKeys,
 
       setDragging,
       setIsLoading,

products/ASC.Files/Client/src/components/Article/Body/index.js

@@ -76,6 +76,7 @@ class ArticleBodyContent extends React.Component {
     ) : (
       <>
         <TreeFolders
+          useDefaultSelectedKeys
           onSelect={this.onSelect}
           data={treeFolders}
           onBadgeClick={this.onShowNewFilesPanel}

products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js

@@ -116,7 +116,6 @@ const OperationsPanelComponent = (props) => {
         </ModalDialog.Header>
         <ModalDialog.Body>
           <TreeFolders
-            selectedKeys={[]}
             expandedPanelKeys={expandedKeys}
             data={operationsFolders}
             filter={filter}

products/ASC.Files/Client/src/store/TreeFoldersStore.js

@@ -162,6 +162,16 @@ class TreeFoldersStore {
       );
     }
   }
+
+  get selectedKeys() {
+    const selectedKeys =
+      this.selectedTreeNode.length > 0 &&
+      this.selectedTreeNode[0] !== "@my" &&
+      this.selectedTreeNode[0] !== "@common"
+        ? this.selectedTreeNode
+        : [this.selectedFolderStore.id + ""];
+    return selectedKeys;
+  }
 }
 
 export default TreeFoldersStore;