Move a few JS files (#4841)

* Moving JS files

* Moving pointers

* lint

superset/assets/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx

@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { describe, it, beforeEach } from 'mocha';
 import { shallow } from 'enzyme';
 import { getFormDataFromControls, defaultControls }
-  from '../../../../src/explore/stores/store';
+  from '../../../../src/explore/store';
 import {
   ControlPanelsContainer,
 } from '../../../../src/explore/components/ControlPanelsContainer';

superset/assets/spec/javascripts/explore/exploreActions_spec.js

@@ -5,7 +5,7 @@ import sinon from 'sinon';
 import $ from 'jquery';
 import * as chartActions from '../../../src/chart/chartAction';
 import * as actions from '../../../src/explore/actions/exploreActions';
-import { defaultState } from '../../../src/explore/stores/store';
+import { defaultState } from '../../../src/explore/store';
 import exploreReducer from '../../../src/explore/reducers/exploreReducer';
 
 describe('reducers', () => {

superset/assets/src/SqlLab/components/VisualizeModal.jsx

@@ -12,7 +12,7 @@ import shortid from 'shortid';
 import { exportChart } from '../../explore/exploreUtils';
 import * as actions from '../actions';
 import { VISUALIZE_VALIDATION_ERRORS } from '../constants';
-import visTypes from '../../explore/stores/visTypes';
+import visTypes from '../../explore/visTypes';
 import { t } from '../../locales';
 
 const CHART_TYPES = Object.keys(visTypes)

superset/assets/src/addSlice/AddSliceContainer.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Button, Panel } from 'react-bootstrap';
 import Select from 'react-virtualized-select';
-import visTypes from '../explore/stores/visTypes';
+import visTypes from '../explore/visTypes';
 import { t } from '../locales';
 
 const propTypes = {

superset/assets/src/chart/Chart.jsx

@@ -10,7 +10,7 @@ import Loading from '../components/Loading';
 import { Logger, LOG_ACTIONS_RENDER_EVENT } from '../logger';
 import StackTraceMessage from '../components/StackTraceMessage';
 import RefreshChartOverlay from '../components/RefreshChartOverlay';
-import visMap from '../visualizations/main';
+import visMap from '../visualizations';
 import sandboxedEval from '../modules/sandbox';
 import './chart.css';
 

superset/assets/src/components/AlteredSliceTag.jsx

@@ -4,7 +4,7 @@ import { Table, Tr, Td, Thead, Th } from 'reactable';
 import { isEqual, isEmpty } from 'underscore';
 
 import TooltipWrapper from './TooltipWrapper';
-import { controls } from '../explore/stores/controls';
+import { controls } from '../explore/controls';
 import ModalTrigger from './ModalTrigger';
 import { t } from '../locales';
 

superset/assets/src/dashboard/reducers.js

@@ -7,7 +7,7 @@ import charts, { chart } from '../chart/chartReducer';
 import * as actions from './actions';
 import { getParam } from '../modules/utils';
 import { alterInArr, removeFromArr } from '../reduxUtils';
-import { applyDefaultFormData } from '../explore/stores/store';
+import { applyDefaultFormData } from '../explore/store';
 import { getColorFromScheme } from '../modules/colors';
 
 export function getInitialState(bootstrapData) {

superset/assets/src/explore/components/ControlPanelsContainer.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { Alert, Tab, Tabs } from 'react-bootstrap';
-import visTypes, { sectionsToRender } from '../stores/visTypes';
+import visTypes, { sectionsToRender } from '../visTypes';
 import ControlPanelSection from './ControlPanelSection';
 import ControlRow from './ControlRow';
 import Control from './Control';
-import controls from '../stores/controls';
+import controls from '../controls';
 import * as actions from '../actions/exploreActions';
 
 const propTypes = {

superset/assets/src/explore/components/ExploreViewContainer.jsx

@@ -10,7 +10,7 @@ import SaveModal from './SaveModal';
 import QueryAndSaveBtns from './QueryAndSaveBtns';
 import { getExploreUrlAndPayload, getExploreLongUrl } from '../exploreUtils';
 import { areObjectsEqual } from '../../reduxUtils';
-import { getFormDataFromControls } from '../stores/store';
+import { getFormDataFromControls } from '../store';
 import { chartPropType } from '../../chart/chartReducer';
 import * as exploreActions from '../actions/exploreActions';
 import * as saveModalActions from '../actions/saveModalActions';

superset/assets/src/explore/components/controls/AnnotationLayer.jsx

@@ -24,7 +24,7 @@ import { ALL_COLOR_SCHEMES } from '../../../modules/colors';
 import PopoverSection from '../../../components/PopoverSection';
 import ControlHeader from '../ControlHeader';
 import { nonEmpty } from '../../validators';
-import vizTypes from '../../stores/visTypes';
+import vizTypes from '../../visTypes';
 
 const AUTOMATIC_COLOR = '';
 

superset/assets/src/explore/components/controls/FixedOrMetricControl.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Label, Popover, OverlayTrigger } from 'react-bootstrap';
 
-import controls from '../../stores/controls';
+import controls from '../../controls';
 import TextControl from './TextControl';
 import SelectControl from './SelectControl';
 import ControlHeader from '../ControlHeader';

superset/assets/src/explore/components/controls/VizTypeControl.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {
   Label, Row, Col, FormControl, Modal, OverlayTrigger,
   Tooltip } from 'react-bootstrap';
-import visTypes from '../../stores/visTypes';
+import visTypes from '../../visTypes';
 import ControlHeader from '../ControlHeader';
 import { t } from '../../../locales';
 

superset/assets/src/explore/controls.jsx

@@ -43,14 +43,14 @@ import {
   formatSelectOptionsForRange,
   formatSelectOptions,
   mainMetric,
-} from '../../modules/utils';
-import * as v from '../validators';
-import { colorPrimary, ALL_COLOR_SCHEMES, spectrums } from '../../modules/colors';
-import { defaultViewport } from '../../modules/geo';
-import MetricOption from '../../components/MetricOption';
-import ColumnOption from '../../components/ColumnOption';
-import OptionDescription from '../../components/OptionDescription';
-import { t } from '../../locales';
+} from '../modules/utils';
+import * as v from './validators';
+import { colorPrimary, ALL_COLOR_SCHEMES, spectrums } from '../modules/colors';
+import { defaultViewport } from '../modules/geo';
+import MetricOption from '../components/MetricOption';
+import ColumnOption from '../components/ColumnOption';
+import OptionDescription from '../components/OptionDescription';
+import { t } from '../locales';
 
 const D3_FORMAT_DOCS = 'D3 format syntax: https://github.com/d3/d3-format';
 

superset/assets/src/explore/index.jsx

@@ -10,7 +10,7 @@ import { now } from '../modules/dates';
 import { initEnhancer } from '../reduxUtils';
 import { getChartKey } from './exploreUtils';
 import AlertsWrapper from '../components/AlertsWrapper';
-import { getControlsState, getFormDataFromControls } from './stores/store';
+import { getControlsState, getFormDataFromControls } from './store';
 import { initJQueryAjax } from '../modules/utils';
 import ExploreViewContainer from './components/ExploreViewContainer';
 import rootReducer from './reducers/index';

superset/assets/src/explore/reducers/exploreReducer.js

@@ -1,5 +1,5 @@
 /* eslint camelcase: 0 */
-import { getControlsState, getFormDataFromControls } from '../stores/store';
+import { getControlsState, getFormDataFromControls } from '../store';
 import * as actions from '../actions/exploreActions';
 
 export default function exploreReducer(state = {}, action) {

superset/assets/src/explore/visTypes.js

@@ -3,8 +3,8 @@
  * and associated with each and every visualization type.
  */
 import { D3_TIME_FORMAT_OPTIONS } from './controls';
-import * as v from '../validators';
-import { t } from '../../locales';
+import * as v from './validators';
+import { t } from '../locales';
 
 export const sections = {
   druidTimeSeries: {

superset/assets/src/modules/AnnotationTypes.js

@@ -1,5 +1,5 @@
-import { VIZ_TYPES } from '../visualizations/main';
-import vizTypes from '../explore/stores/visTypes';
+import { VIZ_TYPES } from '../visualizations';
+import vizTypes from '../explore/visTypes';
 
 export const ANNOTATION_TYPES = {
   FORMULA: 'FORMULA',

superset/assets/src/syncBackend.js

@@ -1,7 +1,7 @@
 /* eslint no-console: 0 */
 import fs from 'fs';
 import path from 'path';
-import { controls } from './explore/stores/controls';
+import { controls } from './explore/controls';
 
 function exportFile(fileLocation, content) {
   fs.writeFile(fileLocation, content, function (err) {

superset/assets/src/visualizations/filter_box.jsx

@@ -10,7 +10,7 @@ import { Button } from 'react-bootstrap';
 import DateFilterControl from '../explore/components/controls/DateFilterControl';
 import ControlRow from '../explore/components/ControlRow';
 import Control from '../explore/components/Control';
-import controls from '../explore/stores/controls';
+import controls from '../explore/controls';
 import OnPasteSelect from '../components/OnPasteSelect';
 import VirtualizedRendererWrap from '../components/VirtualizedRendererWrap';
 import './filter_box.css';

superset/assets/src/visualizations/nvd3_vis.js

@@ -20,7 +20,7 @@ import { t } from '../locales';
 
 // CSS
 import './nvd3_vis.css';
-import { VIZ_TYPES } from './main';
+import { VIZ_TYPES } from './';
 
 const minBarWidth = 15;
 // Limit on how large axes margins can grow as the chart window is resized