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
Gdgt 2429 unsaved changes warning does not work while save transform (#75054)
Egor Grushinaf1305dca77a
diff --git a/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.tsindex e9485baddd8..8afab851df5 100644--- a/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts@@ -174,6 +174,54 @@ describe("issue UXW-3160", () => {});});+describe("issue GDGT-2429", () => {+ beforeEach(() => {+ H.restore("postgres-writable");+ cy.signInAsAdmin();+ H.activateToken("pro-self-hosted");+ H.updateSetting("transforms-enabled", true);+ });++ function startNewSqlTransform() {+ visitTransformListPage();+ cy.button("Create a transform").click();+ H.popover().findByText("SQL query").click();+ H.popover().findByText("Writable Postgres12").click();+ H.NativeEditor.type("SELECT 42", { allowFastSet: true }).blur();+ }++ function openSaveModal() {+ getQueryEditor().button("Save").click();+ H.modal().findByText("Save your transform").should("be.visible");+ }++ it("should warn about unsaved changes when navigating away while the save modal is open (metabase#GDGT-2429)", () => {+ cy.intercept("POST", "/api/transform").as("createTransform");++ startNewSqlTransform();+ openSaveModal();++ cy.log("navigating away while the save modal is open should warn");+ cy.go("back");+ H.leaveConfirmationModal().should("be.visible");++ cy.log("pressing Esc should close the warning, not the saving modal");+ cy.realPress("Escape");+ H.leaveConfirmationModal().should("not.exist");+ H.modal().findByText("Save your transform").should("be.visible");++ cy.log("saving the transform should allow navigating away without warning");+ H.modal().within(() => {+ cy.findByLabelText("Name").clear().type("GDGT-2429 transform");+ cy.button("Save").click();+ });+ cy.wait("@createTransform");++ cy.go("back");+ H.leaveConfirmationModal().should("not.exist");+ });+});+function visitTransformListPage() {return cy.visit("/data-studio/transforms");}diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsxindex ae6caaf43bf..64ba53c3cf0 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx@@ -48,6 +48,7 @@ type CreateTransformModalProps = {targetDescription?: string;validateOnMount?: boolean;showIncrementalSettings?: boolean;+ closeOnEscape?: boolean;};export function CreateTransformModal({@@ -61,6 +62,7 @@ export function CreateTransformModal({targetDescription,validateOnMount,showIncrementalSettings,+ closeOnEscape,}: CreateTransformModalProps) {const databaseId =source.type === "query" ? source.query.database : source["source-database"];@@ -117,7 +119,13 @@ export function CreateTransformModal({};return (- <Modal title={t`Save your transform`} opened padding="xl" onClose={onClose}>+ <Modal+ title={t`Save your transform`}+ opened+ padding="xl"+ closeOnEscape={closeOnEscape}+ onClose={onClose}+ ><FormProviderinitialValues={initialValues}validationSchema={validationSchema}diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex b7db87db738..6c1999b20a3 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -1,5 +1,6 @@import { useDisclosure } from "@mantine/hooks";-import { useMemo, useState } from "react";+import type { Location } from "history";+import { useCallback, useMemo, useRef, useState } from "react";import { Link, type Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -118,6 +119,7 @@ function NewTransformPageBody({const metadata = useSelector(getMetadata);const [isModalOpened, { open: openModal, close: closeModal }] =useDisclosure();+ const [isLeaveWarningOpen, setIsLeaveWarningOpen] = useState(false);const dispatch = useDispatch();const [dryRunError, setDryRunError] = useState<string | undefined>(undefined);useRegisterMetabotTransformContext(undefined, source, dryRunError);@@ -128,7 +130,10 @@ function NewTransformPageBody({: PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult(source);}, [source, metadata]);+ const isSavedRef = useRef(false);+const handleCreate = (transform: Transform) => {+ isSavedRef.current = true;dispatch(push(Urls.transform(transform.id)));};@@ -136,6 +141,11 @@ function NewTransformPageBody({dispatch(push(Urls.transformList()));};+ const isLocationAllowed = useCallback(+ (location?: Location) => !location || isSavedRef.current,+ [],+ );+return (<><PageContainer pos="relative" data-testid="transform-query-editor">@@ -211,14 +221,17 @@ function NewTransformPageBody({<CreateTransformModalsource={source}defaultValues={getDefaultValues(name, suggestedTransform)}+ closeOnEscape={!isLeaveWarningOpen}onCreate={handleCreate}onClose={closeModal}/>)}<LeaveRouteConfirmModalroute={route}- isEnabled={isDirty && !isModalOpened}+ isEnabled={isDirty}+ isLocationAllowed={isLocationAllowed}onConfirm={rejectProposed}+ onOpenChange={setIsLeaveWarningOpen}/></>);