From cbcd3f4f8f7f12028984c17defcac61a67846dd8 Mon Sep 17 00:00:00 2001
From: Bruce Martin <bruce@chanzuckerberg.com>
Date: Sun, 19 Apr 2020 08:44:46 -0700
Subject: [PATCH] ensure crossfilter index dimensions match data (#1409)

---
 client/src/reducers/crossfilter.js | 12 ++++++------
 client/src/reducers/index.js       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/reducers/crossfilter.js b/client/src/reducers/crossfilter.js
index 0303fd13..f4488965 100644
--- a/client/src/reducers/crossfilter.js
+++ b/client/src/reducers/crossfilter.js
@@ -58,7 +58,7 @@ const CrossfilterReducerBase = (
     }
 
     case "reset World to eq Universe": {
-      const { userDefinedGenes, diffexpGenes } = prevSharedState.controls;
+      const { userDefinedGenes, diffexpGenes } = nextSharedState.controls;
       const { world } = nextSharedState;
       let { crossfilter } = prevSharedState.resetCache;
       crossfilter = ControlsHelpers.createGeneDimensions(
@@ -76,7 +76,7 @@ const CrossfilterReducerBase = (
 
     case "set clip quantiles":
     case "set World to current selection": {
-      const { userDefinedGenes, diffexpGenes } = prevSharedState.controls;
+      const { userDefinedGenes, diffexpGenes } = nextSharedState.controls;
       const { world, layoutChoice } = nextSharedState;
       let crossfilter = new Crossfilter(world.obsAnnotations);
       crossfilter = World.createObsDimensions(
@@ -111,7 +111,7 @@ const CrossfilterReducerBase = (
     }
 
     case "request user defined gene success": {
-      const { world } = prevSharedState;
+      const { world } = nextSharedState;
       const gene = action.data.genes[0];
       return state.addDimension(
         userDefinedDimensionName(gene),
@@ -122,7 +122,7 @@ const CrossfilterReducerBase = (
     }
 
     case "request differential expression success": {
-      const { world } = prevSharedState;
+      const { world } = nextSharedState;
       const varIndexName = world.schema.annotations.var.index;
       const genes = _.map(action.data, (d) =>
         world.varAnnotations.at(d[0], varIndexName)
@@ -142,7 +142,7 @@ const CrossfilterReducerBase = (
     }
 
     case "clear differential expression": {
-      const { world } = prevSharedState;
+      const { world } = nextSharedState;
       const varIndexName = world.schema.annotations.var.index;
       const crossfilter = _.reduce(
         action.diffExp,
@@ -160,7 +160,7 @@ const CrossfilterReducerBase = (
     }
 
     case "clear all user defined genes": {
-      const { userDefinedGenes } = prevSharedState.controls;
+      const { userDefinedGenes } = nextSharedState.controls;
       const crossfilter = _.reduce(
         userDefinedGenes,
         (xfltr, gene) => xfltr.delDimension(userDefinedDimensionName(gene)),
diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js
index 0cfe93ca..17c4e752 100644
--- a/client/src/reducers/index.js
+++ b/client/src/reducers/index.js
@@ -37,16 +37,16 @@ const Reducer = undoable(
     ["categoricalSelection", categoricalSelection],
     ["continuousSelection", continuousSelection],
     ["graphSelection", graphSelection],
-    ["crossfilter", crossfilter],
     ["colors", colors],
     ["controls", controls],
+    ["crossfilter", crossfilter],
     ["differential", differential],
     ["responsive", responsive],
     ["centroidLabels", centroidLabels],
     ["pointDilation", pointDialation],
     ["reembedController", reembedController],
     ["autosave", autosave],
-    ["resetCache", resetCache]
+    ["resetCache", resetCache],
   ]),
   [
     "universe",
@@ -61,7 +61,7 @@ const Reducer = undoable(
     "layoutChoice",
     "centroidLabels",
     "annotations",
-    "reembedding"
+    "reembedding",
   ],
   undoableConfig
 );