fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-08 10:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure crossfilter index dimensions match data (#1409)

Browse Source
This commit is contained in:
Bruce Martin
2020-04-19 08:44:46 -07:00
committed by GitHub
parent 5dc40158c4
commit cbcd3f4f8f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/reducers/crossfilter.js
+6 -6
View File
@@ -58,7 +58,7 @@ const CrossfilterReducerBase = (
} }
case "reset World to eq Universe": { case "reset World to eq Universe": {
const { userDefinedGenes, diffexpGenes } = prevSharedState.controls; const { userDefinedGenes, diffexpGenes } = nextSharedState.controls;
const { world } = nextSharedState; const { world } = nextSharedState;
let { crossfilter } = prevSharedState.resetCache; let { crossfilter } = prevSharedState.resetCache;
crossfilter = ControlsHelpers.createGeneDimensions( crossfilter = ControlsHelpers.createGeneDimensions(
@@ -76,7 +76,7 @@ const CrossfilterReducerBase = (
case "set clip quantiles": case "set clip quantiles":
case "set World to current selection": { case "set World to current selection": {
const { userDefinedGenes, diffexpGenes } = prevSharedState.controls; const { userDefinedGenes, diffexpGenes } = nextSharedState.controls;
const { world, layoutChoice } = nextSharedState; const { world, layoutChoice } = nextSharedState;
let crossfilter = new Crossfilter(world.obsAnnotations); let crossfilter = new Crossfilter(world.obsAnnotations);
crossfilter = World.createObsDimensions( crossfilter = World.createObsDimensions(
@@ -111,7 +111,7 @@ const CrossfilterReducerBase = (
} }
case "request user defined gene success": { case "request user defined gene success": {
const { world } = prevSharedState; const { world } = nextSharedState;
const gene = action.data.genes[0]; const gene = action.data.genes[0];
return state.addDimension( return state.addDimension(
userDefinedDimensionName(gene), userDefinedDimensionName(gene),
@@ -122,7 +122,7 @@ const CrossfilterReducerBase = (
} }
case "request differential expression success": { case "request differential expression success": {
const { world } = prevSharedState; const { world } = nextSharedState;
const varIndexName = world.schema.annotations.var.index; const varIndexName = world.schema.annotations.var.index;
const genes = _.map(action.data, (d) => const genes = _.map(action.data, (d) =>
world.varAnnotations.at(d[0], varIndexName) world.varAnnotations.at(d[0], varIndexName)
@@ -142,7 +142,7 @@ const CrossfilterReducerBase = (
} }
case "clear differential expression": { case "clear differential expression": {
const { world } = prevSharedState; const { world } = nextSharedState;
const varIndexName = world.schema.annotations.var.index; const varIndexName = world.schema.annotations.var.index;
const crossfilter = _.reduce( const crossfilter = _.reduce(
action.diffExp, action.diffExp,
@@ -160,7 +160,7 @@ const CrossfilterReducerBase = (
} }
case "clear all user defined genes": { case "clear all user defined genes": {
const { userDefinedGenes } = prevSharedState.controls; const { userDefinedGenes } = nextSharedState.controls;
const crossfilter = _.reduce( const crossfilter = _.reduce(
userDefinedGenes, userDefinedGenes,
(xfltr, gene) => xfltr.delDimension(userDefinedDimensionName(gene)), (xfltr, gene) => xfltr.delDimension(userDefinedDimensionName(gene)),
client/src/reducers/index.js
+3 -3
View File
@@ -37,16 +37,16 @@ const Reducer = undoable(
["categoricalSelection", categoricalSelection], ["categoricalSelection", categoricalSelection],
["continuousSelection", continuousSelection], ["continuousSelection", continuousSelection],
["graphSelection", graphSelection], ["graphSelection", graphSelection],
["crossfilter", crossfilter],
["colors", colors], ["colors", colors],
["controls", controls], ["controls", controls],
["crossfilter", crossfilter],
["differential", differential], ["differential", differential],
["responsive", responsive], ["responsive", responsive],
["centroidLabels", centroidLabels], ["centroidLabels", centroidLabels],
["pointDilation", pointDialation], ["pointDilation", pointDialation],
["reembedController", reembedController], ["reembedController", reembedController],
["autosave", autosave], ["autosave", autosave],
["resetCache", resetCache] ["resetCache", resetCache],
]), ]),
[ [
"universe", "universe",
@@ -61,7 +61,7 @@ const Reducer = undoable(
"layoutChoice", "layoutChoice",
"centroidLabels", "centroidLabels",
"annotations", "annotations",
"reembedding" "reembedding",
], ],
undoableConfig undoableConfig
); );