From f9c7405e0eacf69b79063c441aa66d74c8fa3f91 Mon Sep 17 00:00:00 2001 From: Kamil Gabryjelski Date: Tue, 8 Mar 2022 18:50:51 +0100 Subject: [PATCH] chore(explore): Set Drag&Drop feature flags to True by default (#19046) * chore(explore): Set Drag&Drop feature flags to True by default * fix tests --- .../cypress/integration/explore/AdhocMetrics.test.ts | 2 +- .../cypress/integration/explore/control.test.ts | 11 +++++++---- .../integration/explore/visualizations/line.test.ts | 2 +- .../DndColumnSelectControl/ColumnSelectPopover.tsx | 1 + superset/config.py | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts index 16095586cac20..deb829a092dca 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts @@ -33,7 +33,7 @@ describe('AdhocMetrics', () => { .click(); cy.get('[data-test=metrics]') - .find('[data-test="add-metric-button"]') + .contains('Drop columns/metrics here or click') .click(); // Title edit for saved metrics is disabled - switch to Simple diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts index 804fffafa21bd..1b723ec65d406 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts @@ -255,10 +255,13 @@ describe('Groupby control', () => { cy.visitChartByName('Num Births Trend'); cy.verifySliceSuccess({ waitAlias: '@chartData' }); - cy.get('[data-test=groupby]').within(() => { - cy.get('.ant-select').click(); - cy.get('input[type=search]').type('state{enter}'); - }); + cy.get('[data-test=groupby]') + .contains('Drop columns here or click') + .click(); + cy.get('[id="adhoc-metric-edit-tabs-tab-simple"]').click(); + cy.get('input[aria-label="Column"]').click().type('state{enter}'); + cy.get('[data-test="ColumnEdit#save"]').contains('Save').click(); + cy.get('button[data-test="run-query-button"]').click(); cy.verifySliceSuccess({ waitAlias: '@chartData', chartSelector: 'svg' }); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts index 5dda1abb99dc9..e8998b4bef86e 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts @@ -43,7 +43,7 @@ describe('Visualization > Line', () => { cy.get('.text-danger').contains('Metrics'); cy.get('[data-test=metrics]') - .find('[data-test="add-metric-button"]') + .contains('Drop columns/metrics here or click') .click(); // Title edit for saved metrics is disabled - switch to Simple diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx index 79a370737caf4..9c4011f9d54bb 100644 --- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx +++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx @@ -348,6 +348,7 @@ const ColumnSelectPopover = ({ } buttonSize="small" onClick={onSave} + data-test="ColumnEdit#save" cta > {t('Save')} diff --git a/superset/config.py b/superset/config.py index a9c08fcaf6e4b..c6f2269b94e61 100644 --- a/superset/config.py +++ b/superset/config.py @@ -417,9 +417,9 @@ def _try_json_readsha(filepath: str, length: int) -> Optional[str]: # Enable experimental feature to search for other dashboards "OMNIBAR": False, "DASHBOARD_RBAC": False, - "ENABLE_EXPLORE_DRAG_AND_DROP": False, + "ENABLE_EXPLORE_DRAG_AND_DROP": True, "ENABLE_FILTER_BOX_MIGRATION": False, - "ENABLE_DND_WITH_CLICK_UX": False, + "ENABLE_DND_WITH_CLICK_UX": True, # Enabling ALERTS_ATTACH_REPORTS, the system sends email and slack message # with screenshot and link # Disables ALERTS_ATTACH_REPORTS, the system DOES NOT generate screenshot