Merge pull request #872 from InseeFrLab/fix-navigation-invalid

fix #865
InseeFrLab · Nov 8, 2024 · dd15640 · dd15640
2 parents 46ebeef + cc6ffa1
commit dd15640
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/web/src/core/usecases/catalog/thunks.ts b/web/src/core/usecases/catalog/thunks.ts
@@ -69,8 +69,10 @@ export const thunks = {
             })();
 
             const selectedCatalogId =
-                params.catalogId ??
-                catalogs.filter(({ isProduction }) => isProduction)[0].id;
+                params.catalogId !== undefined &&
+                catalogs.some(({ id }) => id === params.catalogId)
+                    ? params.catalogId
+                    : catalogs.filter(({ isProduction }) => isProduction)[0].id;
 
             dispatch(
                 actions.catalogsFetched({
@@ -96,7 +98,10 @@ export const thunks = {
                 })
             );
 
-            if (params.catalogId === undefined) {
+            if (
+                params.catalogId === undefined ||
+                params.catalogId !== selectedCatalogId
+            ) {
                 dispatch(actions.defaultCatalogSelected());
             }
         },