{ this.el = el; }}
- />
- );
- }
-}
-
-ChartBody.propTypes = propTypes;
-
-export default ChartBody;
diff --git a/superset/assets/src/dashboard/deprecated/chart/ChartContainer.jsx b/superset/assets/src/dashboard/deprecated/chart/ChartContainer.jsx
deleted file mode 100644
index b731412fc5ff7..0000000000000
--- a/superset/assets/src/dashboard/deprecated/chart/ChartContainer.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import * as Actions from './chartAction';
-import Chart from './Chart';
-
-function mapStateToProps({ charts }, ownProps) {
- const chart = charts[ownProps.chartKey];
- return {
- annotationData: chart.annotationData,
- chartAlert: chart.chartAlert,
- chartStatus: chart.chartStatus,
- chartUpdateEndTime: chart.chartUpdateEndTime,
- chartUpdateStartTime: chart.chartUpdateStartTime,
- latestQueryFormData: chart.latestQueryFormData,
- lastRendered: chart.lastRendered,
- queryResponse: chart.queryResponse,
- queryRequest: chart.queryRequest,
- triggerQuery: chart.triggerQuery,
- };
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- actions: bindActionCreators(Actions, dispatch),
- };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Chart);
diff --git a/superset/assets/src/dashboard/deprecated/chart/chart.css b/superset/assets/src/dashboard/deprecated/chart/chart.css
deleted file mode 100644
index eda2054f92af9..0000000000000
--- a/superset/assets/src/dashboard/deprecated/chart/chart.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.chart-tooltip {
- opacity: 0.75;
- font-size: 12px;
-}
diff --git a/superset/assets/src/dashboard/deprecated/chart/chartAction.js b/superset/assets/src/dashboard/deprecated/chart/chartAction.js
deleted file mode 100644
index 254f1d60e454b..0000000000000
--- a/superset/assets/src/dashboard/deprecated/chart/chartAction.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import { getExploreUrlAndPayload, getAnnotationJsonUrl } from '../../../explore/exploreUtils';
-import { requiresQuery, ANNOTATION_SOURCE_TYPES } from '../../../modules/AnnotationTypes';
-import { Logger, LOG_ACTIONS_LOAD_CHART } from '../../../logger';
-import { COMMON_ERR_MESSAGES } from '../../../common';
-import { t } from '../../../locales';
-
-const $ = window.$ = require('jquery');
-
-export const CHART_UPDATE_STARTED = 'CHART_UPDATE_STARTED';
-export function chartUpdateStarted(queryRequest, latestQueryFormData, key) {
- return { type: CHART_UPDATE_STARTED, queryRequest, latestQueryFormData, key };
-}
-
-export const CHART_UPDATE_SUCCEEDED = 'CHART_UPDATE_SUCCEEDED';
-export function chartUpdateSucceeded(queryResponse, key) {
- return { type: CHART_UPDATE_SUCCEEDED, queryResponse, key };
-}
-
-export const CHART_UPDATE_STOPPED = 'CHART_UPDATE_STOPPED';
-export function chartUpdateStopped(key) {
- return { type: CHART_UPDATE_STOPPED, key };
-}
-
-export const CHART_UPDATE_TIMEOUT = 'CHART_UPDATE_TIMEOUT';
-export function chartUpdateTimeout(statusText, timeout, key) {
- return { type: CHART_UPDATE_TIMEOUT, statusText, timeout, key };
-}
-
-export const CHART_UPDATE_FAILED = 'CHART_UPDATE_FAILED';
-export function chartUpdateFailed(queryResponse, key) {
- return { type: CHART_UPDATE_FAILED, queryResponse, key };
-}
-
-export const CHART_RENDERING_FAILED = 'CHART_RENDERING_FAILED';
-export function chartRenderingFailed(error, key) {
- return { type: CHART_RENDERING_FAILED, error, key };
-}
-
-export const CHART_RENDERING_SUCCEEDED = 'CHART_RENDERING_SUCCEEDED';
-export function chartRenderingSucceeded(key) {
- return { type: CHART_RENDERING_SUCCEEDED, key };
-}
-
-export const REMOVE_CHART = 'REMOVE_CHART';
-export function removeChart(key) {
- return { type: REMOVE_CHART, key };
-}
-
-export const ANNOTATION_QUERY_SUCCESS = 'ANNOTATION_QUERY_SUCCESS';
-export function annotationQuerySuccess(annotation, queryResponse, key) {
- return { type: ANNOTATION_QUERY_SUCCESS, annotation, queryResponse, key };
-}
-
-export const ANNOTATION_QUERY_STARTED = 'ANNOTATION_QUERY_STARTED';
-export function annotationQueryStarted(annotation, queryRequest, key) {
- return { type: ANNOTATION_QUERY_STARTED, annotation, queryRequest, key };
-}
-
-export const ANNOTATION_QUERY_FAILED = 'ANNOTATION_QUERY_FAILED';
-export function annotationQueryFailed(annotation, queryResponse, key) {
- return { type: ANNOTATION_QUERY_FAILED, annotation, queryResponse, key };
-}
-
-export function runAnnotationQuery(annotation, timeout = 60, formData = null, key) {
- return function (dispatch, getState) {
- const sliceKey = key || Object.keys(getState().charts)[0];
- const fd = formData || getState().charts[sliceKey].latestQueryFormData;
-
- if (!requiresQuery(annotation.sourceType)) {
- return Promise.resolve();
- }
-
- const granularity = fd.time_grain_sqla || fd.granularity;
- fd.time_grain_sqla = granularity;
- fd.granularity = granularity;
-
- const sliceFormData = Object.keys(annotation.overrides)
- .reduce((d, k) => ({
- ...d,
- [k]: annotation.overrides[k] || fd[k],
- }), {});
- const isNative = annotation.sourceType === ANNOTATION_SOURCE_TYPES.NATIVE;
- const url = getAnnotationJsonUrl(annotation.value, sliceFormData, isNative);
- const queryRequest = $.ajax({
- url,
- dataType: 'json',
- timeout: timeout * 1000,
- });
- dispatch(annotationQueryStarted(annotation, queryRequest, sliceKey));
- return queryRequest
- .then(queryResponse => dispatch(annotationQuerySuccess(annotation, queryResponse, sliceKey)))
- .catch((err) => {
- if (err.statusText === 'timeout') {
- dispatch(annotationQueryFailed(annotation, { error: 'Query Timeout' }, sliceKey));
- } else if ((err.responseJSON.error || '').toLowerCase().startsWith('no data')) {
- dispatch(annotationQuerySuccess(annotation, err, sliceKey));
- } else if (err.statusText !== 'abort') {
- dispatch(annotationQueryFailed(annotation, err.responseJSON, sliceKey));
- }
- });
- };
-}
-
-export const TRIGGER_QUERY = 'TRIGGER_QUERY';
-export function triggerQuery(value = true, key) {
- return { type: TRIGGER_QUERY, value, key };
-}
-
-// this action is used for forced re-render without fetch data
-export const RENDER_TRIGGERED = 'RENDER_TRIGGERED';
-export function renderTriggered(value, key) {
- return { type: RENDER_TRIGGERED, value, key };
-}
-
-export const UPDATE_QUERY_FORM_DATA = 'UPDATE_QUERY_FORM_DATA';
-export function updateQueryFormData(value, key) {
- return { type: UPDATE_QUERY_FORM_DATA, value, key };
-}
-
-export const RUN_QUERY = 'RUN_QUERY';
-export function runQuery(formData, force = false, timeout = 60, key) {
- return (dispatch) => {
- const { url, payload } = getExploreUrlAndPayload({
- formData,
- endpointType: 'json',
- force,
- });
- const logStart = Logger.getTimestamp();
- const queryRequest = $.ajax({
- type: 'POST',
- url,
- dataType: 'json',
- data: {
- form_data: JSON.stringify(payload),
- },
- timeout: timeout * 1000,
- });
- const queryPromise = Promise.resolve(dispatch(chartUpdateStarted(queryRequest, payload, key)))
- .then(() => queryRequest)
- .then((queryResponse) => {
- Logger.append(LOG_ACTIONS_LOAD_CHART, {
- slice_id: key,
- is_cached: queryResponse.is_cached,
- force_refresh: force,
- row_count: queryResponse.rowcount,
- datasource: formData.datasource,
- start_offset: logStart,
- duration: Logger.getTimestamp() - logStart,
- has_extra_filters: formData.extra_filters && formData.extra_filters.length > 0,
- viz_type: formData.viz_type,
- });
- return dispatch(chartUpdateSucceeded(queryResponse, key));
- })
- .catch((err) => {
- Logger.append(LOG_ACTIONS_LOAD_CHART, {
- slice_id: key,
- has_err: true,
- datasource: formData.datasource,
- start_offset: logStart,
- duration: Logger.getTimestamp() - logStart,
- });
- if (err.statusText === 'timeout') {
- dispatch(chartUpdateTimeout(err.statusText, timeout, key));
- } else if (err.statusText === 'abort') {
- dispatch(chartUpdateStopped(key));
- } else {
- let errObject;
- if (err.responseJSON) {
- errObject = err.responseJSON;
- } else if (err.stack) {
- errObject = {
- error: t('Unexpected error: ') + err.description,
- stacktrace: err.stack,
- };
- } else if (err.responseText && err.responseText.indexOf('CSRF') >= 0) {
- errObject = {
- error: COMMON_ERR_MESSAGES.SESSION_TIMED_OUT,
- };
- } else {
- errObject = {
- error: t('Unexpected error.'),
- };
- }
- dispatch(chartUpdateFailed(errObject, key));
- }
- });
- const annotationLayers = formData.annotation_layers || [];
- return Promise.all([
- queryPromise,
- dispatch(triggerQuery(false, key)),
- dispatch(updateQueryFormData(payload, key)),
- ...annotationLayers.map(x => dispatch(runAnnotationQuery(x, timeout, formData, key))),
- ]);
- };
-}
diff --git a/superset/assets/src/dashboard/deprecated/chart/chartReducer.js b/superset/assets/src/dashboard/deprecated/chart/chartReducer.js
deleted file mode 100644
index 8d11249598470..0000000000000
--- a/superset/assets/src/dashboard/deprecated/chart/chartReducer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/* eslint camelcase: 0 */
-import PropTypes from 'prop-types';
-
-import { now } from '../../../modules/dates';
-import * as actions from './chartAction';
-import { t } from '../../../locales';
-
-export const chartPropType = {
- chartKey: PropTypes.string.isRequired,
- chartAlert: PropTypes.string,
- chartStatus: PropTypes.string,
- chartUpdateEndTime: PropTypes.number,
- chartUpdateStartTime: PropTypes.number,
- latestQueryFormData: PropTypes.object,
- queryRequest: PropTypes.object,
- queryResponse: PropTypes.object,
- triggerQuery: PropTypes.bool,
- lastRendered: PropTypes.number,
-};
-
-export const chart = {
- chartKey: '',
- chartAlert: null,
- chartStatus: 'loading',
- chartUpdateEndTime: null,
- chartUpdateStartTime: now(),
- latestQueryFormData: {},
- queryRequest: null,
- queryResponse: null,
- triggerQuery: true,
- lastRendered: 0,
-};
-
-export default function chartReducer(charts = {}, action) {
- const actionHandlers = {
- [actions.CHART_UPDATE_SUCCEEDED](state) {
- return { ...state,
- chartStatus: 'success',
- queryResponse: action.queryResponse,
- chartUpdateEndTime: now(),
- };
- },
- [actions.CHART_UPDATE_STARTED](state) {
- return { ...state,
- chartStatus: 'loading',
- chartAlert: null,
- chartUpdateEndTime: null,
- chartUpdateStartTime: now(),
- queryRequest: action.queryRequest,
- };
- },
- [actions.CHART_UPDATE_STOPPED](state) {
- return { ...state,
- chartStatus: 'stopped',
- chartAlert: t('Updating chart was stopped'),
- };
- },
- [actions.CHART_RENDERING_SUCCEEDED](state) {
- return { ...state,
- chartStatus: 'rendered',
- };
- },
- [actions.CHART_RENDERING_FAILED](state) {
- return { ...state,
- chartStatus: 'failed',
- chartAlert: t('An error occurred while rendering the visualization: %s', action.error),
- };
- },
- [actions.CHART_UPDATE_TIMEOUT](state) {
- return { ...state,
- chartStatus: 'failed',
- chartAlert: (
- `${t('Query timeout')} - ` +
- t(`visualization queries are set to timeout at ${action.timeout} seconds. `) +
- t('Perhaps your data has grown, your database is under unusual load, ' +
- 'or you are simply querying a data source that is too large ' +
- 'to be processed within the timeout range. ' +
- 'If that is the case, we recommend that you summarize your data further.')),
- };
- },
- [actions.CHART_UPDATE_FAILED](state) {
- return { ...state,
- chartStatus: 'failed',
- chartAlert: action.queryResponse ? action.queryResponse.error : t('Network error.'),
- chartUpdateEndTime: now(),
- queryResponse: action.queryResponse,
- };
- },
- [actions.TRIGGER_QUERY](state) {
- return { ...state, triggerQuery: action.value };
- },
- [actions.RENDER_TRIGGERED](state) {
- return { ...state, lastRendered: action.value };
- },
- [actions.UPDATE_QUERY_FORM_DATA](state) {
- return { ...state, latestQueryFormData: action.value };
- },
- [actions.ANNOTATION_QUERY_STARTED](state) {
- if (state.annotationQuery &&
- state.annotationQuery[action.annotation.name]) {
- state.annotationQuery[action.annotation.name].abort();
- }
- const annotationQuery = {
- ...state.annotationQuery,
- [action.annotation.name]: action.queryRequest,
- };
- return {
- ...state,
- annotationQuery,
- };
- },
- [actions.ANNOTATION_QUERY_SUCCESS](state) {
- const annotationData = {
- ...state.annotationData,
- [action.annotation.name]: action.queryResponse.data,
- };
- const annotationError = { ...state.annotationError };
- delete annotationError[action.annotation.name];
- const annotationQuery = { ...state.annotationQuery };
- delete annotationQuery[action.annotation.name];
- return {
- ...state,
- annotationData,
- annotationError,
- annotationQuery,
- };
- },
- [actions.ANNOTATION_QUERY_FAILED](state) {
- const annotationData = { ...state.annotationData };
- delete annotationData[action.annotation.name];
- const annotationError = {
- ...state.annotationError,
- [action.annotation.name]: action.queryResponse ?
- action.queryResponse.error : t('Network error.'),
- };
- const annotationQuery = { ...state.annotationQuery };
- delete annotationQuery[action.annotation.name];
- return {
- ...state,
- annotationData,
- annotationError,
- annotationQuery,
- };
- },
- };
-
- /* eslint-disable no-param-reassign */
- if (action.type === actions.REMOVE_CHART) {
- delete charts[action.key];
- return charts;
- }
-
- if (action.type in actionHandlers) {
- return { ...charts, [action.key]: actionHandlers[action.type](charts[action.key], action) };
- }
-
- return charts;
-}
diff --git a/superset/assets/src/dashboard/deprecated/v1/actions.js b/superset/assets/src/dashboard/deprecated/v1/actions.js
deleted file mode 100644
index a8701207cbef3..0000000000000
--- a/superset/assets/src/dashboard/deprecated/v1/actions.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/* global window */
-import $ from 'jquery';
-import { getExploreUrlAndPayload } from '../../../explore/exploreUtils';
-import { addSuccessToast, addDangerToast } from '../../../messageToasts/actions';
-
-export const ADD_FILTER = 'ADD_FILTER';
-export function addFilter(sliceId, col, vals, merge = true, refresh = true) {
- return { type: ADD_FILTER, sliceId, col, vals, merge, refresh };
-}
-
-export const CLEAR_FILTER = 'CLEAR_FILTER';
-export function clearFilter(sliceId) {
- return { type: CLEAR_FILTER, sliceId };
-}
-
-export const REMOVE_FILTER = 'REMOVE_FILTER';
-export function removeFilter(sliceId, col, vals, refresh = true) {
- return { type: REMOVE_FILTER, sliceId, col, vals, refresh };
-}
-
-export const UPDATE_DASHBOARD_LAYOUT = 'UPDATE_DASHBOARD_LAYOUT';
-export function updateDashboardLayout(layout) {
- return { type: UPDATE_DASHBOARD_LAYOUT, layout };
-}
-
-export const UPDATE_DASHBOARD_TITLE = 'UPDATE_DASHBOARD_TITLE';
-export function updateDashboardTitle(title) {
- return { type: UPDATE_DASHBOARD_TITLE, title };
-}
-
-export function addSlicesToDashboard(dashboardId, sliceIds) {
- return () => (
- $.ajax({
- type: 'POST',
- url: `/superset/add_slices/${dashboardId}/`,
- data: {
- data: JSON.stringify({ slice_ids: sliceIds }),
- },
- })
- .done(() => {
- // Refresh page to allow for slices to re-render
- window.location.reload();
- })
- );
-}
-
-export const REMOVE_SLICE = 'REMOVE_SLICE';
-export function removeSlice(slice) {
- return { type: REMOVE_SLICE, slice };
-}
-
-export const UPDATE_SLICE_NAME = 'UPDATE_SLICE_NAME';
-export function updateSliceName(slice, sliceName) {
- return { type: UPDATE_SLICE_NAME, slice, sliceName };
-}
-export function saveSlice(slice, sliceName) {
- const oldName = slice.slice_name;
- return (dispatch) => {
- const sliceParams = {};
- sliceParams.slice_id = slice.slice_id;
- sliceParams.action = 'overwrite';
- sliceParams.slice_name = sliceName;
-
- const { url, payload } = getExploreUrlAndPayload({
- formData: slice.form_data,
- endpointType: 'base',
- force: false,
- curUrl: null,
- requestParams: sliceParams,
- });
- return $.ajax({
- url,
- type: 'POST',
- data: {
- form_data: JSON.stringify(payload),
- },
- success: () => {
- dispatch(updateSliceName(slice, sliceName));
- dispatch(addSuccessToast('This slice name was saved successfully.'));
- },
- error: () => {
- // if server-side reject the overwrite action,
- // revert to old state
- dispatch(updateSliceName(slice, oldName));
- dispatch(addDangerToast("You don't have the rights to alter this slice"));
- },
- });
- };
-}
-
-const FAVESTAR_BASE_URL = '/superset/favstar/Dashboard';
-export const TOGGLE_FAVE_STAR = 'TOGGLE_FAVE_STAR';
-export function toggleFaveStar(isStarred) {
- return { type: TOGGLE_FAVE_STAR, isStarred };
-}
-
-export const FETCH_FAVE_STAR = 'FETCH_FAVE_STAR';
-export function fetchFaveStar(id) {
- return function (dispatch) {
- const url = `${FAVESTAR_BASE_URL}/${id}/count`;
- return $.get(url)
- .done((data) => {
- if (data.count > 0) {
- dispatch(toggleFaveStar(true));
- }
- });
- };
-}
-
-export const SAVE_FAVE_STAR = 'SAVE_FAVE_STAR';
-export function saveFaveStar(id, isStarred) {
- return function (dispatch) {
- const urlSuffix = isStarred ? 'unselect' : 'select';
- const url = `${FAVESTAR_BASE_URL}/${id}/${urlSuffix}/`;
- $.get(url);
- dispatch(toggleFaveStar(!isStarred));
- };
-}
-
-export const TOGGLE_EXPAND_SLICE = 'TOGGLE_EXPAND_SLICE';
-export function toggleExpandSlice(slice, isExpanded) {
- return { type: TOGGLE_EXPAND_SLICE, slice, isExpanded };
-}
-
-export const SET_EDIT_MODE = 'SET_EDIT_MODE';
-export function setEditMode(editMode) {
- return { type: SET_EDIT_MODE, editMode };
-}
diff --git a/superset/assets/src/dashboard/deprecated/v1/components/CodeModal.jsx b/superset/assets/src/dashboard/deprecated/v1/components/CodeModal.jsx
deleted file mode 100644
index 3f802c3471a95..0000000000000
--- a/superset/assets/src/dashboard/deprecated/v1/components/CodeModal.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import ModalTrigger from '../../../../components/ModalTrigger';
-import { t } from '../../../../locales';
-
-const propTypes = {
- triggerNode: PropTypes.node.isRequired,
- code: PropTypes.string,
- codeCallback: PropTypes.func,
-};
-
-const defaultProps = {
- codeCallback: () => {},
-};
-
-export default class CodeModal extends React.PureComponent {
- constructor(props) {
- super(props);
- this.state = { code: props.code };
- }
- beforeOpen() {
- let code = this.props.code;
- if (!code && this.props.codeCallback) {
- code = this.props.codeCallback();
- }
- this.setState({ code });
- }
- render() {
- return (
-
-
- {this.state.code}
-
-