Merge branch 'main' into colinmegill/geneset-prototype

client/src/components/geneExpression/index.js

@@ -1,4 +1,3 @@
-// jshint esversion: 6
 /* rc slider https://www.npmjs.com/package/rc-slider */
 
 import React from "react";
@@ -13,11 +12,7 @@ import testGeneSets from "./test_data";
 
 @connect((state) => {
   return {
-    obsAnnotations: state.world?.obsAnnotations,
     userDefinedGenes: state.controls.userDefinedGenes,
-    userDefinedGenesLoading: state.controls.userDefinedGenesLoading,
-    world: state.world,
-    colorAccessor: state.colors.colorAccessor,
     differential: state.differential,
   };
 })
@@ -35,13 +30,7 @@ class GeneExpression extends React.Component {
   };
 
   render() {
-    const { world, userDefinedGenes, differential } = this.props;
-    const varIndexName = world?.schema?.annotations?.var?.index;
-    const varIndex = world?.varAnnotations?.col(varIndexName)?.asArray();
-
-    // may still be loading!
-    if (!varIndex) return null;
-
+    const { userDefinedGenes, differential } = this.props;
     return (
       <div
         style={{
@@ -50,19 +39,13 @@ class GeneExpression extends React.Component {
       >
         <div>
           <AddGenes />
-          {world && userDefinedGenes.length > 0
+          {userDefinedGenes.length > 0
             ? _.map(userDefinedGenes, (geneName, index) => {
-                const values = world.varData.col(geneName);
-                if (!values) {
-                  return null;
-                }
-                const summary = values.summarize();
                 return (
                   <HistogramBrush
                     key={geneName}
                     field={geneName}
                     zebra={index % 2 === 0}
-                    ranges={summary}
                     isUserDefined
                   />
                 );
@@ -72,18 +55,11 @@ class GeneExpression extends React.Component {
         <div>
           {differential.diffExp
             ? _.map(differential.diffExp, (value, index) => {
-                const name = world.varAnnotations.at(value[0], varIndexName);
-                const values = world.varData.col(name);
-                if (!values) {
-                  return null;
-                }
-                const summary = values.summarize();
                 return (
                   <HistogramBrush
-                    key={name}
-                    field={name}
+                    key={value[0]}
+                    field={value[0]}
                     zebra={index % 2 === 0}
-                    ranges={summary}
                     isDiffExp
                     logFoldChange={value[1]}
                     pval={value[2]}