The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix: #60843 Prevents dashboard from being saved when clicking "Discard changes" (#63899)
Brad Andersone349faa74130
diff --git a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard.cy.spec.jsindex 94c9f7cb63c..40c28167947 100644--- a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js+++ b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js@@ -645,6 +645,33 @@ describe("scenarios > dashboard", () => {H.getDashboardCard(1).contains("bottom");},);++ it("should not save the dashboard when the user clicks 'Discard changes'", () => {+ // Navigate to the dashboard via client-side navigation (to trigger the client-side "Discard changes" prompt)+ cy.visit("/");+ cy.findByTestId("main-navbar-root").findByText("Our analytics").click();+ cy.findByTestId("collection-table")+ .findByText(originalDashboardName)+ .click();++ cy.log("Make a change to the dashboard");+ H.editDashboard();+ cy.findByTestId("dashboard-empty-state")+ .findByText("Add a chart")+ .click();+ H.sidebar().findByText("Orders, Count").click();+ H.getDashboardCards().should("have.length", 1);++ cy.log("Navigate back and discard changes");+ cy.go("back");+ H.modal().button("Discard changes").click();+ cy.findByTestId("collection-table")+ .findByText(originalDashboardName)+ .click();++ cy.log("Verify changes were not saved");+ cy.findByTestId("dashboard-empty-state").should("exist");+ });});describe("iframe cards", () => {diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsxindex a7897cf7350..5625973e2ac 100644--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx@@ -27,12 +27,6 @@ export const DashboardLeaveConfirmationModal = withRouter(router,});- const onSave = async () => {- dispatch(dismissAllUndo());- await dispatch(updateDashboardAndCards());- confirm?.();- };-const content = isNavigatingToCreateADashboardQuestion(nextLocation)? {title: t`Save your changes?`,@@ -40,6 +34,7 @@ export const DashboardLeaveConfirmationModal = withRouter(actionBtn: {message: t`Save changes`,},+ onConfirm: () => dispatch(updateDashboardAndCards()),}: {title: t`Discard your changes?`,@@ -77,7 +72,11 @@ export const DashboardLeaveConfirmationModal = withRouter(<Buttoncolor={content.actionBtn.color}variant="filled"- onClick={onSave}+ onClick={async () => {+ dispatch(dismissAllUndo());+ await content.onConfirm?.();+ confirm?.();+ }}>{content.actionBtn.message}</Button>