From 5e64d624d8d01623441708942b7e369b551b876c Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 2 May 2024 12:43:59 +0300 Subject: [PATCH] Shared:Selectors:Files: fix opening isUserOnly --- packages/shared/selectors/Files/FilesSelector.types.ts | 1 + packages/shared/selectors/Files/hooks/useFilesHelper.ts | 8 +++++--- packages/shared/selectors/Files/index.tsx | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/shared/selectors/Files/FilesSelector.types.ts b/packages/shared/selectors/Files/FilesSelector.types.ts index 2aeb171850..e48713e8f9 100644 --- a/packages/shared/selectors/Files/FilesSelector.types.ts +++ b/packages/shared/selectors/Files/FilesSelector.types.ts @@ -107,6 +107,7 @@ export type UseFilesHelpersProps = { value: number | string | undefined | TBreadCrumb[], ) => void; isRoomsOnly: boolean; + isUserOnly?: boolean; rootThirdPartyId?: string; getRoomList?: ( startIndex: number, diff --git a/packages/shared/selectors/Files/hooks/useFilesHelper.ts b/packages/shared/selectors/Files/hooks/useFilesHelper.ts index e7dd178d3b..74d8537381 100644 --- a/packages/shared/selectors/Files/hooks/useFilesHelper.ts +++ b/packages/shared/selectors/Files/hooks/useFilesHelper.ts @@ -65,6 +65,7 @@ const useFilesHelper = ({ getRootData, onSetBaseFolderPath, isRoomsOnly, + isUserOnly, rootThirdPartyId, getRoomList, getIcon, @@ -141,7 +142,7 @@ const useFilesHelper = ({ } } - const id = selectedItemId || ""; + const id = isUserOnly ? "@my" : selectedItemId || ""; filter.folder = id.toString(); @@ -149,7 +150,7 @@ const useFilesHelper = ({ folderId: string | number, isErrorPath = false, ) => { - if (initRef.current && getRootData) { + if (initRef.current && getRootData && folderId !== "@my") { const folder = await getFolderInfo(folderId, true); const isArchive = folder.rootFolderType === FolderType.Archive; @@ -247,7 +248,7 @@ const useFilesHelper = ({ // if (item.roomType) breadCrumbs[idx].isRoom = true; // }); - if (!isThirdParty && !isRoomsOnly) + if (!isThirdParty && !isRoomsOnly && !isUserOnly) breadCrumbs.unshift({ ...DEFAULT_BREAD_CRUMB }); onSetBaseFolderPath?.(isErrorPath ? [] : breadCrumbs); @@ -308,6 +309,7 @@ const useFilesHelper = ({ setIsNextPageLoading, searchValue, filterParam, + isUserOnly, selectedItemId, getRootData, setSelectedItemSecurity, diff --git a/packages/shared/selectors/Files/index.tsx b/packages/shared/selectors/Files/index.tsx index 0c454a5e64..7376cae3d3 100644 --- a/packages/shared/selectors/Files/index.tsx +++ b/packages/shared/selectors/Files/index.tsx @@ -186,6 +186,7 @@ const FilesSelector = ({ setIsRoot, searchValue, isRoomsOnly, + onSetBaseFolderPath, isInit, setIsInit, @@ -211,6 +212,7 @@ const FilesSelector = ({ getRootData, onSetBaseFolderPath, isRoomsOnly, + isUserOnly, rootThirdPartyId, getRoomList, getIcon, @@ -289,7 +291,7 @@ const FilesSelector = ({ return; } - if (!currentFolderId) { + if (!currentFolderId && !isUserOnly) { setSelectedItemType("rooms"); return; } @@ -311,6 +313,7 @@ const FilesSelector = ({ currentFolderId, isRoomsOnly, isThirdParty, + isUserOnly, parentId, roomsFolderId, rootFolderType,