#130 redux refactor (#208)

* mocks for redux refactor - for discussion

* more API design on redux refactor

* add new reuqired dependencies for build

* change babel target to use modern browser

* remove dead code

* remove dead code - joy plots

* checkpoint on redux refactoring

* checkpoint on redux refactoring

* fix mistaken rebase conflict resolution

* dead code removal; add name to dataframe backmap

* rename dataframe to universe

* update eslint config to more closely match prettier

* lint

* more eslint updates to match prettier

* additional config to make eslint match prettier

* add expression data to Universe/World

* remove obsolete reducers

* lint fixes

* more eslint cleanup

* lint

* lint

* fix but in countAllOnes when dimensions gt 1

* lint; do not display name metadata field

* lint; colors refactor

* lint; colors refactor

* update comments

* first cut at regraph and reset

* enable object-curly-braces consistent mode

* lint, handle regraph with no selection

* fix expression scatterplot bugs

* fix regression legend display

* add expression data cache

* remove console logging

* reset cell color on regraph/reset

* remove obsolete server URLs

* rename UniverseV01 to Universe_REST_API_v01

* add additional comments on the varDataCache

* merge universe reducer into controls reducer; simplify initialization-related actions

* use spread operator

* fix erroneous comment

* convert universe and world state to plain objects, and functionalize supporting code (remove ES6 classes)

* use spread operator

* lint

* improve variable names

* rename obsCrossfilter to crossfilter and obsDimensionMap to dimensionMap

* rename controls2 to controls

client/src/components/categorical/categorical.js

@@ -3,16 +3,14 @@ import React from "react";
 import _ from "lodash";
 import { connect } from "react-redux";
 
-import * as globals from "../../globals";
-import styles from "./categorical.css";
-import SectionHeader from "../framework/sectionHeader";
-import Value from "./value";
-import { alphabeticallySortedValues } from "./util";
-
 import FaArrowRight from "react-icons/lib/fa/angle-right";
 import FaArrowDown from "react-icons/lib/fa/angle-down";
 import FaPaintBrush from "react-icons/lib/fa/paint-brush";
 
+import * as globals from "../../globals";
+import Value from "./value";
+import { alphabeticallySortedValues } from "./util";
+
 @connect(state => {
   return {
     colorAccessor: state.controls.colorAccessor,
@@ -27,6 +25,7 @@ class Category extends React.Component {
       isExpanded: false
     };
   }
+
   componentDidUpdate() {
     const valuesAsBool = _.values(
       this.props.categoricalAsBooleansMap[this.props.metadataField]
@@ -45,12 +44,14 @@ class Category extends React.Component {
       this.checkbox.indeterminate = true;
     }
   }
+
   handleColorChange() {
     this.props.dispatch({
       type: "color by categorical metadata",
       colorAccessor: this.props.metadataField
     });
   }
+
   toggleAll() {
     this.props.dispatch({
       type: "categorical metadata filter all of these",
@@ -58,6 +59,7 @@ class Category extends React.Component {
     });
     this.setState({ isChecked: true });
   }
+
   toggleNone() {
     this.props.dispatch({
       type: "categorical metadata filter none of these",
@@ -66,6 +68,7 @@ class Category extends React.Component {
     });
     this.setState({ isChecked: false });
   }
+
   renderCategoryItems() {
     return _.map(alphabeticallySortedValues(this.props.values), (v, i) => {
       return (
@@ -79,6 +82,7 @@ class Category extends React.Component {
       );
     });
   }
+
   handleToggleAllClick() {
     // || this.checkbox.indeterminate === false
     if (this.state.isChecked) {
@@ -89,6 +93,7 @@ class Category extends React.Component {
       this.toggleAll();
     }
   }
+
   render() {
     return (
       <div
@@ -164,8 +169,7 @@ class Category extends React.Component {
 }
 
 @connect(state => {
-  const ranges = _.get(state, "cells.cells.data.ranges", null);
-
+  const ranges = _.get(state.controls.world, "summary.obs", null);
   return {
     ranges
   };
@@ -192,7 +196,7 @@ class Categories extends React.Component {
       >
         {_.map(this.props.ranges, (value, key) => {
           const isColorField = key.includes("color") || key.includes("Color");
-          if (value.options && key !== "CellName" && !isColorField) {
+          if (value.options && !isColorField && key !== "name") {
             return (
               <Category key={key} metadataField={key} values={value.options} />
             );