wildcards front end

plotly · Jan 30, 2020 · 05908b2 · 05908b2
1 parent e2e3566
commit 05908b2
Show file tree

Hide file tree

Showing 28 changed files with 1,853 additions and 1,355 deletions.
diff --git a/dash-renderer/package-lock.json b/dash-renderer/package-lock.json
diff --git a/dash-renderer/package.json b/dash-renderer/package.json
@@ -25,6 +25,7 @@
     "prop-types": "15.7.2",
     "cookie": "^0.3.1",
     "dependency-graph": "^0.5.0",
+    "fast-isnumeric": "^1.1.3",
     "radium": "^0.22.1",
     "ramda": "^0.26.1",
     "react-redux": "^4.4.5",

diff --git a/dash-renderer/src/APIController.react.js b/dash-renderer/src/APIController.react.js
@@ -1,17 +1,14 @@
 import {connect} from 'react-redux';
-import {includes, isEmpty, isNil} from 'ramda';
+import {includes, isEmpty} from 'ramda';
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import TreeContainer from './TreeContainer';
 import GlobalErrorContainer from './components/error/GlobalErrorContainer.react';
-import {
-    computeGraphs,
-    computePaths,
-    hydrateInitialOutputs,
-    setLayout,
-} from './actions/index';
-import {applyPersistence} from './persistence';
+import {hydrateInitialOutputs, setGraphs, setPaths, setLayout} from './actions';
+import {computePaths} from './actions/paths';
+import {computeGraphs} from './actions/dependencies';
 import apiThunk from './actions/api';
+import {applyPersistence} from './persistence';
 import {getAppState} from './reducers/constants';
 import {STATUS} from './constants/constants';
 
@@ -42,7 +39,6 @@ class UnconnectedContainer extends Component {
             graphs,
             layout,
             layoutRequest,
-            paths,
         } = props;
 
         if (isEmpty(layoutRequest)) {
@@ -53,9 +49,8 @@ class UnconnectedContainer extends Component {
                     layoutRequest.content,
                     dispatch
                 );
+                dispatch(setPaths(computePaths(finalLayout, [])));
                 dispatch(setLayout(finalLayout));
-            } else if (isNil(paths)) {
-                dispatch(computePaths({subTree: layout, startingPath: []}));
             }
         }
 
@@ -67,7 +62,7 @@ class UnconnectedContainer extends Component {
             dependenciesRequest.status === STATUS.OK &&
             isEmpty(graphs)
         ) {
-            dispatch(computeGraphs(dependenciesRequest.content));
+            dispatch(setGraphs(computeGraphs(dependenciesRequest.content)));
         }
 
         if (
@@ -77,7 +72,6 @@ class UnconnectedContainer extends Component {
             // LayoutRequest and its computed stores
             layoutRequest.status === STATUS.OK &&
             !isEmpty(layout) &&
-            !isNil(paths) &&
             // Hasn't already hydrated
             appLifecycle === getAppState('STARTED')
         ) {
@@ -118,20 +112,15 @@ class UnconnectedContainer extends Component {
             return (
                 <div className="_dash-error">Error loading dependencies</div>
             );
-        } else if (
-            appLifecycle === getAppState('HYDRATED') &&
-            config.ui === true
-        ) {
-            return (
+        } else if (appLifecycle === getAppState('HYDRATED')) {
+            return config.ui === true ? (
                 <GlobalErrorContainer>
                     <TreeContainer
                         _dashprivate_layout={layout}
                         _dashprivate_path={[]}
                     />
                 </GlobalErrorContainer>
-            );
-        } else if (appLifecycle === getAppState('HYDRATED')) {
-            return (
+            ) : (
                 <TreeContainer
                     _dashprivate_layout={layout}
                     _dashprivate_path={[]}
@@ -151,7 +140,6 @@ UnconnectedContainer.propTypes = {
     dependenciesRequest: PropTypes.object,
     layoutRequest: PropTypes.object,
     layout: PropTypes.object,
-    paths: PropTypes.object,
     history: PropTypes.any,
     error: PropTypes.object,
     config: PropTypes.object,
@@ -165,7 +153,6 @@ const Container = connect(
         layoutRequest: state.layoutRequest,
         layout: state.layout,
         graphs: state.graphs,
-        paths: state.paths,
         history: state.history,
         error: state.error,
         config: state.config,