fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-09-18 16:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
_.get instead of ternary
This commit is contained in:
Colin Megill
2018-08-03 15:22:08 -04:00
committed by GitHub
parent 76d5252506 b574542a60
commit dfea46eff0
5 changed files with 19 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/components/categorical/categorical.js
View File

@@ -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}
<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 =
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

16
client/src/components/continuous/continuous.js
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,

18
client/src/components/continuous/histogramBrush.js
View File

@@ -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 {

16
client/src/components/continuous/parallel.js
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,

15
client/src/components/scatterplot/scatterplot.js
View File

@@ -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,