add geneset, add gene, delete set

client/src/components/brushableHistogram/error.js

@@ -6,8 +6,8 @@ const ErrorLoading = ({ displayName, error, zebra }) => {
   return (
     <div
       style={{
-        padding: globals.leftSidebarSectionPadding,
         backgroundColor: zebra ? globals.lightestGrey : "white",
+        fontStyle: "italic",
       }}
     >
       <span>{`Failure loading ${displayName}`}</span>

client/src/components/geneExpression/geneSet.js

@@ -121,6 +121,7 @@ class GeneSet extends React.Component {
             onKeyPress={/* todo_genesets */ () => {}}
             style={{
               cursor: "pointer",
+              userSelect: "none",
             }}
             onClick={this.onGenesetMenuClick}
           >

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

@@ -10,7 +10,7 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      //   genesToAdd: [],
+      genesToAdd: "",
     };
   }
 
@@ -21,8 +21,28 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
     });
   };
 
+  handleAddGeneToGeneSet = (e) => {
+    const { geneset, dispatch } = this.props;
+    const { genesToAdd } = this.state;
+    dispatch({
+      type: "geneset: add genes",
+      name: geneset,
+      genes: genesToAdd.split(","),
+    });
+    dispatch({
+      type: "geneset: disable add new genes mode",
+    });
+    if (e) e.preventDefault();
+  };
+
+  handleChange = (e) => {
+    console.log(e);
+    this.setState({ genesToAdd: e });
+  };
+
   render() {
     const { geneset, genesetsUI } = this.props;
+    const { genesToAdd } = this.state;
 
     return (
       <>
@@ -32,19 +52,15 @@ class AddGeneToGenesetDialogue extends React.PureComponent {
           primaryButtonProps={{
             "data-testid": `${geneset}:submit-label`,
           }}
-          title="Add gene to geneset"
+          title="Add genes to geneset"
           instruction={`Add gene to ${geneset}`}
           cancelTooltipContent="Close this dialog without adding genes to geneset."
-          primaryButtonText="Add Gene(s)"
+          primaryButtonText="Add genes"
-          text="todo"
+          text={genesToAdd}
-          validationError={() => {
+          validationError={false}
-            /* todo genesets this.labelNameError(genesetName) */
-            return false;
-          }}
           annoInput={
             <LabelInput
               onChange={this.handleChange}
-              onSelect={this.handleSelect}
               inputProps={{
                 "data-testid": "add-genes",
                 leftIcon: "manually-entered-data",

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

@@ -35,7 +35,10 @@ class CreateGenesetDialogue extends React.PureComponent {
     const { dispatch } = this.props;
     const { genesetName } = this.state;
 
-    dispatch({ type: "geneset: create", genesetName });
+    dispatch({ type: "geneset: create", name: genesetName });
+    dispatch({
+      type: "geneset: disable create geneset mode",
+    });
     e.preventDefault();
   };
 
@@ -44,12 +47,8 @@ class CreateGenesetDialogue extends React.PureComponent {
     return false;
   };
 
-  handleChange = () => {
+  handleChange = (e) => {
-    return () => {};
+    this.setState({ genesetName: e });
-  };
-
-  handleSelect = () => {
-    return () => {};
   };
 
   instruction = () => {
@@ -76,24 +75,20 @@ class CreateGenesetDialogue extends React.PureComponent {
           primaryButtonText="Create geneset"
           handleSecondaryButtonSubmit={this.addLabelAndAssignCells}
           text={genesetName}
-          validationError={() => {
+          validationError={false}
-            /* todo genesets this.labelNameError(genesetName) */
-            return false;
-          }}
           annoInput={
             <LabelInput
               onChange={this.handleChange}
-              onSelect={this.handleSelect}
               inputProps={{
                 "data-testid": "add-genes",
                 leftIcon: "manually-entered-data",
                 intent: "none",
                 autoFocus: true,
               }}
-              newLabelMessage="New category"
+              newLabelMessage="New geneset"
             />
           }
-          handleSubmit={this.handleAddNewLabelToCategory}
+          handleSubmit={this.createGeneset}
           handleCancel={this.disableCreateGenesetMode}
         />
       </>

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

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