From b574542a608953dae7e371e04c4141b61a614e08 Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Mon, 23 Jul 2018 17:06:32 -0400 Subject: [PATCH] _.get fixes --- .../src/components/categorical/categorical.js | 17 +++++++---------- client/src/components/continuous/continuous.js | 16 +++------------- .../components/continuous/histogramBrush.js | 18 +++--------------- client/src/components/continuous/parallel.js | 16 +++------------- .../src/components/scatterplot/scatterplot.js | 15 +++------------ 5 files changed, 19 insertions(+), 63 deletions(-) diff --git a/client/src/components/categorical/categorical.js b/client/src/components/categorical/categorical.js index 997b3889..184c31cd 100644 --- a/client/src/components/categorical/categorical.js +++ b/client/src/components/categorical/categorical.js @@ -30,7 +30,7 @@ class Category extends React.Component { componentDidUpdate() { const valuesAsBool = _.values( this.props.categoricalAsBooleansMap[this.props.metadataField] - ) + ); /* count categories toggled on by counting true values */ const categoriesToggledOn = _.values(valuesAsBool).filter(v => v).length; @@ -80,13 +80,13 @@ class Category extends React.Component { }); } handleToggleAllClick() { - // || this.checkbox.indeterminate === false + // || this.checkbox.indeterminate === false if (this.state.isChecked) { - console.log('checked, firing toggle none') + console.log("checked, firing toggle none"); this.toggleNone(); } else if (!this.state.isChecked) { - console.log('!checked, firing toggle all') - this.toggleAll() + console.log("!checked, firing toggle all"); + this.toggleAll(); } } render() { @@ -131,7 +131,7 @@ class Category extends React.Component { {this.props.metadataField} this.checkbox = el} + ref={el => (this.checkbox = el)} checked={this.state.isChecked} type="checkbox" /> @@ -164,10 +164,7 @@ class Category extends React.Component { } @connect(state => { - const ranges = - state.cells.cells && state.cells.cells.data.ranges - ? state.cells.cells.data.ranges - : null; + const ranges = _.get("state.cells.cells.data.ranges", null); return { ranges diff --git a/client/src/components/continuous/continuous.js b/client/src/components/continuous/continuous.js index 226b6d0f..0ed15592 100644 --- a/client/src/components/continuous/continuous.js +++ b/client/src/components/continuous/continuous.js @@ -17,19 +17,9 @@ import HistogramBrush from "./histogramBrush"; import { margin, width, height, createDimensions } from "./util"; @connect(state => { - const ranges = - state.cells.cells && state.cells.cells.data.ranges - ? state.cells.cells.data.ranges - : null; - const metadata = - state.cells.cells && state.cells.cells.data.metadata - ? state.cells.cells.data.metadata - : null; - - const initializeRanges = - state.initialize.data && state.initialize.data.data.ranges - ? state.initialize.data.data.ranges - : null; + const ranges = _.get("state.cells.cells.data.ranges", null); + const metadata = _.get("state.cells.cells.data.metadata", null); + const initializeRanges = _.get("state.initialize.data.data.ranges", null); return { ranges, diff --git a/client/src/components/continuous/histogramBrush.js b/client/src/components/continuous/histogramBrush.js index a0d74f6c..f8fa645a 100644 --- a/client/src/components/continuous/histogramBrush.js +++ b/client/src/components/continuous/histogramBrush.js @@ -11,25 +11,13 @@ import FaPaintBrush from "react-icons/lib/fa/paint-brush"; import * as globals from "../../globals"; @connect(state => { - const ranges = - state.cells.cells && state.cells.cells.data.ranges - ? state.cells.cells.data.ranges - : null; - const metadata = - state.cells.cells && state.cells.cells.data.metadata - ? state.cells.cells.data.metadata - : null; - - const initializeRanges = - state.initialize.data && state.initialize.data.data.ranges - ? state.initialize.data.data.ranges - : null; + const initializeRanges = _.get("state.initialize.data.data.ranges", null); return { + initializeRanges, colorAccessor: state.controls.colorAccessor, colorScale: state.controls.colorScale, - cellsMetadata: state.controls.cellsMetadata, - initializeRanges + cellsMetadata: state.controls.cellsMetadata }; }) class HistogramBrush extends React.Component { diff --git a/client/src/components/continuous/parallel.js b/client/src/components/continuous/parallel.js index 0f53069e..d145f8a0 100644 --- a/client/src/components/continuous/parallel.js +++ b/client/src/components/continuous/parallel.js @@ -15,19 +15,9 @@ import drawLinesCanvas from "./drawLinesCanvas"; import { margin, width, height, createDimensions } from "./util"; @connect(state => { - const ranges = - state.cells.cells && state.cells.cells.data.ranges - ? state.cells.cells.data.ranges - : null; - const metadata = - state.cells.cells && state.cells.cells.data.metadata - ? state.cells.cells.data.metadata - : null; - - const initializeRanges = - state.initialize.data && state.initialize.data.data.ranges - ? state.initialize.data.data.ranges - : null; + const ranges = _.get("state.cells.cells.data.ranges", null); + const metadata = _.get("state.cells.cells.data.metadata", null); + const initializeRanges = _.get("state.initialize.data.data.ranges", null); return { ranges, diff --git a/client/src/components/scatterplot/scatterplot.js b/client/src/components/scatterplot/scatterplot.js index 8966d20a..35db0413 100644 --- a/client/src/components/scatterplot/scatterplot.js +++ b/client/src/components/scatterplot/scatterplot.js @@ -20,18 +20,9 @@ import { scaleLinear } from "../../util/scaleLinear"; import { margin, width, height, createDimensions } from "./util"; @connect(state => { - const ranges = - state.cells.cells && state.cells.cells.data.ranges - ? state.cells.cells.data.ranges - : null; - const metadata = - state.cells.cells && state.cells.cells.data.metadata - ? state.cells.cells.data.metadata - : null; - const initializeRanges = - state.initialize.data && state.initialize.data.data.ranges - ? state.initialize.data.data.ranges - : null; + const ranges = _.get("state.cells.cells.data.ranges", null); + const metadata = _.get("state.cells.cells.data.metadata", null); + const initializeRanges = _.get("state.initialize.data.data.ranges", null); return { ranges,