WEb: Files: Added folder tree reset.

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

@@ -99,8 +99,23 @@ class SelectFileDialogBody extends React.Component {
     this.setFilter();
   }
   componentWillUnmount() {
+    const {
+      resetTreeFolders,
+      setExpandedPanelKeys,
+      setDefaultSelectedFolder,
+      setFolderId,
+      setFile,
+    } = this.props;
     this.throttledResize && this.throttledResize.cancel();
     window.removeEventListener("resize", this.throttledResize);
+
+    if (resetTreeFolders) {
+      setExpandedPanelKeys(null);
+      setDefaultSelectedFolder();
+
+      setFolderId(null);
+      setFile(null);
+    }
   }
 
   getDisplayType = () => {
@@ -333,9 +348,13 @@ const SelectFileDialogWrapper = inject(
       setFolderId,
       setFile,
     } = selectedFilesStore;
-    const { setSelectedNode } = treeFoldersStore;
+
+    const { setSelectedNode, setExpandedPanelKeys } = treeFoldersStore;
     const { filter } = filesStore;
-    const { setSelectedFolder } = selectedFolderStore;
+    const {
+      setSelectedFolder,
+      toDefault: setDefaultSelectedFolder,
+    } = selectedFolderStore;
     return {
       storeFolderId,
       fileInfo,
@@ -344,6 +363,8 @@ const SelectFileDialogWrapper = inject(
       setSelectedFolder,
       setSelectedNode,
       filter,
+      setDefaultSelectedFolder,
+      setExpandedPanelKeys,
     };
   }
 )(

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

@@ -315,10 +315,23 @@ class SelectFolderModalDialog extends React.Component {
   };
 
   componentWillUnmount() {
+    const {
+      setExpandedPanelKeys,
+      setDefaultSelectedFolder,
+
+      resetTreeFolders,
+
+      dialogWithFiles,
+    } = this.props;
     if (this.throttledResize) {
       this.throttledResize && this.throttledResize.cancel();
       window.removeEventListener("resize", this.throttledResize);
     }
+
+    if (resetTreeFolders && !dialogWithFiles) {
+      setExpandedPanelKeys(null);
+      setDefaultSelectedFolder();
+    }
   }
   getDisplayType = () => {
     const displayType =
@@ -508,15 +521,29 @@ SelectFolderModalDialog.defaultProps = {
 };
 
 const SelectFolderDialogWrapper = inject(
-  ({ treeFoldersStore, selectedFolderStore, filesStore }) => {
+  ({
-    const { setSelectedNode } = treeFoldersStore;
+    treeFoldersStore,
+    selectedFolderStore,
+    selectedFilesStore,
+    filesStore,
+  }) => {
+    const { setSelectedNode, setExpandedPanelKeys } = treeFoldersStore;
     const { canCreate } = filesStore;
-    const { setSelectedFolder, id } = selectedFolderStore;
+    const {
+      setSelectedFolder,
+      id,
+      toDefault: setDefaultSelectedFolder,
+    } = selectedFolderStore;
+    const { setFolderId, setFile } = selectedFilesStore;
     return {
       setSelectedFolder,
       setSelectedNode,
       canCreate,
       storeFolderId: id,
+      setExpandedPanelKeys,
+      setDefaultSelectedFolder,
+      setFolderId,
+      setFile,
     };
   }
 )(

web/ASC.Web.Editor/src/Editor.jsx

@@ -682,6 +682,7 @@ const Editor = () => {
 
           {isFileDialogVisible && (
             <SelectFileDialog
+              resetTreeFolders
               onSelectFile={onSelectFile}
               isPanelVisible={isFileDialogVisible}
               onClose={onCloseFileDialog}
@@ -696,6 +697,7 @@ const Editor = () => {
 
           {isFolderDialogVisible && (
             <SelectFolderDialog
+              resetTreeFolders
               showButtons
               isPanelVisible={isFolderDialogVisible}
               isSetFolderImmediately