From 189aced320d846b85e8a0c3d472b41ceea7cfda2 Mon Sep 17 00:00:00 2001 From: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com> Date: Tue, 16 Feb 2021 19:54:43 -0800 Subject: [PATCH] refactor: remove deprecated chart.edit_url field from frontend usage (#13142) --- superset-frontend/spec/fixtures/mockSliceEntities.js | 11 ----------- .../src/dashboard/actions/sliceEntities.js | 2 -- .../src/dashboard/reducers/getInitialState.js | 1 - superset-frontend/src/dashboard/util/propShapes.jsx | 1 - 4 files changed, 15 deletions(-) diff --git a/superset-frontend/spec/fixtures/mockSliceEntities.js b/superset-frontend/spec/fixtures/mockSliceEntities.js index 600c84015..69570c5c8 100644 --- a/superset-frontend/spec/fixtures/mockSliceEntities.js +++ b/superset-frontend/spec/fixtures/mockSliceEntities.js @@ -45,7 +45,6 @@ export const sliceEntitiesForChart = { compare_suffix: 'o10Y', datasource: datasourceId, }, - edit_url: `/chart/edit/${sliceId}`, viz_type: 'pie', datasource: datasourceId, description: null, @@ -78,7 +77,6 @@ export const sliceEntitiesForDashboard = { }, ], }, - edit_url: '/chart/edit/127', viz_type: 'filter_box', datasource: '2__table', description: null, @@ -91,7 +89,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20128%7D', slice_name: "World's Population", form_data: {}, - edit_url: '/chart/edit/128', viz_type: 'big_number', datasource: '2__table', description: null, @@ -104,7 +101,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20129%7D', slice_name: 'Most Populated Countries', form_data: {}, - edit_url: '/chart/edit/129', viz_type: 'table', datasource: '2__table', description: null, @@ -117,7 +113,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20130%7D', slice_name: 'Growth Rate', form_data: {}, - edit_url: '/chart/edit/130', viz_type: 'line', datasource: '2__table', description: null, @@ -130,7 +125,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20131%7D', slice_name: '% Rural', form_data: {}, - edit_url: '/chart/edit/131', viz_type: 'world_map', datasource: '2__table', description: null, @@ -143,7 +137,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20132%7D', slice_name: 'Life Expectancy VS Rural %', form_data: {}, - edit_url: '/chart/edit/132', viz_type: 'bubble', datasource: '2__table', description: null, @@ -156,7 +149,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20133%7D', slice_name: 'Rural Breakdown', form_data: {}, - edit_url: '/chart/edit/133', viz_type: 'sunburst', datasource: '2__table', description: null, @@ -169,7 +161,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20134%7D', slice_name: "World's Pop Growth", form_data: {}, - edit_url: '/chart/edit/134', viz_type: 'area', datasource: '2__table', description: null, @@ -182,7 +173,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20135%7D', slice_name: 'Box plot', form_data: {}, - edit_url: '/chart/edit/135', viz_type: 'box_plot', datasource: '2__table', description: null, @@ -195,7 +185,6 @@ export const sliceEntitiesForDashboard = { slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20136%7D', slice_name: 'Treemap', form_data: {}, - edit_url: '/chart/edit/136', viz_type: 'treemap', datasource: '2__table', description: null, diff --git a/superset-frontend/src/dashboard/actions/sliceEntities.js b/superset-frontend/src/dashboard/actions/sliceEntities.js index 2a344cbc0..441968d98 100644 --- a/superset-frontend/src/dashboard/actions/sliceEntities.js +++ b/superset-frontend/src/dashboard/actions/sliceEntities.js @@ -57,7 +57,6 @@ export function fetchAllSlices(userId) { 'datasource_name_text', 'description_markeddown', 'description', - 'edit_url', 'id', 'params', 'slice_name', @@ -87,7 +86,6 @@ export function fetchAllSlices(userId) { slice_id: slice.id, slice_url: slice.url, slice_name: slice.slice_name, - edit_url: slice.edit_url, form_data, datasource_name: slice.datasource_name_text, datasource_url: slice.datasource_url, diff --git a/superset-frontend/src/dashboard/reducers/getInitialState.js b/superset-frontend/src/dashboard/reducers/getInitialState.js index 115799760..e7864dcd9 100644 --- a/superset-frontend/src/dashboard/reducers/getInitialState.js +++ b/superset-frontend/src/dashboard/reducers/getInitialState.js @@ -127,7 +127,6 @@ export default function getInitialState(bootstrapData) { slice_url: slice.slice_url, slice_name: slice.slice_name, form_data: slice.form_data, - edit_url: slice.edit_url, viz_type: slice.form_data.viz_type, datasource: slice.form_data.datasource, description: slice.description, diff --git a/superset-frontend/src/dashboard/util/propShapes.jsx b/superset-frontend/src/dashboard/util/propShapes.jsx index 78bcf3f06..37aaac2e2 100644 --- a/superset-frontend/src/dashboard/util/propShapes.jsx +++ b/superset-frontend/src/dashboard/util/propShapes.jsx @@ -59,7 +59,6 @@ export const slicePropShape = PropTypes.shape({ slice_id: PropTypes.number.isRequired, slice_url: PropTypes.string.isRequired, slice_name: PropTypes.string.isRequired, - edit_url: PropTypes.string.isRequired, datasource: PropTypes.string, datasource_name: PropTypes.string, datasource_link: PropTypes.string,