diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md index b5ab3f6d6fddc..714971378ecb7 100644 --- a/RESOURCES/FEATURE_FLAGS.md +++ b/RESOURCES/FEATURE_FLAGS.md @@ -64,8 +64,6 @@ These features flags are **safe for production**. They have been tested and will ### Flags on the path to feature launch and flag deprecation/removal - DASHBOARD_VIRTUALIZATION -- DRILL_BY -- DISABLE_LEGACY_DATASOURCE_EDITOR ### Flags retained for runtime configuration @@ -79,6 +77,7 @@ independently. This new framework will also allow for non-boolean configurations - ALLOW_ADHOC_SUBQUERY - DASHBOARD_RBAC [(docs)](https://superset.apache.org/docs/using-superset/creating-your-first-dashboard#manage-access-to-dashboards) - DATAPANEL_CLOSED_BY_DEFAULT +- DRILL_BY - DRUID_JOINS - EMBEDDABLE_CHARTS - EMBEDDED_SUPERSET diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts b/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts index be758ed6dd2bd..c94f394be9f50 100644 --- a/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts +++ b/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts @@ -80,7 +80,6 @@ describe('SqlLab query panel', () => { it.skip('successfully saves a query', () => { cy.intercept('api/v1/database/**/tables/**').as('getTables'); - cy.intercept('savedqueryviewapi/**').as('getSavedQuery'); const query = 'SELECT ds, gender, name, num FROM main.birth_names ORDER BY name LIMIT 3'; diff --git a/superset-frontend/cypress-base/cypress/support/e2e.ts b/superset-frontend/cypress-base/cypress/support/e2e.ts index 4a471c87d1b05..18572b6ab2e7a 100644 --- a/superset-frontend/cypress-base/cypress/support/e2e.ts +++ b/superset-frontend/cypress-base/cypress/support/e2e.ts @@ -20,6 +20,7 @@ import '@cypress/code-coverage/support'; import '@applitools/eyes-cypress/commands'; import failOnConsoleError from 'cypress-fail-on-console-error'; import { expect } from 'chai'; +import rison from 'rison'; /* eslint-disable @typescript-eslint/no-explicit-any */ @@ -169,7 +170,7 @@ Cypress.Commands.add('login', () => { }).then(response => { if (response.status === 302) { // If there's a redirect, follow it manually - const redirectUrl = response.headers['location']; + const redirectUrl = response.headers.location; cy.request({ method: 'GET', url: redirectUrl, @@ -183,8 +184,12 @@ Cypress.Commands.add('login', () => { }); Cypress.Commands.add('visitChartByName', name => { - cy.request(`/chart/api/read?_flt_3_slice_name=${name}`).then(response => { - cy.visit(`${BASE_EXPLORE_URL}{"slice_id": ${response.body.pks[0]}}`); + const query = rison.encode({ + columns: ['id'], + filters: [{ col: 'slice_name', opr: 'eq', value: name }], + }); + cy.request(`/api/v1/chart?q=${query}`).then(response => { + cy.visit(`${BASE_EXPLORE_URL}{"slice_id": ${response.body.result[0].id}}`); }); }); diff --git a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts index 34e8d51f27fd7..34799d3c52324 100644 --- a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts +++ b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts @@ -35,7 +35,6 @@ export enum FeatureFlag { DashboardVirtualization = 'DASHBOARD_VIRTUALIZATION', DashboardRbac = 'DASHBOARD_RBAC', DatapanelClosedByDefault = 'DATAPANEL_CLOSED_BY_DEFAULT', - DisableLegacyDatasourceEditor = 'DISABLE_LEGACY_DATASOURCE_EDITOR', /** @deprecated */ DrillToDetail = 'DRILL_TO_DETAIL', DrillBy = 'DRILL_BY', diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-table/birthNames.json b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-table/birthNames.json index c35d3a80665fc..bce7fca54a815 100644 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-table/birthNames.json +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/plugin-chart-table/birthNames.json @@ -30,7 +30,6 @@ "cache_timeout": null, "params": null, "perm": "[examples].[birth_names](id:3)", - "edit_url": "/tablemodelview/edit/3", "sql": null, "columns": [ { diff --git a/superset-frontend/spec/fixtures/mockDatasource.js b/superset-frontend/spec/fixtures/mockDatasource.js index 21a5805519b67..29f525fa8c8ca 100644 --- a/superset-frontend/spec/fixtures/mockDatasource.js +++ b/superset-frontend/spec/fixtures/mockDatasource.js @@ -199,6 +199,5 @@ export default { ['["num_girls", false]', 'num_girls [desc]'], ], type: 'table', - edit_url: '/tablemodelview/edit/7', }, }; diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx index 166dafdf25516..ee76973502e5d 100644 --- a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx +++ b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx @@ -101,11 +101,6 @@ describe('DatasourceModal', () => { expect(screen.getByTestId('datasource-editor')).toBeInTheDocument(); }); - it('renders a legacy data source btn', () => { - const button = screen.getByTestId('datasource-modal-legacy-edit'); - expect(button).toBeInTheDocument(); - }); - it('disables the save button when the datasource is managed externally', () => { // the render is currently in a before operation, so it needs to be cleaned up // we could alternatively move all the renders back into the tests or find a better diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx index a6f812786f2e4..78483771d340c 100644 --- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx +++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx @@ -20,9 +20,7 @@ import { FunctionComponent, useState, useRef } from 'react'; import Alert from 'src/components/Alert'; import Button from 'src/components/Button'; import { - FeatureFlag, isDefined, - isFeatureEnabled, Metric, styled, SupersetClient, @@ -271,10 +269,6 @@ const DatasourceModal: FunctionComponent = ({ }); }; - const showLegacyDatasourceEditor = !isFeatureEnabled( - FeatureFlag.DisableLegacyDatasourceEditor, - ); - return ( = ({ maskClosable={!isEditing} footer={ <> - {showLegacyDatasourceEditor && ( - - )}