Breaking down large files, fixing JS warnings

apache · Dec 6, 2016 · 1fd8263 · 1fd8263
1 parent 3597fdb
commit 1fd8263
Show file tree

Hide file tree

Showing 9 changed files with 1,748 additions and 1,738 deletions.
diff --git a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
@@ -165,7 +165,7 @@ class ChartContainer extends React.Component {
         id={this.props.containerId}
         ref={(ref) => { this.chartContainerRef = ref; }}
         className={this.props.viz_type}
-        style={{ 'overflow-x': 'scroll' }}
+        style={{ overflowX: 'scroll' }}
       />
     );
   }

diff --git a/superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx
@@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux';
 import * as actions from '../actions/exploreActions';
 import { connect } from 'react-redux';
 import { Panel, Alert } from 'react-bootstrap';
-import { visTypes, sectionsToRender, commonControlPanelSections } from '../stores/store';
+import visTypes, { sectionsToRender, commonControlPanelSections } from '../stores/visTypes';
 import ControlPanelSection from './ControlPanelSection';
 import FieldSetRow from './FieldSetRow';
 import Filters from './Filters';

diff --git a/superset/assets/javascripts/explorev2/components/ExploreViewContainer.jsx b/superset/assets/javascripts/explorev2/components/ExploreViewContainer.jsx
@@ -7,7 +7,7 @@ import ChartContainer from './ChartContainer';
 import ControlPanelsContainer from './ControlPanelsContainer';
 import SaveModal from './SaveModal';
 import QueryAndSaveBtns from '../../explore/components/QueryAndSaveBtns';
-import { autoQueryFields } from '../stores/store';
+import { autoQueryFields } from '../stores/fields';
 import { getParamObject } from '../exploreUtils';
 
 const $ = require('jquery');

diff --git a/superset/assets/javascripts/explorev2/components/FieldSet.jsx b/superset/assets/javascripts/explorev2/components/FieldSet.jsx
@@ -3,7 +3,7 @@ import TextField from './TextField';
 import CheckboxField from './CheckboxField';
 import TextAreaField from './TextAreaField';
 import SelectField from './SelectField';
-import { fieldTypes } from '../stores/store';
+import { fieldTypes } from '../stores/fields';
 
 const propTypes = {
   name: PropTypes.string.isRequired,

diff --git a/superset/assets/javascripts/explorev2/components/Filters.jsx b/superset/assets/javascripts/explorev2/components/Filters.jsx
@@ -30,11 +30,14 @@ class Filters extends React.Component {
   }
   render() {
     const filters = [];
+    let i = 0;
     this.props.filters.forEach((filter) => {
       // only display filters with current prefix
+      i++;
       if (filter.prefix === this.props.prefix) {
         filters.push(
           <Filter
+            key={i}
             filterColumnOpts={this.props.filterColumnOpts}
             actions={this.props.actions}
             prefix={this.props.prefix}