Correct all explorer bugs

InseeFrLab · Aug 30, 2023 · 712581f · 712581f
1 parent 033d325
commit 712581f
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 11 deletions.
diff --git a/src/core/usecases/fileExplorer.ts b/src/core/usecases/fileExplorer.ts
@@ -417,12 +417,33 @@ const privateThunks = {
 } satisfies Thunks;
 
 export const thunks = {
-    "getProjectHomePath":
+    "getProjectHomeOrPreviousPath":
         () =>
             (...args) => {
                 const [, getState] = args;
 
-                return `/${projectConfigs.selectors.selectedProject(getState()).bucket}`;
+                const homeDirectoryPath = `/${projectConfigs.selectors.selectedProject(getState()).bucket}`;
+
+                const currentDirectoryPath = getState().fileExplorer.directoryPath;
+
+                return_current_path: {
+
+                    if( currentDirectoryPath === undefined ){
+                        //NOTE: First navigation
+                        break return_current_path;
+                    }
+
+                    if( !currentDirectoryPath.startsWith(homeDirectoryPath) ){
+                        // The project has changed while we where on another page
+                        break return_current_path;
+                    }
+
+                    return currentDirectoryPath;
+
+                }
+
+                return homeDirectoryPath;
+
             },
     /**
      * NOTE: It IS possible to navigate to a directory currently being renamed or created.

diff --git a/src/core/usecases/launcher.ts b/src/core/usecases/launcher.ts
@@ -1048,7 +1048,7 @@ export const thunks = {
                         "VAULT_TOKEN": (await secretsManager.getToken()).token,
                         "VAULT_MOUNT": vault.kvEngine,
                         "VAULT_TOP_DIR": dispatch(
-                            secretExplorer.thunks.getProjectHomePath()
+                            secretExplorer.protectedThunks.getHomeDirectoryPath()
                         )
                     };
                 })(),

diff --git a/src/core/usecases/secretExplorer.ts b/src/core/usecases/secretExplorer.ts
@@ -402,17 +402,47 @@ export const protectedThunks = {
             const { loggedSecretClient, loggedExtendedFsApi } = getContext(extraArg);
 
             return { loggedSecretClient, loggedExtendedFsApi };
-        }
+        },
+    "getHomeDirectoryPath":
+        () =>
+            (...args) => {
+                const [, getState] = args;
+
+                return `/${projectConfigs.selectors.selectedProject(getState()).vaultTopDir}`;
+
+            },
 } satisfies Thunks;
 
+
 export const thunks = {
-    "getProjectHomePath":
+    "getProjectHomeOrPreviousPath":
         () =>
-        (...args) => {
-            const [, getState] = args;
+            (...args) => {
+                const [dispatch, getState] = args;
 
-            return `/${projectConfigs.selectors.selectedProject(getState()).vaultTopDir}`;
-        },
+                const homeDirectoryPath = dispatch(protectedThunks.getHomeDirectoryPath());
+
+                const currentDirectoryPath = getState().secretExplorer.directoryPath;
+
+                return_current_path: {
+
+                    if( currentDirectoryPath === undefined ){
+                        //NOTE: First navigation
+                        break return_current_path;
+                    }
+
+                    if( !currentDirectoryPath.startsWith(homeDirectoryPath) ){
+                        // The project has changed while we where on another page
+                        break return_current_path;
+                    }
+
+                    return currentDirectoryPath;
+
+                }
+
+                return homeDirectoryPath;
+
+            },
     "navigate":
         (params: { directoryPath: string }) =>
         async (...args) => {

diff --git a/src/ui/pages/myFiles/MyFiles.tsx b/src/ui/pages/myFiles/MyFiles.tsx
@@ -53,7 +53,7 @@ export default function MyFiles(props: Props) {
     useEffect(() => {
 
         if( route.params.path === undefined ){
-            routes[route.name]({ "path": fileExplorer.getProjectHomePath() }).replace();
+            routes[route.name]({ "path": fileExplorer.getProjectHomeOrPreviousPath() }).replace();
             return;
         }
 

diff --git a/src/ui/pages/mySecrets/MySecrets.tsx b/src/ui/pages/mySecrets/MySecrets.tsx
@@ -56,7 +56,7 @@ export default function MySecrets(props: Props) {
     useEffect(() => {
 
         if( route.params.path === undefined ){
-            routes[route.name]({ "path": secretExplorer.getProjectHomePath() }).replace();
+            routes[route.name]({ "path": secretExplorer.getProjectHomeOrPreviousPath() }).replace();
             return;
         }