Merge pull request #1753 from ONLYOFFICE/bugfix/fix-root-selection

Bugfix/fix root selection

packages/client/src/components/Article/Body/index.js

@@ -51,6 +51,7 @@ const ArticleBodyContent = (props) => {
     selectedFolderId,
     showArticleLoader,
     setIsBurgerLoading,
+    setSelection,
   } = props;
 
   const navigate = useNavigate();
@@ -80,6 +81,8 @@ const ArticleBodyContent = (props) => {
 
       let withTimer = !!selectedFolderId;
 
+      setSelection && setSelection([]);
+
       switch (folderId) {
         case myFolderId:
           const myFilter = FilesFilter.getDefault();
@@ -158,6 +161,7 @@ const ArticleBodyContent = (props) => {
       activeItemId,
       selectedFolderId,
       isAccounts,
+      setSelection,
     ]
   );
 
@@ -263,7 +267,7 @@ export default inject(
     selectedFolderStore,
     clientLoadingStore,
   }) => {
-    const { clearFiles } = filesStore;
+    const { clearFiles, setSelection } = filesStore;
     const {
       showArticleLoader,
 
@@ -319,6 +323,7 @@ export default inject(
       clearFiles,
       selectedFolderId,
       setIsBurgerLoading,
+      setSelection,
     };
   }
 )(withTranslation([])(observer(ArticleBodyContent)));

packages/client/src/store/FilesActionsStore.js

@@ -2136,7 +2136,7 @@ class FilesActionStore {
   };
 
   onClickBack = () => {
-    const { roomType } = this.selectedFolderStore;
+    const { roomType, ...rest } = this.selectedFolderStore;
     const { setSelectedNode } = this.treeFoldersStore;
     const { clearFiles } = this.filesStore;
 
@@ -2181,19 +2181,19 @@ class FilesActionStore {
 
       setSelectedNode(["common"]);
 
-      return navigate(path, { replace: true });
+      return window.DocSpace.navigate(path, { replace: true });
     }
 
     if (categoryType === CategoryType.Accounts) {
       const accountsFilter = AccountsFilter.getDefault();
-      params = accountsFilter.toUrlParams();
+      const params = accountsFilter.toUrlParams();
       const path = getCategoryUrl(CategoryType.Accounts);
 
       clearFiles();
 
       setSelectedNode(["accounts", "filter"]);
 
-      return navigate(`${path}?${params}`, { replace: true });
+      return window.DocSpace.navigate(`${path}?${params}`, { replace: true });
     }
   };
 
@@ -2202,13 +2202,22 @@ class FilesActionStore {
 
     const filter = RoomsFilter.getDefault();
 
-    const path = getCategoryUrl(categoryType);
+    const correctCategoryType =
+      categoryType === CategoryType.SharedRoom
+        ? CategoryType.Shared
+        : CategoryType.ArchivedRoom === categoryType
+        ? CategoryType.Archive
+        : categoryType;
+
+    const path = getCategoryUrl(correctCategoryType);
 
     const state = {
       title:
-        this.selectedFolderStore?.navigationPath[
-          this.selectedFolderStore?.navigationPath.length - 1
-        ]?.title || "",
+        (this.selectedFolderStore?.navigationPath &&
+          this.selectedFolderStore?.navigationPath[
+            this.selectedFolderStore?.navigationPath?.length - 1
+          ]?.title) ||
+        "",
       isRoot: true,
       rootFolderType: this.selectedFolderStore.rootFolderType,
     };
@@ -2255,7 +2264,7 @@ class FilesActionStore {
       setIsSectionFilterLoading(param);
     };
 
-    let id = this.selectedFolderStore.parentId;
+    const id = this.selectedFolderStore.parentId;
 
     const { navigationPath, rootFolderType } = this.selectedFolderStore;
 
@@ -2263,16 +2272,19 @@ class FilesActionStore {
 
     filter.folder = id;
 
+    const categoryType = getCategoryType(window.DocSpace.location);
+    const path = getCategoryUrl(categoryType, id);
+
     const state = {
-      title: navigationPath[0]?.title || "",
+      title: (navigationPath && navigationPath[0]?.title) || "",
       isRoot: navigationPath.length === 1,
       rootFolderType: rootFolderType,
     };
 
-    window.DocSpace.navigate(
-      `${window.DocSpace.location.pathname}?${filter.toUrlParams()}`,
-      { state, replace: true }
-    );
+    window.DocSpace.navigate(`${path}?${filter.toUrlParams()}`, {
+      state,
+      replace: true,
+    });
   };
 
   setGroupMenuBlocked = (blocked) => {