From 0c9f9b695b921c7e17cec83e1d51e4aa3cae7cc9 Mon Sep 17 00:00:00 2001 From: Alanna Scott Date: Wed, 24 May 2017 17:12:28 -0700 Subject: [PATCH] [clarity/consistency] rename /explorev2/ -> /explore/ (#2802) * rename /explorev2/ -> /explore/ * add redirect for existing explorev2 urls * fix long line * remove extra line * fix missed ref in spec --- .../SqlLab/components/VisualizeModal.jsx | 3 +-- .../actions/exploreActions.js | 0 .../components/ChartContainer.jsx | 0 .../{explorev2 => explore}/components/Control.jsx | 0 .../components/ControlHeader.jsx | 0 .../components/ControlPanelSection.jsx | 0 .../components/ControlPanelsContainer.jsx | 0 .../components/ControlRow.jsx | 0 .../components/DisplayQueryButton.jsx | 0 .../components/EmbedCodeButton.jsx | 0 .../components/ExploreActionButtons.jsx | 0 .../components/ExploreViewContainer.jsx | 0 .../components/QueryAndSaveBtns.jsx | 0 .../components/SaveModal.jsx | 0 .../components/URLShortLinkButton.jsx | 0 .../components/controls/CheckboxControl.jsx | 0 .../components/controls/Filter.jsx | 0 .../components/controls/FilterControl.jsx | 0 .../components/controls/HiddenControl.jsx | 0 .../components/controls/SelectControl.jsx | 0 .../components/controls/TextAreaControl.jsx | 0 .../components/controls/TextControl.jsx | 0 .../{explorev2 => explore}/exploreUtils.js | 0 .../javascripts/{explorev2 => explore}/index.jsx | 0 .../javascripts/{explorev2 => explore}/main.css | 0 .../reducers/exploreReducer.js | 0 .../{explorev2 => explore}/stores/controls.jsx | 0 .../{explorev2 => explore}/stores/store.js | 0 .../{explorev2 => explore}/stores/visTypes.js | 0 .../{explorev2 => explore}/validators.js | 0 superset/assets/javascripts/modules/superset.js | 4 ++-- superset/assets/javascripts/syncBackend.js | 2 +- .../spec/javascripts/explorev2/actions_spec.js | 8 ++++---- .../explorev2/components/ChartContainer_spec.js | 2 +- .../explorev2/components/CheckboxControl_spec.jsx | 2 +- .../components/ControlPanelsContainer_spec.jsx | 6 +++--- .../explorev2/components/ControlRow_spec.jsx | 2 +- .../components/DisplayQueryButton_spec.jsx | 2 +- .../explorev2/components/EmbedCodeButton_spec.jsx | 2 +- .../components/ExploreActionButtons_spec.jsx | 2 +- .../components/ExploreViewContainer_spec.js | 6 +++--- .../explorev2/components/FilterControl_spec.jsx | 4 ++-- .../explorev2/components/Filter_spec.jsx | 4 ++-- .../components/QueryAndSaveBtns_spec.jsx | 2 +- .../explorev2/components/SaveModal_spec.jsx | 4 ++-- .../explorev2/components/SelectControl_spec.jsx | 2 +- .../explorev2/components/TextArea_spec.jsx | 2 +- .../components/URLShortLinkButton_spec.jsx | 2 +- .../spec/javascripts/explorev2/utils_spec.jsx | 2 +- .../javascripts/sqllab/VisualizeModal_spec.jsx | 2 +- superset/assets/visualizations/nvd3_vis.js | 2 +- superset/assets/webpack.config.js | 2 +- .../superset/{explorev2.html => explore.html} | 2 +- superset/views/core.py | 15 +++++++++++++-- 54 files changed, 48 insertions(+), 38 deletions(-) rename superset/assets/javascripts/{explorev2 => explore}/actions/exploreActions.js (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ChartContainer.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/Control.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ControlHeader.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ControlPanelSection.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ControlPanelsContainer.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ControlRow.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/DisplayQueryButton.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/EmbedCodeButton.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ExploreActionButtons.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/ExploreViewContainer.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/QueryAndSaveBtns.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/SaveModal.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/URLShortLinkButton.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/CheckboxControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/Filter.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/FilterControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/HiddenControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/SelectControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/TextAreaControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/components/controls/TextControl.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/exploreUtils.js (100%) rename superset/assets/javascripts/{explorev2 => explore}/index.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/main.css (100%) rename superset/assets/javascripts/{explorev2 => explore}/reducers/exploreReducer.js (100%) rename superset/assets/javascripts/{explorev2 => explore}/stores/controls.jsx (100%) rename superset/assets/javascripts/{explorev2 => explore}/stores/store.js (100%) rename superset/assets/javascripts/{explorev2 => explore}/stores/visTypes.js (100%) rename superset/assets/javascripts/{explorev2 => explore}/validators.js (100%) rename superset/templates/superset/{explorev2.html => explore.html} (92%) diff --git a/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx b/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx index 821baa99ae..da0a19cb7c 100644 --- a/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx +++ b/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx @@ -8,7 +8,7 @@ import { Alert, Button, Col, Modal } from 'react-bootstrap'; import Select from 'react-select'; import { Table } from 'reactable'; import shortid from 'shortid'; -import { getExploreUrl } from '../../explorev2/exploreUtils'; +import { getExploreUrl } from '../../explore/exploreUtils'; import * as actions from '../actions'; const CHART_TYPES = [ @@ -285,4 +285,3 @@ function mapDispatchToProps(dispatch) { export { VisualizeModal }; export default connect(mapStateToProps, mapDispatchToProps)(VisualizeModal); - diff --git a/superset/assets/javascripts/explorev2/actions/exploreActions.js b/superset/assets/javascripts/explore/actions/exploreActions.js similarity index 100% rename from superset/assets/javascripts/explorev2/actions/exploreActions.js rename to superset/assets/javascripts/explore/actions/exploreActions.js diff --git a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx b/superset/assets/javascripts/explore/components/ChartContainer.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ChartContainer.jsx rename to superset/assets/javascripts/explore/components/ChartContainer.jsx diff --git a/superset/assets/javascripts/explorev2/components/Control.jsx b/superset/assets/javascripts/explore/components/Control.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/Control.jsx rename to superset/assets/javascripts/explore/components/Control.jsx diff --git a/superset/assets/javascripts/explorev2/components/ControlHeader.jsx b/superset/assets/javascripts/explore/components/ControlHeader.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ControlHeader.jsx rename to superset/assets/javascripts/explore/components/ControlHeader.jsx diff --git a/superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx b/superset/assets/javascripts/explore/components/ControlPanelSection.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx rename to superset/assets/javascripts/explore/components/ControlPanelSection.jsx diff --git a/superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx rename to superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx diff --git a/superset/assets/javascripts/explorev2/components/ControlRow.jsx b/superset/assets/javascripts/explore/components/ControlRow.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ControlRow.jsx rename to superset/assets/javascripts/explore/components/ControlRow.jsx diff --git a/superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx b/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx rename to superset/assets/javascripts/explore/components/DisplayQueryButton.jsx diff --git a/superset/assets/javascripts/explorev2/components/EmbedCodeButton.jsx b/superset/assets/javascripts/explore/components/EmbedCodeButton.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/EmbedCodeButton.jsx rename to superset/assets/javascripts/explore/components/EmbedCodeButton.jsx diff --git a/superset/assets/javascripts/explorev2/components/ExploreActionButtons.jsx b/superset/assets/javascripts/explore/components/ExploreActionButtons.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ExploreActionButtons.jsx rename to superset/assets/javascripts/explore/components/ExploreActionButtons.jsx diff --git a/superset/assets/javascripts/explorev2/components/ExploreViewContainer.jsx b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/ExploreViewContainer.jsx rename to superset/assets/javascripts/explore/components/ExploreViewContainer.jsx diff --git a/superset/assets/javascripts/explorev2/components/QueryAndSaveBtns.jsx b/superset/assets/javascripts/explore/components/QueryAndSaveBtns.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/QueryAndSaveBtns.jsx rename to superset/assets/javascripts/explore/components/QueryAndSaveBtns.jsx diff --git a/superset/assets/javascripts/explorev2/components/SaveModal.jsx b/superset/assets/javascripts/explore/components/SaveModal.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/SaveModal.jsx rename to superset/assets/javascripts/explore/components/SaveModal.jsx diff --git a/superset/assets/javascripts/explorev2/components/URLShortLinkButton.jsx b/superset/assets/javascripts/explore/components/URLShortLinkButton.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/URLShortLinkButton.jsx rename to superset/assets/javascripts/explore/components/URLShortLinkButton.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/CheckboxControl.jsx b/superset/assets/javascripts/explore/components/controls/CheckboxControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/CheckboxControl.jsx rename to superset/assets/javascripts/explore/components/controls/CheckboxControl.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx b/superset/assets/javascripts/explore/components/controls/Filter.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/Filter.jsx rename to superset/assets/javascripts/explore/components/controls/Filter.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/FilterControl.jsx b/superset/assets/javascripts/explore/components/controls/FilterControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/FilterControl.jsx rename to superset/assets/javascripts/explore/components/controls/FilterControl.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/HiddenControl.jsx b/superset/assets/javascripts/explore/components/controls/HiddenControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/HiddenControl.jsx rename to superset/assets/javascripts/explore/components/controls/HiddenControl.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/SelectControl.jsx b/superset/assets/javascripts/explore/components/controls/SelectControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/SelectControl.jsx rename to superset/assets/javascripts/explore/components/controls/SelectControl.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/TextAreaControl.jsx b/superset/assets/javascripts/explore/components/controls/TextAreaControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/TextAreaControl.jsx rename to superset/assets/javascripts/explore/components/controls/TextAreaControl.jsx diff --git a/superset/assets/javascripts/explorev2/components/controls/TextControl.jsx b/superset/assets/javascripts/explore/components/controls/TextControl.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/components/controls/TextControl.jsx rename to superset/assets/javascripts/explore/components/controls/TextControl.jsx diff --git a/superset/assets/javascripts/explorev2/exploreUtils.js b/superset/assets/javascripts/explore/exploreUtils.js similarity index 100% rename from superset/assets/javascripts/explorev2/exploreUtils.js rename to superset/assets/javascripts/explore/exploreUtils.js diff --git a/superset/assets/javascripts/explorev2/index.jsx b/superset/assets/javascripts/explore/index.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/index.jsx rename to superset/assets/javascripts/explore/index.jsx diff --git a/superset/assets/javascripts/explorev2/main.css b/superset/assets/javascripts/explore/main.css similarity index 100% rename from superset/assets/javascripts/explorev2/main.css rename to superset/assets/javascripts/explore/main.css diff --git a/superset/assets/javascripts/explorev2/reducers/exploreReducer.js b/superset/assets/javascripts/explore/reducers/exploreReducer.js similarity index 100% rename from superset/assets/javascripts/explorev2/reducers/exploreReducer.js rename to superset/assets/javascripts/explore/reducers/exploreReducer.js diff --git a/superset/assets/javascripts/explorev2/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx similarity index 100% rename from superset/assets/javascripts/explorev2/stores/controls.jsx rename to superset/assets/javascripts/explore/stores/controls.jsx diff --git a/superset/assets/javascripts/explorev2/stores/store.js b/superset/assets/javascripts/explore/stores/store.js similarity index 100% rename from superset/assets/javascripts/explorev2/stores/store.js rename to superset/assets/javascripts/explore/stores/store.js diff --git a/superset/assets/javascripts/explorev2/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js similarity index 100% rename from superset/assets/javascripts/explorev2/stores/visTypes.js rename to superset/assets/javascripts/explore/stores/visTypes.js diff --git a/superset/assets/javascripts/explorev2/validators.js b/superset/assets/javascripts/explore/validators.js similarity index 100% rename from superset/assets/javascripts/explorev2/validators.js rename to superset/assets/javascripts/explore/validators.js diff --git a/superset/assets/javascripts/modules/superset.js b/superset/assets/javascripts/modules/superset.js index de808858b1..8f234395a3 100644 --- a/superset/assets/javascripts/modules/superset.js +++ b/superset/assets/javascripts/modules/superset.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import Mustache from 'mustache'; import vizMap from '../../visualizations/main'; -import { getExploreUrl } from '../explorev2/exploreUtils'; -import { applyDefaultFormData } from '../explorev2/stores/store'; +import { getExploreUrl } from '../explore/exploreUtils'; +import { applyDefaultFormData } from '../explore/stores/store'; const utils = require('./utils'); diff --git a/superset/assets/javascripts/syncBackend.js b/superset/assets/javascripts/syncBackend.js index 93a519d99e..a40410af1e 100644 --- a/superset/assets/javascripts/syncBackend.js +++ b/superset/assets/javascripts/syncBackend.js @@ -1,7 +1,7 @@ /* eslint no-console: 0 */ import fs from 'fs'; import path from 'path'; -import { controls } from './explorev2/stores/controls'; +import { controls } from './explore/stores/controls'; function exportFile(fileLocation, content) { fs.writeFile(fileLocation, content, function (err) { diff --git a/superset/assets/spec/javascripts/explorev2/actions_spec.js b/superset/assets/spec/javascripts/explorev2/actions_spec.js index 8eced723e6..346e5edda9 100644 --- a/superset/assets/spec/javascripts/explorev2/actions_spec.js +++ b/superset/assets/spec/javascripts/explorev2/actions_spec.js @@ -2,10 +2,10 @@ import { it, describe } from 'mocha'; import { expect } from 'chai'; import sinon from 'sinon'; import $ from 'jquery'; -import * as actions from '../../../javascripts/explorev2/actions/exploreActions'; -import * as exploreUtils from '../../../javascripts/explorev2/exploreUtils'; -import { defaultState } from '../../../javascripts/explorev2/stores/store'; -import { exploreReducer } from '../../../javascripts/explorev2/reducers/exploreReducer'; +import * as actions from '../../../javascripts/explore/actions/exploreActions'; +import * as exploreUtils from '../../../javascripts/explore/exploreUtils'; +import { defaultState } from '../../../javascripts/explore/stores/store'; +import { exploreReducer } from '../../../javascripts/explore/reducers/exploreReducer'; describe('reducers', () => { it('sets correct control value given a key and value', () => { diff --git a/superset/assets/spec/javascripts/explorev2/components/ChartContainer_spec.js b/superset/assets/spec/javascripts/explorev2/components/ChartContainer_spec.js index 116fc8511a..1417d5eeea 100644 --- a/superset/assets/spec/javascripts/explorev2/components/ChartContainer_spec.js +++ b/superset/assets/spec/javascripts/explorev2/components/ChartContainer_spec.js @@ -5,7 +5,7 @@ // import { expect } from 'chai'; // import { describe, it } from 'mocha'; -// import ChartContainer from '../../../../javascripts/explorev2/components/ChartContainer'; +// import ChartContainer from '../../../../javascripts/explore/components/ChartContainer'; // describe('ChartContainer', () => { // const mockProps = { diff --git a/superset/assets/spec/javascripts/explorev2/components/CheckboxControl_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/CheckboxControl_spec.jsx index 0a94f4abf8..2360ddb308 100644 --- a/superset/assets/spec/javascripts/explorev2/components/CheckboxControl_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/CheckboxControl_spec.jsx @@ -6,7 +6,7 @@ import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; -import CheckboxControl from '../../../../javascripts/explorev2/components/controls/CheckboxControl'; +import CheckboxControl from '../../../../javascripts/explore/components/controls/CheckboxControl'; const defaultProps = { name: 'show_legend', diff --git a/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx index 1a8a5eadea..1f4dd6e2a9 100644 --- a/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx @@ -3,11 +3,11 @@ import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; import { getFormDataFromControls, defaultControls } - from '../../../../javascripts/explorev2/stores/store'; + from '../../../../javascripts/explore/stores/store'; import { ControlPanelsContainer, -} from '../../../../javascripts/explorev2/components/ControlPanelsContainer'; -import ControlPanelSection from '../../../../javascripts/explorev2/components/ControlPanelSection'; +} from '../../../../javascripts/explore/components/ControlPanelsContainer'; +import ControlPanelSection from '../../../../javascripts/explore/components/ControlPanelSection'; const defaultProps = { datasource_type: 'table', diff --git a/superset/assets/spec/javascripts/explorev2/components/ControlRow_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/ControlRow_spec.jsx index 02ac12a4ee..d472583c3e 100644 --- a/superset/assets/spec/javascripts/explorev2/components/ControlRow_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/ControlRow_spec.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { expect } from 'chai'; import { describe, it } from 'mocha'; import { shallow } from 'enzyme'; -import ControlSetRow from '../../../../javascripts/explorev2/components/ControlRow'; +import ControlSetRow from '../../../../javascripts/explore/components/ControlRow'; describe('ControlSetRow', () => { it('renders a single row with one element', () => { diff --git a/superset/assets/spec/javascripts/explorev2/components/DisplayQueryButton_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/DisplayQueryButton_spec.jsx index bdff00e777..3a30dc6e3b 100644 --- a/superset/assets/spec/javascripts/explorev2/components/DisplayQueryButton_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/DisplayQueryButton_spec.jsx @@ -5,7 +5,7 @@ import { mount } from 'enzyme'; import { Modal } from 'react-bootstrap'; import ModalTrigger from './../../../../javascripts/components/ModalTrigger'; -import DisplayQueryButton from '../../../../javascripts/explorev2/components/DisplayQueryButton'; +import DisplayQueryButton from '../../../../javascripts/explore/components/DisplayQueryButton'; describe('DisplayQueryButton', () => { const defaultProps = { diff --git a/superset/assets/spec/javascripts/explorev2/components/EmbedCodeButton_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/EmbedCodeButton_spec.jsx index 87afdc056a..837269b935 100644 --- a/superset/assets/spec/javascripts/explorev2/components/EmbedCodeButton_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/EmbedCodeButton_spec.jsx @@ -4,7 +4,7 @@ import { describe, it } from 'mocha'; import { shallow, mount } from 'enzyme'; import { OverlayTrigger } from 'react-bootstrap'; -import EmbedCodeButton from '../../../../javascripts/explorev2/components/EmbedCodeButton'; +import EmbedCodeButton from '../../../../javascripts/explore/components/EmbedCodeButton'; describe('EmbedCodeButton', () => { const defaultProps = { diff --git a/superset/assets/spec/javascripts/explorev2/components/ExploreActionButtons_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/ExploreActionButtons_spec.jsx index 8a32386326..506dd23f97 100644 --- a/superset/assets/spec/javascripts/explorev2/components/ExploreActionButtons_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/ExploreActionButtons_spec.jsx @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; import { shallow } from 'enzyme'; import ExploreActionButtons from - '../../../../javascripts/explorev2/components/ExploreActionButtons'; + '../../../../javascripts/explore/components/ExploreActionButtons'; describe('ExploreActionButtons', () => { const defaultProps = { diff --git a/superset/assets/spec/javascripts/explorev2/components/ExploreViewContainer_spec.js b/superset/assets/spec/javascripts/explorev2/components/ExploreViewContainer_spec.js index 4fe78d64b1..0db058fcdd 100644 --- a/superset/assets/spec/javascripts/explorev2/components/ExploreViewContainer_spec.js +++ b/superset/assets/spec/javascripts/explorev2/components/ExploreViewContainer_spec.js @@ -7,13 +7,13 @@ // import { shallow } from 'enzyme'; // import ExploreViewContainer -// from '../../../../javascripts/explorev2/components/ExploreViewContainer'; +// from '../../../../javascripts/explore/components/ExploreViewContainer'; // import QueryAndSaveBtns // from '../../../../javascripts/explore/components/QueryAndSaveBtns'; // import ControlPanelsContainer -// from '../../../../javascripts/explorev2/components/ControlPanelsContainer'; +// from '../../../../javascripts/explore/components/ControlPanelsContainer'; // import ChartContainer -// from '../../../../javascripts/explorev2/components/ChartContainer'; +// from '../../../../javascripts/explore/components/ChartContainer'; // describe('ExploreViewContainer', () => { // it('renders', () => { diff --git a/superset/assets/spec/javascripts/explorev2/components/FilterControl_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/FilterControl_spec.jsx index 02fef03cd8..752932ade0 100644 --- a/superset/assets/spec/javascripts/explorev2/components/FilterControl_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/FilterControl_spec.jsx @@ -5,8 +5,8 @@ import sinon from 'sinon'; import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; -import FilterControl from '../../../../javascripts/explorev2/components/controls/FilterControl'; -import Filter from '../../../../javascripts/explorev2/components/controls/Filter'; +import FilterControl from '../../../../javascripts/explore/components/controls/FilterControl'; +import Filter from '../../../../javascripts/explore/components/controls/Filter'; const defaultProps = { choices: ['country_name'], diff --git a/superset/assets/spec/javascripts/explorev2/components/Filter_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/Filter_spec.jsx index 070631e1ca..9c045cc386 100644 --- a/superset/assets/spec/javascripts/explorev2/components/Filter_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/Filter_spec.jsx @@ -6,8 +6,8 @@ import sinon from 'sinon'; import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; -import Filter from '../../../../javascripts/explorev2/components/controls/Filter'; -import SelectControl from '../../../../javascripts/explorev2/components/controls/SelectControl'; +import Filter from '../../../../javascripts/explore/components/controls/Filter'; +import SelectControl from '../../../../javascripts/explore/components/controls/SelectControl'; const defaultProps = { changeFilter: sinon.spy(), diff --git a/superset/assets/spec/javascripts/explorev2/components/QueryAndSaveBtns_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/QueryAndSaveBtns_spec.jsx index fa89366a7d..78e5552ebe 100644 --- a/superset/assets/spec/javascripts/explorev2/components/QueryAndSaveBtns_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/QueryAndSaveBtns_spec.jsx @@ -4,7 +4,7 @@ import { expect } from 'chai'; import { shallow } from 'enzyme'; import sinon from 'sinon'; -import QueryAndSaveButtons from '../../../../javascripts/explorev2/components/QueryAndSaveBtns'; +import QueryAndSaveButtons from '../../../../javascripts/explore/components/QueryAndSaveBtns'; import Button from '../../../../javascripts/components/Button'; describe('QueryAndSaveButtons', () => { diff --git a/superset/assets/spec/javascripts/explorev2/components/SaveModal_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/SaveModal_spec.jsx index 7c3a4a5423..e0a1a84513 100644 --- a/superset/assets/spec/javascripts/explorev2/components/SaveModal_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/SaveModal_spec.jsx @@ -5,8 +5,8 @@ import { shallow } from 'enzyme'; import { Modal, Button, Radio } from 'react-bootstrap'; import sinon from 'sinon'; -import { defaultFormData } from '../../../../javascripts/explorev2/stores/store'; -import { SaveModal } from '../../../../javascripts/explorev2/components/SaveModal'; +import { defaultFormData } from '../../../../javascripts/explore/stores/store'; +import { SaveModal } from '../../../../javascripts/explore/components/SaveModal'; const defaultProps = { can_edit: true, diff --git a/superset/assets/spec/javascripts/explorev2/components/SelectControl_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/SelectControl_spec.jsx index 04c6644e8d..a2caeff601 100644 --- a/superset/assets/spec/javascripts/explorev2/components/SelectControl_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/SelectControl_spec.jsx @@ -5,7 +5,7 @@ import sinon from 'sinon'; import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; -import SelectControl from '../../../../javascripts/explorev2/components/controls/SelectControl'; +import SelectControl from '../../../../javascripts/explore/components/controls/SelectControl'; const defaultProps = { choices: [[10, 10], [20, 20]], diff --git a/superset/assets/spec/javascripts/explorev2/components/TextArea_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/TextArea_spec.jsx index 65d19eac82..aa9fc192e5 100644 --- a/superset/assets/spec/javascripts/explorev2/components/TextArea_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/TextArea_spec.jsx @@ -5,7 +5,7 @@ import sinon from 'sinon'; import { expect } from 'chai'; import { describe, it, beforeEach } from 'mocha'; import { shallow } from 'enzyme'; -import TextAreaControl from '../../../../javascripts/explorev2/components/controls/TextAreaControl'; +import TextAreaControl from '../../../../javascripts/explore/components/controls/TextAreaControl'; const defaultProps = { name: 'x_axis_label', diff --git a/superset/assets/spec/javascripts/explorev2/components/URLShortLinkButton_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/URLShortLinkButton_spec.jsx index ae50adee55..f2729db116 100644 --- a/superset/assets/spec/javascripts/explorev2/components/URLShortLinkButton_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/components/URLShortLinkButton_spec.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { expect } from 'chai'; import { describe, it } from 'mocha'; -import URLShortLinkButton from '../../../../javascripts/explorev2/components/URLShortLinkButton'; +import URLShortLinkButton from '../../../../javascripts/explore/components/URLShortLinkButton'; describe('URLShortLinkButton', () => { const defaultProps = { diff --git a/superset/assets/spec/javascripts/explorev2/utils_spec.jsx b/superset/assets/spec/javascripts/explorev2/utils_spec.jsx index 6747188a7f..fc4c2b6b3f 100644 --- a/superset/assets/spec/javascripts/explorev2/utils_spec.jsx +++ b/superset/assets/spec/javascripts/explorev2/utils_spec.jsx @@ -1,7 +1,7 @@ import { it, describe } from 'mocha'; import { expect } from 'chai'; import URI from 'urijs'; -import { getExploreUrl } from '../../../javascripts/explorev2/exploreUtils'; +import { getExploreUrl } from '../../../javascripts/explore/exploreUtils'; describe('utils', () => { const formData = { diff --git a/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx b/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx index 75b9929b5d..169a020dbc 100644 --- a/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx +++ b/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx @@ -12,7 +12,7 @@ import $ from 'jquery'; import { queries } from './fixtures'; import { sqlLabReducer } from '../../../javascripts/SqlLab/reducers'; import VisualizeModal from '../../../javascripts/SqlLab/components/VisualizeModal'; -import * as exploreUtils from '../../../javascripts/explorev2/exploreUtils'; +import * as exploreUtils from '../../../javascripts/explore/exploreUtils'; global.notify = { info: () => {}, diff --git a/superset/assets/visualizations/nvd3_vis.js b/superset/assets/visualizations/nvd3_vis.js index 2a7ec4354a..5abf3d3538 100644 --- a/superset/assets/visualizations/nvd3_vis.js +++ b/superset/assets/visualizations/nvd3_vis.js @@ -7,7 +7,7 @@ import { category21 } from '../javascripts/modules/colors'; import { timeFormatFactory, formatDate } from '../javascripts/modules/dates'; import { customizeToolTip } from '../javascripts/modules/utils'; -import { TIME_STAMP_OPTIONS } from '../javascripts/explorev2/stores/controls'; +import { TIME_STAMP_OPTIONS } from '../javascripts/explore/stores/controls'; const nv = require('nvd3'); diff --git a/superset/assets/webpack.config.js b/superset/assets/webpack.config.js index ed71afdac2..73bcb0ace5 100644 --- a/superset/assets/webpack.config.js +++ b/superset/assets/webpack.config.js @@ -15,7 +15,7 @@ const config = { 'css-theme': APP_DIR + '/javascripts/css-theme.js', common: APP_DIR + '/javascripts/common.js', dashboard: ['babel-polyfill', APP_DIR + '/javascripts/dashboard/Dashboard.jsx'], - explorev2: ['babel-polyfill', APP_DIR + '/javascripts/explorev2/index.jsx'], + explore: ['babel-polyfill', APP_DIR + '/javascripts/explore/index.jsx'], sqllab: ['babel-polyfill', APP_DIR + '/javascripts/SqlLab/index.jsx'], welcome: ['babel-polyfill', APP_DIR + '/javascripts/welcome.js'], profile: ['babel-polyfill', APP_DIR + '/javascripts/profile/index.jsx'], diff --git a/superset/templates/superset/explorev2.html b/superset/templates/superset/explore.html similarity index 92% rename from superset/templates/superset/explorev2.html rename to superset/templates/superset/explore.html index 516c97ffe5..ad7d8b9fdd 100644 --- a/superset/templates/superset/explorev2.html +++ b/superset/templates/superset/explore.html @@ -17,7 +17,7 @@ {% block tail_js %} {{ super() }} - {% with filename="explorev2" %} + {% with filename="explore" %} {% include "superset/partials/_script_tag.html" %} {% endwith %} {% endblock %} diff --git a/superset/views/core.py b/superset/views/core.py index a946abb084..802b891988 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -16,7 +16,8 @@ import traceback import sqlalchemy as sqla from flask import ( - g, request, redirect, flash, Response, render_template, Markup, abort) + g, request, redirect, flash, Response, render_template, Markup, + abort, url_for) from flask_appbuilder import expose from flask_appbuilder.actions import action from flask_appbuilder.models.sqla.interface import SQLAInterface @@ -985,6 +986,16 @@ class Superset(BaseSupersetView): return redirect('/dashboardmodelview/list/') return self.render_template('superset/import_dashboards.html') + @log_this + @has_access + @expose("/explorev2///") + def explorev2(self, datasource_type, datasource_id): + return redirect(url_for( + 'Superset.explore', + datasource_type=datasource_type, + datasource_id=datasource_id, + **request.args)) + @log_this @has_access @expose("/explore///") @@ -1059,7 +1070,7 @@ class Superset(BaseSupersetView): if datasource_type == 'table' \ else datasource.datasource_name return self.render_template( - "superset/explorev2.html", + "superset/explore.html", bootstrap_data=json.dumps(bootstrap_data), slice=slc, standalone_mode=standalone,