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/components/categorical/value/occupancy.js

@@ -9,7 +9,9 @@ import {
   Classes,
 } from "@blueprintjs/core";
 
-@connect()
+@connect((state) => ({
+  schema: state.annoMatrix?.schema,
+}))
 class Occupancy extends React.PureComponent {
   _WIDTH = 100;
 
@@ -21,16 +23,17 @@ class Occupancy extends React.PureComponent {
       createHistogram fetches the continous data in relation to the cells releveant to the catagory value.
       It then seperates that data into 50 bins for drawing the mini-histogram
     */
-    const { world, metadataField, colorAccessor, categoryValue } = this.props;
+    const {
+      metadataField,
+      categoryData,
+      colorData,
+      categoryValue,
+    } = this.props;
 
     if (!this.canvas) return;
 
-    const groupBy = world.obsAnnotations.col(metadataField);
-
-    const col =
-      world.obsAnnotations.col(colorAccessor) ||
-      world.varData.col(colorAccessor);
-
+    const groupBy = categoryData.col(metadataField);
+    const col = colorData.icol(0);
     const range = col.summarize();
 
     const histogramMap = col.histogram(
@@ -39,7 +42,6 @@ class Occupancy extends React.PureComponent {
       groupBy
     ); /* Because the signature changes we really need different names for histogram to differentiate signatures  */
 
-    // const categoryValue = category.categoryValues[categoryIndex];
     const bins = histogramMap.has(categoryValue)
       ? histogramMap.get(categoryValue)
       : new Array(50).fill(0);
@@ -79,20 +81,22 @@ class Occupancy extends React.PureComponent {
       Using the colorScale a stack of colored bars is drawn representing the map
      */
     const {
-      world,
       metadataField,
+      categoryData,
       colorAccessor,
       categoryValue,
-      colorScale,
+      colorTable,
+      schema,
+      colorData,
     } = this.props;
-    const { schema } = world;
+    const { scale: colorScale } = colorTable;
 
     const ctx = this.canvas?.getContext("2d");
 
     if (!ctx) return;
 
-    const groupBy = world.obsAnnotations.col(metadataField);
-    const occupancyMap = world.obsAnnotations
+    const groupBy = categoryData.col(metadataField);
+    const occupancyMap = colorData
       .col(colorAccessor)
       .histogramCategorical(groupBy);
 
@@ -109,7 +113,7 @@ class Occupancy extends React.PureComponent {
         schema.annotations.obsByName[colorAccessor]?.categories;
 
       let currentOffset = 0;
-      const dfColumn = world.obsAnnotations.col(colorAccessor);
+      const dfColumn = colorData.col(colorAccessor);
       const categoryValues = dfColumn.summarizeCategorical().categories;
 
       let o;