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

_.get instead of ternary
This commit is contained in:
Colin Megill
2018-08-03 15:22:08 -04:00
committed by GitHub
5 changed files with 19 additions and 63 deletions
+3 -13
View File
@@ -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,
@@ -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 {
+3 -13
View File
@@ -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,