fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-09 21:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chanzuckerberg/cellxgene into bkmartinjr-crossfiltergroups

Browse Source
This commit is contained in:
bkmartinjr
2018-08-06 09:49:00 -07:00
parent 60238f61c4 6bc94a53ce
commit 72afb3510c
6 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/package.json
+2 -5
View File
@@ -36,7 +36,6 @@
"gl-matrix": "^2.7.1", "gl-matrix": "^2.7.1",
"halogen": "^0.2.0", "halogen": "^0.2.0",
"hsv2rgb": "^1.1.0", "hsv2rgb": "^1.1.0",
"jest": "^23.4.1",
"key-pressed": "0.0.1", "key-pressed": "0.0.1",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"luma.gl": "^4.0.3", "luma.gl": "^4.0.3",
@@ -58,7 +57,6 @@
"scroll-speed": "^1.0.0", "scroll-speed": "^1.0.0",
"serve-favicon": "^2.3.0", "serve-favicon": "^2.3.0",
"urijs": "^1.19.0", "urijs": "^1.19.0",
"webpack-hot-middleware": "^2.22.3",
"whatwg-fetch": "^2.0.3" "whatwg-fetch": "^2.0.3"
}, },
"devDependencies": { "devDependencies": {
@@ -96,7 +94,7 @@
"gzip-size": "^3.0.0", "gzip-size": "^3.0.0",
"html-webpack-inline-source-plugin": "0.0.6", "html-webpack-inline-source-plugin": "0.0.6",
"html-webpack-plugin": "^2.22.0", "html-webpack-plugin": "^2.22.0",
"jest": "^23.0.1", "jest": "^23.4.1",
"jsdom": "^9.4.1", "jsdom": "^9.4.1",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"nyc": "^10.0.0", "nyc": "^10.0.0",
@@ -111,8 +109,7 @@
"web-app-manifest-loader": "^0.1.1", "web-app-manifest-loader": "^0.1.1",
"webpack": "^2.2.0-rc.4", "webpack": "^2.2.0-rc.4",
"webpack-dev-middleware": "^1.6.1", "webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.12.2", "webpack-hot-middleware": "^2.22.3"
"whatwg-fetch": "^2.0.1"
}, },
"jest": { "jest": {
"testMatch": [ "testMatch": [
client/src/components/categorical/categorical.js
+1 -1
View File
@@ -164,7 +164,7 @@ class Category extends React.Component {
} }
@connect(state => { @connect(state => {
const ranges = _.get("state.cells.cells.data.ranges", null); const ranges = _.get(state, "cells.cells.data.ranges", null);
return { return {
ranges ranges
client/src/components/continuous/continuous.js
+3 -3
View File
@@ -17,9 +17,9 @@ import HistogramBrush from "./histogramBrush";
import { margin, width, height, createDimensions } from "./util"; import { margin, width, height, createDimensions } from "./util";
@connect(state => { @connect(state => {
const ranges = _.get("state.cells.cells.data.ranges", null); const ranges = _.get(state, "cells.cells.data.ranges", null);
const metadata = _.get("state.cells.cells.data.metadata", null); const metadata = _.get(state, "cells.cells.data.metadata", null);
const initializeRanges = _.get("state.initialize.data.data.ranges", null); const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
return { return {
ranges, ranges,
client/src/components/continuous/histogramBrush.js
+2 -3
View File
@@ -11,7 +11,7 @@ import FaPaintBrush from "react-icons/lib/fa/paint-brush";
import * as globals from "../../globals"; import * as globals from "../../globals";
@connect(state => { @connect(state => {
const initializeRanges = _.get("state.initialize.data.data.ranges", null); const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
return { return {
initializeRanges, initializeRanges,
@@ -89,8 +89,7 @@ class HistogramBrush extends React.Component {
const bins = this.histogramCache.bins; const bins = this.histogramCache.bins;
const numValues = this.histogramCache.numValues; const numValues = this.histogramCache.numValues;
d3 d3.select(svgRef)
.select(svgRef)
.insert("g", "*") .insert("g", "*")
.attr("fill", "#bbb") .attr("fill", "#bbb")
.selectAll("rect") .selectAll("rect")
client/src/components/continuous/parallel.js
+3 -3
View File
@@ -15,9 +15,9 @@ import drawLinesCanvas from "./drawLinesCanvas";
import { margin, width, height, createDimensions } from "./util"; import { margin, width, height, createDimensions } from "./util";
@connect(state => { @connect(state => {
const ranges = _.get("state.cells.cells.data.ranges", null); const ranges = _.get(state, "cells.cells.data.ranges", null);
const metadata = _.get("state.cells.cells.data.metadata", null); const metadata = _.get(state, "cells.cells.data.metadata", null);
const initializeRanges = _.get("state.initialize.data.data.ranges", null); const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
return { return {
ranges, ranges,
client/src/components/scatterplot/scatterplot.js
+3 -3
View File
@@ -20,9 +20,9 @@ import { scaleLinear } from "../../util/scaleLinear";
import { margin, width, height, createDimensions } from "./util"; import { margin, width, height, createDimensions } from "./util";
@connect(state => { @connect(state => {
const ranges = _.get("state.cells.cells.data.ranges", null); const ranges = _.get(state, "cells.cells.data.ranges", null);
const metadata = _.get("state.cells.cells.data.metadata", null); const metadata = _.get(state, "cells.cells.data.metadata", null);
const initializeRanges = _.get("state.initialize.data.data.ranges", null); const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
return { return {
ranges, ranges,