From 2fa19c756c8e81174dc623fdd8c642ff3548a01d Mon Sep 17 00:00:00 2001
From: Bruce Martin <bruce@chanzuckerberg.com>
Date: Wed, 31 Mar 2021 12:23:38 -0700
Subject: [PATCH] propagate diffexp state through component tree (#2135)

---
 .../components/brushableHistogram/index.js    |  1 +
 client/src/components/geneExpression/gene.js  | 24 +++++++++--
 .../src/components/geneExpression/geneSet.js  | 41 +++++++++++++------
 client/src/components/geneExpression/index.js | 19 ++++-----
 4 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/client/src/components/brushableHistogram/index.js b/client/src/components/brushableHistogram/index.js
index f349e1d3..277b1c01 100644
--- a/client/src/components/brushableHistogram/index.js
+++ b/client/src/components/brushableHistogram/index.js
@@ -452,6 +452,7 @@ class HistogramBrush extends React.PureComponent {
                 {!mini ? (
                   <HistogramFooter
                     isObs={isObs}
+                    isDiffExp={isDiffExp}
                     displayName={field}
                     hideRanges={asyncProps.isSingleValue}
                     rangeMin={asyncProps.unclippedRange[0]}
diff --git a/client/src/components/geneExpression/gene.js b/client/src/components/geneExpression/gene.js
index 446b5f55..152c68b8 100644
--- a/client/src/components/geneExpression/gene.js
+++ b/client/src/components/geneExpression/gene.js
@@ -62,7 +62,9 @@ class Gene extends React.Component {
       isColorAccessor,
       isScatterplotXXaccessor,
       isScatterplotYYaccessor,
-      isDiffexp,
+      isDiffExp,
+      pvalAdj,
+      logFoldChange,
     } = this.props;
     const { geneIsExpanded } = this.state;
     const genesetNameLengthVisible = 310; /* this magic number determines how much of a long geneset name we see */
@@ -114,11 +116,15 @@ class Gene extends React.Component {
               </Truncate>
             </div>
             {!geneIsExpanded ? (
-              <HistogramBrush isUserDefined field={gene} mini />
+              isDiffExp ? (
+                <HistogramBrush isDiffExp field={gene} mini />
+              ) : (
+                <HistogramBrush isUserDefined field={gene} mini />
+              )
             ) : null}
           </div>
           <div style={{ flexShrink: 0, marginLeft: 2 }}>
-            {!isDiffexp ? (
+            {!isDiffExp ? (
               <AnchorButton
                 minimal
                 small
@@ -174,7 +180,17 @@ class Gene extends React.Component {
             />
           </div>
         </div>
-        {geneIsExpanded ? <HistogramBrush isUserDefined field={gene} /> : null}
+        {geneIsExpanded &&
+          (isDiffExp ? (
+            <HistogramBrush
+              isDiffExp
+              field={gene}
+              pvalAdj={pvalAdj}
+              logFoldChange={logFoldChange}
+            />
+          ) : (
+            <HistogramBrush isUserDefined field={gene} />
+          ))}
       </div>
     );
   }
diff --git a/client/src/components/geneExpression/geneSet.js b/client/src/components/geneExpression/geneSet.js
index 26067c7c..073f94c5 100644
--- a/client/src/components/geneExpression/geneSet.js
+++ b/client/src/components/geneExpression/geneSet.js
@@ -1,5 +1,4 @@
 import React from "react";
-import _ from "lodash";
 import { connect } from "react-redux";
 import { Tooltip, Position, Switch } from "@blueprintjs/core";
 import { FaChevronRight, FaChevronDown } from "react-icons/fa";
@@ -85,8 +84,35 @@ class GeneSet extends React.Component {
     this.setState({ toggleSummaryHisto: !toggleSummaryHisto });
   };
 
+  renderGenes() {
+    const { setName, setGenes, isDiffExp, diffExp } = this.props;
+
+    if (isDiffExp) {
+      // [ [gene, logfoldchange, pval, pval_adj], ...]
+      return setGenes.map((gene, idx) => {
+        const logFoldChange = diffExp[idx][1];
+        const pvalAdj = diffExp[idx][3];
+        return (
+          <Gene
+            key={gene}
+            gene={gene}
+            geneset={setName}
+            isDiffExp
+            logFoldChange={logFoldChange}
+            pvalAdj={pvalAdj}
+          />
+        );
+      });
+    }
+
+    // otherwise...
+    return setGenes.map((gene) => {
+      return <Gene key={gene} gene={gene} geneset={setName} />;
+    });
+  }
+
   render() {
-    const { setName, setGenes, isDiffexp } = this.props;
+    const { setName, setGenes } = this.props;
     const { isOpen, toggleSummaryHisto } = this.state;
     const genesetNameLengthVisible = 120; /* this magic number determines how much of a long geneset name we see */
     return (
@@ -166,16 +192,7 @@ class GeneSet extends React.Component {
 
         {isOpen &&
           (!toggleSummaryHisto
-            ? _.map(setGenes, (gene) => {
-                return (
-                  <Gene
-                    key={gene}
-                    gene={gene}
-                    geneset={setName}
-                    isDiffexp={isDiffexp}
-                  />
-                );
-              })
+            ? this.renderGenes()
             : setGenes.length > 0 && (
                 <HistogramBrush
                   isGeneSetSummary
diff --git a/client/src/components/geneExpression/index.js b/client/src/components/geneExpression/index.js
index 43d2fc79..568acfa8 100644
--- a/client/src/components/geneExpression/index.js
+++ b/client/src/components/geneExpression/index.js
@@ -31,23 +31,20 @@ class GeneExpression extends React.Component {
 
   renderDiffexpGeneSets = () => {
     const { differential } = this.props;
+    const { diffExp } = differential;
+    if (!diffExp) return null;
 
-    const setGenes = [];
-
-    if (differential.diffExp) {
-      differential.diffExp.forEach((diffexpGene) => {
-        setGenes.push(diffexpGene[0]);
-      });
-    }
-
-    return differential.diffExp ? (
+    // [ [gene, logfoldchange, pval, pval_adj], ...]
+    const setGenes = diffExp.map((diffExpGene) => diffExpGene[0]);
+    return (
       <GeneSet
         key="Temp DiffExp Set"
         setGenes={setGenes}
-        isDiffexp
+        isDiffExp
+        diffExp={diffExp}
         setName="Temp DiffExp Set"
       />
-    ) : null;
+    );
   };
 
   handleActivateCreateGenesetMode = () => {