re-implement re-embeddings (#1679)

* fix mispelling

* re-implement re-embedding

* always load base embedding to fetch counts

* format

* lint

* fix tests

* lint

* fix accept handling

* test log

* more debug

* more

* more

* more

* more

* remove logging

* logging

* jsonify

* remove debugging logs

* lint

* clean up errors a bit

* fix issue found in PR review

* PR review changes

client/src/reducers/index.js

@@ -18,7 +18,7 @@ import autosave from "./autosave";
 import ontology from "./ontology";
 import centroidLabels from "./centroidLabels";
 import pointDialation from "./pointDilation";
-import { reembedController, reembedding } from "./reembed";
+import { reembedController } from "./reembed";
 import { gcMiddleware as annoMatrixGC } from "../annoMatrix";
 
 import undoableConfig from "./undoableConfig";
@@ -30,7 +30,6 @@ const Reducer = undoable(
     ["obsCrossfilter", obsCrossfilter],
     ["ontology", ontology],
     ["annotations", annotations],
-    ["reembedding", reembedding],
     ["layoutChoice", layoutChoice],
     ["categoricalSelection", categoricalSelection],
     ["continuousSelection", continuousSelection],
@@ -55,7 +54,6 @@ const Reducer = undoable(
     "layoutChoice",
     "centroidLabels",
     "annotations",
-    "reembedding",
   ],
   undoableConfig
 );

client/src/reducers/layoutChoice.js

@@ -48,27 +48,15 @@ const LayoutChoice = (
     }
 
     case "reembed: add reembedding": {
+      const { schema } = nextSharedState.annoMatrix;
       const { name } = action.schema;
       const available = Array.from(new Set(state.available).add(name));
+      const currentDimNames = schema.layout.obsByName[name].dims;
       return {
         ...state,
         available,
-      };
-    }
-
-    case "reembed: clear all reembeddings": {
-      const { annoMatrix } = nextSharedState;
-      const { current } = state;
-      const dflt = setToDefaultLayout(annoMatrix.schema);
-      if (dflt.available.includes(current)) {
-        return {
-          ...state,
-          available: dflt.available,
-        };
-      }
-      return {
-        ...state,
-        ...dflt,
+        current: name,
+        currentDimNames,
       };
     }
 

client/src/reducers/reembed.js

@@ -27,38 +27,3 @@ export const reembedController = (
     }
   }
 };
-
-/*
-actual reembedding data is part of the undo/redo history
-*/
-export const reembedding = (
-  state = {
-    reembeddings: new Map(),
-  },
-  action
-) => {
-  switch (action.type) {
-    case "reembed: add reembedding": {
-      const { schema, embedding } = action;
-      const { name } = schema.name;
-      const { reembeddings } = state;
-      return {
-        ...state,
-        reembeddings: new Map(reembeddings).set(name, {
-          name,
-          schema,
-          embedding,
-        }),
-      };
-    }
-    case "reembed: clear all reembeddings": {
-      return {
-        ...state,
-        reembeddings: new Map(),
-      };
-    }
-    default: {
-      return state;
-    }
-  }
-};