diff --git a/client/src/components/brushableHistogram/footer.js b/client/src/components/brushableHistogram/footer.js
index 39e800f2..ab5d5a4f 100644
--- a/client/src/components/brushableHistogram/footer.js
+++ b/client/src/components/brushableHistogram/footer.js
@@ -11,6 +11,7 @@ const HistogramFooter = React.memo(
logFoldChange,
pvalAdj,
isObs,
+ isGeneSetSummary,
}) => {
/*
Footer of each histogram. Will render range, title, and optionally
@@ -44,7 +45,8 @@ const HistogramFooter = React.memo(
data-testclass="brushable-histogram-field-name"
style={{ fontStyle: "italic" }}
>
- {isObs ? displayName : null}
+ {isObs && displayName}
+ {isGeneSetSummary && "gene set mean expression"}
: {rangeMin}
diff --git a/client/src/components/brushableHistogram/index.js b/client/src/components/brushableHistogram/index.js
index 277b1c01..754d9a0f 100644
--- a/client/src/components/brushableHistogram/index.js
+++ b/client/src/components/brushableHistogram/index.js
@@ -364,6 +364,7 @@ class HistogramBrush extends React.PureComponent {
isUserDefined,
isDiffExp,
logFoldChange,
+ isGeneSetSummary,
pvalAdj,
isScatterplotXXaccessor,
isScatterplotYYaccessor,
@@ -449,8 +450,9 @@ class HistogramBrush extends React.PureComponent {
selectionRange={continuousSelectionRange}
mini={mini}
/>
- {!mini ? (
+ {!mini && (
- ) : null}
+ )}
) : null
}
diff --git a/client/src/components/geneExpression/geneSet.js b/client/src/components/geneExpression/geneSet.js
index 23614a87..b13899cc 100644
--- a/client/src/components/geneExpression/geneSet.js
+++ b/client/src/components/geneExpression/geneSet.js
@@ -1,7 +1,5 @@
import React from "react";
import { connect } from "react-redux";
-import { Position, Switch } from "@blueprintjs/core";
-import { Tooltip2 } from "@blueprintjs/popover2";
import { FaChevronRight, FaChevronDown } from "react-icons/fa";
import actions from "../../actions";
import Gene from "./gene";
@@ -27,7 +25,6 @@ class GeneSet extends React.Component {
super(props);
this.state = {
isOpen: false,
- toggleSummaryHisto: false,
};
}
@@ -81,11 +78,6 @@ class GeneSet extends React.Component {
// });
};
- toggleSummaryHisto = () => {
- const { toggleSummaryHisto } = this.state;
- this.setState({ toggleSummaryHisto: !toggleSummaryHisto });
- };
-
renderGenes() {
const {
setName,
@@ -130,8 +122,8 @@ class GeneSet extends React.Component {
render() {
const { setName, setGenes, genesetDescription } = this.props;
- const { isOpen, toggleSummaryHisto } = this.state;
- const genesetNameLengthVisible = 120; /* this magic number determines how much of a long geneset name we see */
+ const { isOpen } = this.state;
+ const genesetNameLengthVisible = 150; /* this magic number determines how much of a long geneset name we see */
const genesetIsEmpty = setGenes.length === 0;
return (
@@ -184,55 +176,25 @@ class GeneSet extends React.Component {
)}
-
+
- {isOpen && !genesetIsEmpty && (
-
-
-
- )}
-
{isOpen && genesetIsEmpty && (
No genes to display
)}
- {isOpen &&
- (!toggleSummaryHisto && !genesetIsEmpty
- ? this.renderGenes()
- : setGenes.length > 0 && (
-
- ))}
+ {isOpen && !genesetIsEmpty && setGenes.length > 0 && (
+
+ )}
+ {isOpen && !genesetIsEmpty && this.renderGenes()}
@@ -130,12 +119,11 @@ class GenesetMenus extends React.PureComponent {
/>