fix(client): reset more state on dataset switch

c3g · Jan 18, 2024 · 6e835ca · 6e835ca
1 parent 45e1057
commit 6e835ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/client/src/components/Header.js b/client/src/components/Header.js
@@ -27,7 +27,9 @@ export default function Header({children, onAbout, /*onDatasets, */onDatasetAbou
   console.debug("Datasets by node:", datasetsByNode);
 
   const isLoadingData = useSelector((state) =>
+    state.assays.isLoading ||
     state.samples.isLoading ||
+    state.peaks.isLoading ||
     state.positions.isLoading ||
     state.overview.isLoading ||
     state.user.isLoading);

diff --git a/client/src/helpers/reducers.js b/client/src/helpers/reducers.js
@@ -1,3 +1,5 @@
+import * as k from "../constants/ActionTypes"
+
 export const makeDefaultListState = (defaultList = undefined) => ({
   isLoading: false,
   isLoaded: false,
@@ -12,13 +14,12 @@ export const makeListReducer = (types, defaultState) => (state = defaultState, a
       return {...state, isLoading: false, isLoaded: true, list: action.payload};
     case types.ERROR:
       return {...state, isLoading: false};
+
+    // TODO: this can create a race condition with fetching
+    case k.SET_NODE:
+      return defaultState;
+
     default:
       return state;
   }
 };
-
-export const makeDefaultDataState = (defaultData = undefined) => ({
-  isLoading: false,
-  isLoaded: false,
-  data: defaultData,
-});