From 1f34e949c7a74658a3589ddff89619a24bf7da36 Mon Sep 17 00:00:00 2001 From: Aymeric <123820772+Aymerix01@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:09:02 +0200 Subject: [PATCH] Bug search folder (#169) --- .../app/components/search-popup/parts/drive-item-result.tsx | 2 +- .../src/app/features/drive/hooks/use-drive-preview.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tdrive/frontend/src/app/components/search-popup/parts/drive-item-result.tsx b/tdrive/frontend/src/app/components/search-popup/parts/drive-item-result.tsx index 7de76217..1e187f73 100644 --- a/tdrive/frontend/src/app/components/search-popup/parts/drive-item-result.tsx +++ b/tdrive/frontend/src/app/components/search-popup/parts/drive-item-result.tsx @@ -58,7 +58,7 @@ export default (props: { driveItem: DriveItem & { user?: UserType }}) => { return (
{history.push(RouterServices.generateRouteFromState({companyId: company, itemId: file.id})); open(file)}} + onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, itemId: file.id})); openDoc(file)}} >
diff --git a/tdrive/frontend/src/app/features/drive/hooks/use-drive-preview.ts b/tdrive/frontend/src/app/features/drive/hooks/use-drive-preview.ts index 91d57a78..ae15f1a0 100644 --- a/tdrive/frontend/src/app/features/drive/hooks/use-drive-preview.ts +++ b/tdrive/frontend/src/app/features/drive/hooks/use-drive-preview.ts @@ -10,13 +10,15 @@ import { useHistory } from 'react-router-dom'; import RouterServices from '@features/router/services/router-service'; import useRouterCompany from '@features/router/hooks/use-router-company'; import { DriveCurrentFolderAtom } from 'app/views/client/body/drive/browser'; +import { useCurrentUser } from 'app/features/users/hooks/use-current-user'; export const useDrivePreviewModal = () => { const history = useHistory(); const company = useRouterCompany(); const [status, setStatus] = useRecoilState(DriveViewerState); + const { user } = useCurrentUser(); const [ parentId, setParentId ] = useRecoilState( - DriveCurrentFolderAtom({ initialFolderId: 'root' }), + DriveCurrentFolderAtom({ initialFolderId: 'user_'+user?.id }), ); const open: (item: DriveItem) => void = (item: DriveItem) => {