From 72d9b4a0df916a49648088adddda5b9dd924bf4d Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Tue, 2 Jul 2024 13:43:06 +0300
Subject: [PATCH] Fixed Bug 68940 - Rooms.FormRoom. When you click the Back
 button inside a Form room on the Start filling panel, a list of all rooms is
 displayed, including rooms from the Archive.

---
 .../shared/selectors/Files/FilesSelector.types.ts    |  1 +
 .../shared/selectors/Files/hooks/useFilesHelper.ts   | 12 ++++++++++--
 packages/shared/selectors/Files/index.tsx            |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/shared/selectors/Files/FilesSelector.types.ts b/packages/shared/selectors/Files/FilesSelector.types.ts
index 8ea8cd7552..8bd2e659a1 100644
--- a/packages/shared/selectors/Files/FilesSelector.types.ts
+++ b/packages/shared/selectors/Files/FilesSelector.types.ts
@@ -135,6 +135,7 @@ export type UseFilesHelpersProps = {
   setIsFirstLoad: (value: boolean) => void;
   withCreate: boolean;
   setSelectedItemId: (value: number | string) => void;
+  setSelectedItemType: (value?: "rooms" | "files") => void;
 };
 
 export type TUseInputItemHelper = {
diff --git a/packages/shared/selectors/Files/hooks/useFilesHelper.ts b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
index 87773b87de..0214849fac 100644
--- a/packages/shared/selectors/Files/hooks/useFilesHelper.ts
+++ b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
@@ -82,6 +82,7 @@ const useFilesHelper = ({
   setIsFirstLoad,
   withCreate,
   setSelectedItemId,
+  setSelectedItemType,
 }: UseFilesHelpersProps) => {
   const { t } = useTranslation(["Common"]);
 
@@ -341,14 +342,20 @@ const useFilesHelper = ({
               hotkey: "f",
               onCreateClick: () => addInputItem(t("NewFolder"), FolderSvgUrl),
               onBackClick: () => {
-                setSelectedItemId(current.parentId);
+                let isRooms;
                 setBreadCrumbs((val) => {
                   const newVal = [...val];
 
-                  newVal.pop();
+                  const item = newVal.pop();
+
+                  isRooms = !!item?.roomType;
 
                   return newVal;
                 });
+
+                if (isRooms) setSelectedItemType("rooms");
+
+                setSelectedItemId(current.parentId);
               },
             });
           } else {
@@ -430,6 +437,7 @@ const useFilesHelper = ({
       t,
       setSelectedItemId,
       rootThirdPartyId,
+      setSelectedItemType,
     ],
   );
 
diff --git a/packages/shared/selectors/Files/index.tsx b/packages/shared/selectors/Files/index.tsx
index 8487ca92d0..6df73c71aa 100644
--- a/packages/shared/selectors/Files/index.tsx
+++ b/packages/shared/selectors/Files/index.tsx
@@ -240,6 +240,7 @@ const FilesSelector = ({
     setIsInit,
     withCreate,
     setSelectedItemId,
+    setSelectedItemType,
   });
 
   const onClickBreadCrumb = React.useCallback(