Only load localstate if params are not included in url request

Canadian-Geospatial-Platform · Sep 12, 2024 · 304b2aa · 304b2aa
1 parent 671da88
commit 304b2aa
Showing 1 changed file with 29 additions and 26 deletions.
diff --git a/src/reducers/localStorage.ts b/src/reducers/localStorage.ts
@@ -15,33 +15,36 @@ function checkNestedProperty(obj, props: string): boolean {
 
 export const loadState = (): StoreEnhancer<unknown, unknown> | undefined => {
     try {
-        const serializedState = localStorage.getItem('state');
-        if (serializedState === null) {
-            return undefined;
+        const urlParams = new URLSearchParams(window.location.search);
+		if (!urlParams.toString()) {
+            const serializedState = localStorage.getItem('state');
+            if (serializedState === null) {
+                return undefined;
+            }
+            const state = JSON.parse(serializedState);
+            if (!checkNestedProperty(state, 'mappingReducer.spatempfilter')) {
+                state['mappingReducer'].spatempfilter = INITSPATIALTEMPORALFILTER;
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.spatialfilter')) {
+                state['mappingReducer'].spatialfilter = [];
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.metasrcfilter')) {
+                state['mappingReducer'].metasrcfilter = INITMETADATASRCFILTER;
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.stacfilter')) {
+                state['mappingReducer'].stacfilter = [];
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.center')) {
+                state['mappingReducer'].center = INITMAINMAPINFO.center;
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.zoom')) {
+                state['mappingReducer'].zoom = INITMAINMAPINFO.zoom;
+            }
+            if (!checkNestedProperty(state, 'mappingReducer.freezeMapSearch')) {
+                state['mappingReducer'].freezeMapSearch = { freeze: true };
+            }
+            return state;
         }
-        const state = JSON.parse(serializedState);
-        if (!checkNestedProperty(state, 'mappingReducer.spatempfilter')) {
-            state['mappingReducer'].spatempfilter = INITSPATIALTEMPORALFILTER;
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.spatialfilter')) {
-            state['mappingReducer'].spatialfilter = [];
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.metasrcfilter')) {
-            state['mappingReducer'].metasrcfilter = INITMETADATASRCFILTER;
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.stacfilter')) {
-            state['mappingReducer'].stacfilter = [];
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.center')) {
-            state['mappingReducer'].center = INITMAINMAPINFO.center;
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.zoom')) {
-            state['mappingReducer'].zoom = INITMAINMAPINFO.zoom;
-        }
-        if (!checkNestedProperty(state, 'mappingReducer.freezeMapSearch')) {
-            state['mappingReducer'].freezeMapSearch = { freeze: true };
-        }
-        return state;
     } catch (err) {
         return undefined;
     }