Redux refactor (#1571)

* refactor categorical controls state

* lint

* fix race condition in tests

* fix typo

* add missing update on subset

* remove obsolete code

* update jest and puppeteer major version; update all minors

* update when label changes

* remove lint from tests; increase timeouts in e2e tests

* initial refactoring to new async annomatrix

* refine error handling

* fix bad merge

* add continuous legend

* lint

* fix memoization in color table creators

* partial implementation of user defined annotations

* add new annotations action creator file

* first pass at user annotations

* additional user annotation bug fixes

* user annotation auto-save

* unit test cleanup

* lint

* refactor into multiple files

* cleanup

* add column GC

* fix several bugs in user annotations

* remove debug code

* no anonymous functions

* undo redo cleanup

* file cleanup

* scatterplot

* performance

* cleanup

* remove old code

* render in parallel with load

* fix race condition

* simply graph rendering

* render throttle DRY

* fix category label order

* fix typo in e2e test setup

* re-fix the e2e test setup

* be more tolerant of races

* anno matrix unit tests

* temp disable reembedding

* pilot port continuous histo to react-async

* name change

* lint

* fix repaint bug

* typo fix

* update snap to match new ids

* world/universe name cleanup

* move annoMatrix to src dir

* use private underscore naming convention

* fix corner case in all selected

* name cleanup

* add layout control

* init edge case

* lint

* port scatterplot

* fix label indexing bug and improve tests

* port category to react-async

* fix user annotation labelling while subset

* select all of prev layout on layout switch

* fix race with crossfilter update

* prettier lint

* fix misleading comment

* fix url composition in loader

* first pass at crossfilter tests

* lint

* lint

* fix typo

* improved error handling for network errors

* fix memoization bug

* add memo

* refactor for performnce

* add missing single-value handling in select exact parser

* small bugs discovered by tests

* lint

* additional crossfilter unit tests

* remove extraneous comment

* add support for automatic category determination

* lint

* fix render bug in category

* take advantage of schema categories guarantee

* lint

* do not clear history when resetting

* enhanced annomatrix gc

* lint

* finish renaming to follow conventions; fix clone race bug

* lint

* add priority based loading to improve initial data load UX

* crossfilter cache perf

* perf tuning

* remove timers

* documentation

* PR review changes

* PR review changes

* more PR review edits

* improve clarity of comment

* more PR review fixes

* port centroidLabels to use react-async

* remove dead code

* pr review updates

* oops, remove logging

client/src/util/centroid.js

@@ -2,7 +2,7 @@ import quantile from "./quantile";
 import { memoize } from "./dataframe/util";
 import { unassignedCategoryLabel } from "../globals";
 import {
-  createCategorySummary,
+  createCategorySummaryFromDfCol,
   isSelectableCategoryName,
 } from "./stateManager/controlsHelpers";
 
@@ -22,19 +22,29 @@ label -> {
  yCoordinates: Float32Array
 }
 */
-const getCoordinatesByLabel = (world, categoryName, layoutDimNames) => {
+const getCoordinatesByLabel = (
+  schema,
+  categoryName,
+  categoryDf,
+  layoutChoice,
+  layoutDf
+) => {
   const coordsByCategoryLabel = new Map();
   // If the coloredBy is not a categorical col
-  if (!isSelectableCategoryName(world.schema, categoryName)) {
+  if (!isSelectableCategoryName(schema, categoryName)) {
     return coordsByCategoryLabel;
   }
 
-  const { obsAnnotations, obsLayout } = world;
-  const categoryArray = obsAnnotations.col(categoryName).asArray();
-  const layoutXArray = obsLayout.col(layoutDimNames[0]).asArray();
-  const layoutYArray = obsLayout.col(layoutDimNames[1]).asArray();
+  const categoryArray = categoryDf.col(categoryName).asArray();
+  const layoutDimNames = layoutChoice.currentDimNames;
+  const layoutXArray = layoutDf.col(layoutDimNames[0]).asArray();
+  const layoutYArray = layoutDf.col(layoutDimNames[1]).asArray();
+
+  const categorySummary = createCategorySummaryFromDfCol(
+    categoryDf.col(categoryName),
+    schema.annotations.obsByName[categoryName]
+  );
 
-  const categorySummary = createCategorySummary(world, categoryName);
   const {
     isUserAnno,
     categoryValueIndices,
@@ -93,9 +103,21 @@ const getCoordinatesByLabel = (world, categoryName, layoutDimNames) => {
   label -> [x-Coordinate, y-Coordinate]
 */
 
-const calcMedianCentroid = (world, categoryName, layoutDimNames) => {
+const calcMedianCentroid = (
+  schema,
+  categoryName,
+  categoryDf,
+  layoutChoice,
+  layoutDf
+) => {
   // generate a map describing the coordinates for each label within the given category
-  const dataMap = getCoordinatesByLabel(world, categoryName, layoutDimNames);
+  const dataMap = getCoordinatesByLabel(
+    schema,
+    categoryName,
+    categoryDf,
+    layoutChoice,
+    layoutDf
+  );
 
   // label => [medianXCoordinate, medianYCoordinate]
   const coordinates = new Map();
@@ -120,9 +142,18 @@ const calcMedianCentroid = (world, categoryName, layoutDimNames) => {
 };
 
 // A simple function to hash the parameters
-const hashMedianCentroid = (world, categoryName, layoutDimNames) => {
-  const { obsAnnotations, obsLayout } = world;
-  return `${obsAnnotations.__id}+${obsLayout.__id}:${categoryName}:${layoutDimNames}`;
+const hashMedianCentroid = (
+  schema,
+  categoryName,
+  categoryDf,
+  layoutChoice,
+  layoutDf
+) => {
+  const category = categoryDf.col(categoryName);
+  const layoutDimNames = layoutChoice.currentDimNames;
+  const layoutX = layoutDf.col(layoutDimNames[0]);
+  const layoutY = layoutDf.col(layoutDimNames[1]);
+  return `${category.__id}+${layoutX.__id}:${layoutY.__id}`;
 };
 // export the memoized calculation function
 export default memoize(calcMedianCentroid, hashMedianCentroid);