From 8c2b84ed8465313d0c118bcc57629dcb2e17efb1 Mon Sep 17 00:00:00 2001
From: Montassar Ghanmy <Monta.ghanmy@gmail.com>
Date: Mon, 4 Mar 2024 23:16:08 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20router=20navigation=20(#39?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Monta <monta@HP-ProBook-445-14-inch-G9-Notebook-PC-505aadfc.localdomain>
---
 .../src/app/views/client/body/drive/browser.tsx  |  4 ++--
 .../client/body/drive/documents/document-row.tsx |  2 +-
 .../app/views/client/body/drive/header-path.tsx  | 16 ++++++++--------
 .../src/app/views/client/side-bar/index.tsx      | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tdrive/frontend/src/app/views/client/body/drive/browser.tsx b/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
index 99bdaa89..2cde4fde 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
@@ -383,8 +383,8 @@ export default memo(
                             }
                             item={child}
                             onClick={() => {
-                              const route = RouterServices.generateRouteFromState({dirId: child.id});
-                              history.push(route);
+                              // const route = RouterServices.generateRouteFromState({dirId: child.id});
+                              // history.push(route);
                               return setParentId(child.id);
                             }}
                             checked={checked[child.id] || false}
diff --git a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
index 37ae306c..0d8f1e9e 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
@@ -58,7 +58,7 @@ export const DocumentRow = ({
     console.log("DEVICE:: " + device);
     if (device != "ios" && device != "android") {
       history.push(RouterServices.generateRouteFromState({companyId: company, itemId: item.id, dirId: ''}));
-      open(item);
+      //open(item);
     }
   };
 
diff --git a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
index 0cbb3a07..18f81433 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
@@ -33,13 +33,13 @@ export default ({
       inTrash={inTrash || false}
       path={path}
       onClick={(viewId, dirId) => {
-        history.push(
+        /*history.push(
           RouterServices.generateRouteFromState({
             companyId: company,
             viewId,
             dirId,
           }),
-        );
+        );*/
         setParentId(dirId ? dirId : viewId);
       }}
     />
@@ -128,7 +128,7 @@ const PathItem = ({
   const { user } = useCurrentUser();
   const { viewId } = RouterServices.getStateFromRoute();
   const { access: trashAccess } = useDriveItem('trash');
-  const isInSharedWithMe = viewId === "shared_with_me";
+  const isInSharedWithMe = viewId === 'shared_with_me';
   return (
     <div className="flex items-center">
       <a
@@ -185,12 +185,12 @@ const PathItem = ({
 
             if (first) {
               if (isTrash) {
-                return viewId?.includes('trash_') 
-                  ? Languages.t('components.header_path.my_trash') 
+                return viewId?.includes('trash_')
+                  ? Languages.t('components.header_path.my_trash')
                   : Languages.t('components.header_path.shared_trash');
               } else {
-                return isInSharedWithMe 
-                  ? Languages.t('components.header_path.shared_with_me') 
+                return isInSharedWithMe
+                  ? Languages.t('components.header_path.shared_with_me')
                   : fileName;
               }
             } else {
@@ -202,7 +202,7 @@ const PathItem = ({
       {item?.access_info?.public?.level && item?.access_info?.public?.level !== 'none' && (
         <PublicIcon className="h-5 w-5 ml-2" />
       )}
-      {first && !!user?.id && viewId != "shared_with_me" && (
+      {first && !!user?.id && viewId != 'shared_with_me' && (
         <span className="ml-2 -mr-1 text-gray-700">
           <ChevronDownIcon className="w-4 h-4" />
         </span>
diff --git a/tdrive/frontend/src/app/views/client/side-bar/index.tsx b/tdrive/frontend/src/app/views/client/side-bar/index.tsx
index a9849003..1c86c1f4 100644
--- a/tdrive/frontend/src/app/views/client/side-bar/index.tsx
+++ b/tdrive/frontend/src/app/views/client/side-bar/index.tsx
@@ -44,6 +44,7 @@ export default () => {
   if (sharedWithMe) folderType = 'shared';
 
   useEffect(() => {
+    console.log('PARENT ID CHANGED: ', parentId);
     !itemId && !dirId && viewId && setParentId(viewId);
     dirId && viewId && setParentId(dirId);
   }, [viewId, itemId, dirId]);
@@ -76,7 +77,7 @@ export default () => {
                 dirId: '',
               }),
             );
-            setParentId('user_' + user?.id);
+            // setParentId('user_' + user?.id);
           }}
           size="lg"
           theme="white"
@@ -92,6 +93,7 @@ export default () => {
         {FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SHARED_DRIVE) && (
           <Button
             onClick={() => {
+              // setParentId('root')
               history.push(
                 RouterServices.generateRouteFromState({
                   companyId: company,
@@ -100,7 +102,6 @@ export default () => {
                   dirId: '',
                 }),
               );
-              setParentId('root');
             }}
             size="lg"
             theme="white"
@@ -108,7 +109,6 @@ export default () => {
               'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '')
             }
           >
-
             <CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
           </Button>
         )}
@@ -123,7 +123,7 @@ export default () => {
                   dirId: '',
                 }),
               );
-              setParentId('shared_with_me');
+              // setParentId('shared_with_me');
             }}
             size="lg"
             theme="white"
@@ -164,7 +164,7 @@ export default () => {
                 dirId: '',
               }),
             );
-            setParentId('trash_' + user?.id);
+            // setParentId('trash_' + user?.id);
           }}
           size="lg"
           theme="white"