Revert "Remove Continuous vars with 1 value from histogram, add to info drawer (#1927)" (#1953)

This reverts commit 242546371b.

client/src/components/brushableHistogram/index.js

@@ -450,7 +450,6 @@ const Histogram = ({
     isScatterplotYYaccessor: state.controls.scatterplotYYaccessor === field,
     continuousSelectionRange: state.continuousSelection[myName],
     isColorAccessor: state.colors.colorAccessor === field,
-    singleContinuousValues: state.singleContinuousValue.singleContinuousValues,
   };
 })
 class HistogramBrush extends React.PureComponent {
@@ -609,44 +608,18 @@ class HistogramBrush extends React.PureComponent {
   };
 
   fetchAsyncProps = async () => {
-    const { annoMatrix, field, dispatch, singleContinuousValues } = this.props;
+    const { annoMatrix } = this.props;
     const { isClipped } = annoMatrix;
-    if (singleContinuousValues.has(field)) {
+
-      return {
-        histogram: undefined,
-        range: undefined,
-        unclippedRange: undefined,
-        unclippedRangeColor: globals.blue,
-        isSingleValue: true,
-        OK2Render: false,
-      };
-    }
     const query = this.createQuery();
     const df = await annoMatrix.fetch(...query);
     const column = df.icol(0);
 
+    // if we are clipped, fetch both our value and our unclipped value,
+    // as we need the absolute min/max range, not just the clipped min/max.
     const summary = column.summarize();
     const range = [summary.min, summary.max];
 
-    if (summary.min === summary.max && !isClipped) {
-      dispatch({
-        type: "add single continuous value",
-        field,
-        value: summary.min,
-      });
-      return {
-        histogram: undefined,
-        range,
-        unclippedRange: range,
-        unclippedRangeColor: globals.blue,
-        isSingleValue: true,
-        OK2Render: false,
-      };
-    }
-
-    const isSingleValue = summary.min === summary.max;
-    // if we are clipped, fetch both our value and our unclipped value,
-    // as we need the absolute min/max range, not just the clipped min/max.
     let unclippedRange = [...range];
     if (isClipped) {
       const parent = await annoMatrix.viewOf.fetch(...query);
@@ -670,6 +643,7 @@ class HistogramBrush extends React.PureComponent {
       this.height
     );
 
+    const isSingleValue = summary.min === summary.max;
     const nonFiniteExtent =
       summary.min === undefined ||
       summary.max === undefined ||

client/src/components/infoDrawer/infoDrawer.js

@@ -1,6 +1,7 @@
 import React, { PureComponent } from "react";
-import { connect, shallowEqual } from "react-redux";
+import { connect } from "react-redux";
 import { Drawer } from "@blueprintjs/core";
+
 import InfoFormat from "./infoFormat";
 import { selectableCategoryNames } from "../../util/stateManager/controlsHelpers";
 
@@ -12,14 +13,9 @@ import { selectableCategoryNames } from "../../util/stateManager/controlsHelpers
     aboutURL: state.config?.links?.["about-dataset"],
     isOpen: state.controls.datasetDrawer,
     dataPortalProps: state.config?.["corpora_props"] ?? {},
-    singleContinuousValues: state.singleContinuousValue.singleContinuousValues,
   };
 })
 class InfoDrawer extends PureComponent {
-  static watchAsync(props, prevProps) {
-    return !shallowEqual(props.watchProps, prevProps.watchProps);
-  }
-
   handleClose = () => {
     const { dispatch } = this.props;
 
@@ -34,22 +30,18 @@ class InfoDrawer extends PureComponent {
       schema,
       isOpen,
       dataPortalProps,
-      singleContinuousValues,
     } = this.props;
 
     const allCategoryNames = selectableCategoryNames(schema).sort();
-    const allSingleValues = new Map();
+    const singleValueCategories = new Map();
 
     allCategoryNames.forEach((catName) => {
       const isUserAnno = schema?.annotations?.obsByName[catName]?.writable;
       const colSchema = schema.annotations.obsByName[catName];
       if (!isUserAnno && colSchema.categories?.length === 1) {
-        allSingleValues.set(catName, colSchema.categories[0]);
+        singleValueCategories.set(catName, colSchema.categories[0]);
       }
     });
-    singleContinuousValues.forEach((value, catName) => {
-      allSingleValues.set(catName, value);
-    });
 
     return (
       <Drawer
@@ -61,7 +53,7 @@ class InfoDrawer extends PureComponent {
           {...{
             datasetTitle,
             aboutURL,
-            allSingleValues,
+            singleValueCategories,
             dataPortalProps,
           }}
         />

client/src/components/infoDrawer/infoFormat.js

@@ -85,13 +85,13 @@ const ONTOLOGY_KEY = "ontology_term_id";
 const CAT_WIDTH = "30%";
 const VAL_WIDTH = "35%";
 // Render list of metadata attributes found in categorical field
-const renderSingleValues = (singleValues) => {
+const renderSingleValueCategories = (singleValueCategories) => {
-  if (singleValues.size === 0) return null;
+  if (singleValueCategories.size === 0) return null;
   return (
     <>
       <H3>Dataset Metadata</H3>
       <UL>
-        {Array.from(singleValues).reduce((elems, pair) => {
+        {Array.from(singleValueCategories).reduce((elems, pair) => {
           const [category, value] = pair;
           // If the value is empty skip it
           if (!value) return elems;
@@ -168,7 +168,7 @@ const renderLinks = (projectLinks, aboutURL) => {
 };
 
 const InfoFormat = React.memo(
-  ({ datasetTitle, allSingleValues, aboutURL, dataPortalProps = {} }) => {
+  ({ datasetTitle, singleValueCategories, aboutURL, dataPortalProps = {} }) => {
     if (dataPortalProps.version?.["corpora_schema_version"] !== "1.0.0") {
       dataPortalProps = {};
     }
@@ -190,7 +190,7 @@ const InfoFormat = React.memo(
         {renderDOILink("DOI", doi)}
         {renderDOILink("Preprint DOI", preprintDOI)}
         {renderOrganism(organism)}
-        {renderSingleValues(allSingleValues)}
+        {renderSingleValueCategories(singleValueCategories)}
         {renderLinks(projectLinks, aboutURL)}
       </div>
     );

client/src/reducers/index.js

@@ -21,7 +21,7 @@ import centroidLabels from "./centroidLabels";
 import pointDialation from "./pointDilation";
 import { reembedController } from "./reembed";
 import { gcMiddleware as annoMatrixGC } from "../annoMatrix";
-import singleContinuousValue from "./singleContinuousValue";
+
 import undoableConfig from "./undoableConfig";
 
 const Reducer = undoable(
@@ -32,7 +32,6 @@ const Reducer = undoable(
     ["ontology", ontology],
     ["annotations", annotations],
     ["layoutChoice", layoutChoice],
-    ["singleContinuousValue", singleContinuousValue],
     ["categoricalSelection", categoricalSelection],
     ["continuousSelection", continuousSelection],
     ["graphSelection", graphSelection],

client/src/reducers/singleContinuousValue.js

@@ -1,14 +0,0 @@
-const initialState = {
-  singleContinuousValues: new Map(),
-};
-const singleContinuousValue = (state = initialState, action) => {
-  switch (action.type) {
-    case "add single continuous value":
-      state.singleContinuousValues.set(action.field, action.value);
-      return state;
-    default:
-      return state;
-  }
-};
-
-export default singleContinuousValue;