Refactor getting cluster ids

hms-dbmi-cellenics · Jul 13, 2022 · e34d7b4 · e34d7b4
1 parent e0ac266
commit e34d7b4
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/redux/actions/componentConfig/fetchPlotDataWork.js b/src/redux/actions/componentConfig/fetchPlotDataWork.js
@@ -8,11 +8,12 @@ import generatePlotWorkBody from 'utils/work/generatePlotWorkBody';
 import { fetchWork } from 'utils/work/fetchWork';
 
 const getClusterNames = (state) => {
-  const clusterIds = state.cellSets.hierarchy[0]?.children.map((entry) => entry.key);
-  const customClusterIds = state.cellSets.hierarchy[1]?.children.map((entry) => entry.key);
+  const clusterIds = state.cellSets.hierarchy.reduce(
+    (acc, cellSet) => [...acc, ...cellSet.children.map((entry) => entry.key)],
+    [],
+  );
 
-  const allClusterIds = clusterIds?.concat(customClusterIds);
-  const clusterNames = allClusterIds?.map((clusterId) => state.cellSets.properties[clusterId].name);
+  const clusterNames = clusterIds?.map((clusterId) => state.cellSets.properties[clusterId].name);
   return clusterNames;
 };
 
@@ -24,7 +25,7 @@ const fetchPlotDataWork = (
   let config = getState().componentConfig[plotUuid]?.config ?? initialPlotConfigStates[plotType];
   const clusterNames = getClusterNames(getState());
   const timeout = getTimeoutForWorkerTask(getState(), 'PlotData');
-
+  console.error(clusterNames);
   config = {
     ...config,
     clusterNames,