Merge pull request #144 from chanzuckerberg/#41-get-fixes

_.get instead of ternary

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')
+      console.log("!checked, firing toggle all");
-      this.toggleAll()
+      this.toggleAll();
     }
   }
   render() {
@@ -131,7 +131,7 @@ class Category extends React.Component {
             {this.props.metadataField}
             <input
               onChange={this.handleToggleAllClick.bind(this)}
-              ref={el => 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 =
+  const ranges = _.get("state.cells.cells.data.ranges", null);
-    state.cells.cells && state.cells.cells.data.ranges
-      ? state.cells.cells.data.ranges
-      : null;
 
   return {
     ranges

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 =
+  const ranges = _.get("state.cells.cells.data.ranges", null);
-    state.cells.cells && state.cells.cells.data.ranges
+  const metadata = _.get("state.cells.cells.data.metadata", null);
-      ? state.cells.cells.data.ranges
+  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
-      : 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;
 
   return {
     ranges,

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 =
+  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
-    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;
 
   return {
+    initializeRanges,
     colorAccessor: state.controls.colorAccessor,
     colorScale: state.controls.colorScale,
-    cellsMetadata: state.controls.cellsMetadata,
+    cellsMetadata: state.controls.cellsMetadata
-    initializeRanges
   };
 })
 class HistogramBrush extends React.Component {

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 =
+  const ranges = _.get("state.cells.cells.data.ranges", null);
-    state.cells.cells && state.cells.cells.data.ranges
+  const metadata = _.get("state.cells.cells.data.metadata", null);
-      ? state.cells.cells.data.ranges
+  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
-      : 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;
 
   return {
     ranges,

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 =
+  const ranges = _.get("state.cells.cells.data.ranges", null);
-    state.cells.cells && state.cells.cells.data.ranges
+  const metadata = _.get("state.cells.cells.data.metadata", null);
-      ? state.cells.cells.data.ranges
+  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
-      : 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;
 
   return {
     ranges,