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 - It's not possible to continue editing a bad transform (#68415)
Kamil Mielnik4befb6089f1c
diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.tsindex 77e03d2a43c..ed9c384fb49 100644--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts@@ -7,6 +7,7 @@ import type {CardType,CollectionId,PythonTransformTableAliases,+ TransformId,TransformSourceCheckpointStrategy,TransformTagId,} from "metabase-types/api";@@ -42,6 +43,9 @@ describe("scenarios > admin > transforms", () => {cy.intercept("POST", "/api/ee/transform-tag").as("createTag");cy.intercept("PUT", "/api/ee/transform-tag/*").as("updateTag");cy.intercept("DELETE", "/api/ee/transform-tag/*").as("deleteTag");+ cy.intercept("POST", "/api/ee/dependencies/check_transform").as(+ "checkTransformDependencies",+ );});afterEach(() => {@@ -1548,6 +1552,109 @@ LIMITH.assertQueryBuilderRowCount(1);});+ it("should be possible to continue editing a transform after closing check dependencies modal (metabase#68272)", () => {+ const transformTableName = "output_table";+ const dependentCardName = "Question depending on transform";++ cy.log("create MBQL transform with name and score columns");+ H.getTableId({ name: SOURCE_TABLE, databaseId: WRITABLE_DB_ID }).then(+ (sourceTableId) => {+ H.getFieldId({ tableId: sourceTableId, name: "name" }).then(+ (nameFieldId) => {+ H.getFieldId({ tableId: sourceTableId, name: "score" }).then(+ (scoreFieldId) => {+ H.createTransform(+ {+ name: "MBQL transform with deps",+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "query",+ query: {+ "source-table": sourceTableId,+ fields: [+ ["field", nameFieldId, null],+ ["field", scoreFieldId, null],+ ],+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ name: transformTableName,+ schema: TARGET_SCHEMA,+ },+ },+ { wrapId: true },+ );+ },+ );+ },+ );+ },+ );++ cy.get<TransformId>("@transformId").then((transformId) => {+ cy.log("run the transform to create the output table");+ cy.request("POST", `/api/ee/transform/${transformId}/run`);+ H.waitForSucceededTransformRuns();+ H.resyncDatabase({+ dbId: WRITABLE_DB_ID,+ tableName: transformTableName,+ });++ cy.log("create a question that depends on the score column");+ H.getTableId({+ databaseId: WRITABLE_DB_ID,+ name: transformTableName,+ }).then((tableId) => {+ H.createQuestion({+ name: dependentCardName,+ database: WRITABLE_DB_ID,+ query: {+ "source-table": tableId,+ filter: [+ ">",+ ["field", "score", { "base-type": "type/Integer" }],+ 10,+ ],+ },+ });+ });++ H.visitTransform(transformId);++ cy.log("remove score column (breaking change)");+ H.DataStudio.Transforms.editDefinition().click();+ H.getNotebookStep("data").findByLabelText("Pick columns").click();+ H.popover().findByLabelText("Score").click();+ H.DataStudio.Transforms.saveChangesButton().click();++ cy.wait("@checkTransformDependencies");++ H.modal().within(() => {+ cy.findByText(+ "These changes will break some other things. Save anyway?",+ ).should("be.visible");+ cy.findByText(dependentCardName).should("be.visible");++ cy.log("cancel to continue editing");+ cy.button("Cancel").click();+ });++ H.DataStudio.Transforms.editDefinition().should("not.exist");+ H.DataStudio.Transforms.saveChangesButton()+ .should("be.visible")+ .and("be.enabled");++ H.getNotebookStep("data").findByLabelText("Pick columns").click();+ H.popover().findByLabelText("Name").should("be.disabled");+ H.popover().findByLabelText("Score").should("not.be.checked");+ });+ });+it("should be able to update a Python query", { tags: ["@python"] }, () => {setPythonRunnerSettings();cy.log("create a new transform");diff --git a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.tsindex 3126c6cb9b4..ba4f913554b 100644--- a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts@@ -193,10 +193,6 @@ describe("scenarios > dependencies > dependency checks", () => {});cy.get("@updateTransform.all").should("have.length", 0);- H.DataStudio.Transforms.editDefinition().click();- H.getNotebookStep("data").findByLabelText("Pick columns").click();- H.popover().findByLabelText("Score").click();-cy.log("confirm breaking changes");H.DataStudio.Transforms.saveChangesButton().click();H.modal().within(() => {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex b84fbfc7151..18e9217afe3 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -120,6 +120,10 @@ function TransformQueryPageBody({sendErrorToast(t`Failed to update transform query`);} else {sendSuccessToast(t`Transform query updated`);++ if (isEditMode) {+ dispatch(push(Urls.transform(transform.id)));+ }}},});@@ -149,11 +153,8 @@ function TransformQueryPageBody({return;}}- await handleInitialSave({ id: transform.id, source });- if (isEditMode) {- dispatch(push(Urls.transform(transform.id)));- }+ await handleInitialSave({ id: transform.id, source });};const handleCancel = () => {