gene set summary progress (#2127)

* revert removal of cache control headers

* checkpoint work on revising summary route

* add summary query support to annoMatrix

* summarize route cleanup

* add mising file

* clean up summarize route

* add summary histogram

* update deps

* lint

* more lint

* lint

* manage crossfiler during gene set state changes

* remove obsolete debugging code

* correctly perform async watch in histogram

* better error handling

client/src/components/geneExpression/menus/addGeneToGenesetDialogue.js

@@ -3,6 +3,7 @@ import { connect } from "react-redux";
 import AnnoDialog from "../../annoDialog";
 import LabelInput from "../../labelInput";
 import parseBulkGeneString from "../../../util/parseBulkGeneString";
+import actions from "../../../actions";
 
 @connect((state) => ({
   genesetsUI: state.genesetsUI,
@@ -36,11 +37,7 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
       });
     });
 
-    dispatch({
-      type: "geneset: add genes",
-      genesetName: geneset,
-      genes: genesTmpHardcodedFormat,
-    });
+    dispatch(actions.genesetAddGenes(geneset, genesTmpHardcodedFormat));
     dispatch({
       type: "geneset: disable add new genes mode",
     });

client/src/components/geneExpression/menus/addGenes.js

@@ -77,6 +77,26 @@ class AddGenes extends React.Component {
     this.updateState(prevProps);
   }
 
+  handleClick(g) {
+    const { dispatch, userDefinedGenes } = this.props;
+    const { geneNames } = this.state;
+    if (!g) return;
+    const gene = g.target;
+    if (userDefinedGenes.indexOf(gene) !== -1) {
+      postUserErrorToast("That gene already exists");
+    } else if (userDefinedGenes.length > globals.maxUserDefinedGenes) {
+      postUserErrorToast(
+        `That's too many genes, you can have at most ${globals.maxUserDefinedGenes} user defined genes`
+      );
+    } else if (geneNames.indexOf(gene) === undefined) {
+      postUserErrorToast("That doesn't appear to be a valid gene name.");
+    } else {
+      dispatch({ type: "single user defined gene start" });
+      dispatch(actions.requestUserDefinedGene(gene));
+      dispatch({ type: "single user defined gene complete" });
+    }
+  }
+
   _genesToUpper = (listGenes) => {
     // Has to be a Map to preserve index
     const upperGenes = new Map();
@@ -190,26 +210,6 @@ class AddGenes extends React.Component {
     return "Apod, Cd74, ...";
   }
 
-  handleClick(g) {
-    const { dispatch, userDefinedGenes } = this.props;
-    const { geneNames } = this.state;
-    if (!g) return;
-    const gene = g.target;
-    if (userDefinedGenes.indexOf(gene) !== -1) {
-      postUserErrorToast("That gene already exists");
-    } else if (userDefinedGenes.length > globals.maxUserDefinedGenes) {
-      postUserErrorToast(
-        `That's too many genes, you can have at most ${globals.maxUserDefinedGenes} user defined genes`
-      );
-    } else if (geneNames.indexOf(gene) === undefined) {
-      postUserErrorToast("That doesn't appear to be a valid gene name.");
-    } else {
-      dispatch({ type: "single user defined gene start" });
-      dispatch(actions.requestUserDefinedGene(gene));
-      dispatch({ type: "single user defined gene complete" });
-    }
-  }
-
   render() {
     const { userDefinedGenesLoading } = this.props;
     const { tab, bulkAdd, activeItem, status, geneNames } = this.state;

client/src/components/geneExpression/menus/createGenesetDialogue.js

@@ -3,6 +3,7 @@ import React from "react";
 import { connect } from "react-redux";
 import AnnoDialog from "../../annoDialog";
 import LabelInput from "../../labelInput";
+import actions from "../../../actions";
 
 @connect((state) => ({
   annotations: state.annotations,
@@ -56,11 +57,7 @@ class CreateGenesetDialogue extends React.PureComponent {
         });
       });
 
-      dispatch({
-        type: "geneset: add genes",
-        genesetName,
-        genes: genesTmpHardcodedFormat,
-      });
+      dispatch(actions.genesetAddGenes(genesetName, genesTmpHardcodedFormat));
     }
     dispatch({
       type: "geneset: disable create geneset mode",

client/src/components/geneExpression/menus/genesetMenus.js

@@ -12,6 +12,7 @@ import {
 } from "@blueprintjs/core";
 
 import * as globals from "../../../globals";
+import actions from "../../../actions";
 import AddGeneToGenesetDialogue from "./addGeneToGenesetDialogue";
 
 @connect((state) => {
@@ -44,7 +45,7 @@ class GenesetMenus extends React.PureComponent {
 
   handleDeleteCategory = () => {
     const { dispatch, geneset } = this.props;
-    dispatch({ type: "geneset: delete", genesetName: geneset });
+    dispatch(actions.genesetDelete(geneset));
   };
 
   render() {