[hofix] work around circular deps (#3598)

* [hofix] work around circular deps * lint
apache · Oct 4, 2017 · ed21244 · ed21244
1 parent 1528288
commit ed21244
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/superset/assets/javascripts/explore/components/controls/CollectionControl.jsx b/superset/assets/javascripts/explore/components/controls/CollectionControl.jsx
@@ -8,6 +8,7 @@ import {
 
 import InfoTooltipWithTrigger from '../../../components/InfoTooltipWithTrigger';
 import ControlHeader from '../ControlHeader';
+import controlMap from './';
 
 const propTypes = {
   name: PropTypes.string.isRequired,
@@ -63,6 +64,7 @@ export default class CollectionControl extends React.Component {
     if (this.props.value.length === 0) {
       return <div className="text-muted">{this.props.placeholder}</div>;
     }
+    const control = controlMap[this.props.control];
     return (
       <SortableListGroup
         useDragHandle
@@ -79,7 +81,7 @@ export default class CollectionControl extends React.Component {
               <SortableDragger />
             </div>
             <div className="pull-left">
-              <this.props.control
+              <control
                 {...o}
                 onChange={this.onChange.bind(this, i)}
               />

diff --git a/...pts/explore/components/controls/index.jsx → ...ipts/explore/components/controls/index.js b/...pts/explore/components/controls/index.jsx → ...ipts/explore/components/controls/index.js
@@ -29,5 +29,4 @@ const controlMap = {
   TimeSeriesColumnControl,
   VizTypeControl,
 };
-
 export default controlMap;
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -5,7 +5,6 @@ import { ALL_COLOR_SCHEMES, spectrums } from '../../modules/colors';
 import MetricOption from '../../components/MetricOption';
 import ColumnOption from '../../components/ColumnOption';
 import { t } from '../../locales';
-import controlMap from '../components/controls';
 
 const D3_FORMAT_DOCS = 'D3 format syntax: https://github.com/d3/d3-format';
 
@@ -1444,7 +1443,7 @@ export const controls = {
     type: 'CollectionControl',
     label: t('Time Series Columns'),
     validators: [v.nonEmpty],
-    control: controlMap.TimeSeriesColumnControl,
+    control: 'TimeSeriesColumnControl',
   },
 
 };

diff --git a/superset/assets/visualizations/time_table.jsx b/superset/assets/visualizations/time_table.jsx
@@ -3,7 +3,7 @@ import React from 'react';
 import propTypes from 'prop-types';
 import { Table, Thead, Th } from 'reactable';
 import d3 from 'd3';
-import { Sparkline, LineSeries, PointSeries } from '@data-ui/sparkline';
+import { Sparkline, LineSeries } from '@data-ui/sparkline';
 
 import MetricOption from '../javascripts/components/MetricOption';
 import TooltipWrapper from '../javascripts/components/TooltipWrapper';
@@ -94,10 +94,6 @@ function viz(slice, payload) {
                   showArea={false}
                   stroke={brandColor}
                 />
-                <PointSeries
-                  points={['min', 'max', 'last']}
-                  fill={brandColor}
-                />
               </Sparkline>
             </div>
           </TooltipWrapper>);