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 flaky "Change target" behavior for transforms (#63526)
Alexander Polyankin33f5b24a0a95
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/admin/transforms.cy.spec.tsindex 905a4871716..a341890de01 100644--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts+++ b/e2e/test/scenarios/admin/transforms.cy.spec.ts@@ -751,48 +751,42 @@ H.describeWithSnowplowEE("scenarios > admin > transforms", () => {.should("be.visible");H.assertQueryBuilderRowCount(3);- cy.log("verify that the original question still works");+ cy.log("verify that the original question does not work");visitTableQuestion();assertTableDoesNotExistError();});- it(- "should be able to delete the target and restore the same target back",- { tags: "@flaky" },- () => {- cy.log("create and run a transform");- createMbqlTransform({ visitTransform: true });- runTransformAndWaitForSuccess();+ it("should be able to delete the target and restore the same target back", () => {+ cy.log("create and run a transform");+ createMbqlTransform({ visitTransform: true });+ runTransformAndWaitForSuccess();- cy.log("delete the old target without creating the new one");- getTransformPage().button("Change target").click();- H.modal().within(() => {- cy.findByLabelText("Table name").clear().type(TARGET_TABLE_2);- cy.findByLabelText("Delete transform_table").click();- cy.button("Change target and delete the old one").click();- cy.wait("@deleteTransformTable");- cy.wait("@updateTransform");- });+ cy.log("delete the old target without creating the new one");+ getTransformPage().button("Change target").click();+ H.modal().within(() => {+ cy.findByLabelText("Table name").clear().type(TARGET_TABLE_2);+ cy.findByLabelText("Delete transform_table").click();+ cy.button("Change target and delete the old one").click();+ cy.wait("@deleteTransformTable");+ cy.wait("@updateTransform");+ });- cy.log("change the target back to the original one");- getTransformPage().button("Change target").click();- H.modal().within(() => {- cy.findByLabelText("Table name").clear().type(TARGET_TABLE);- cy.button("Change target").click();- cy.wait("@updateTransform");- });+ cy.log("change the target back to the original one");+ getTransformPage().button("Change target").click();+ H.modal().within(() => {+ cy.findByLabelText("Table name").clear().type(TARGET_TABLE);+ cy.button("Change target").click();+ cy.wait("@updateTransform");+ });- cy.log("run the transform to re-create the original target");- runTransformAndWaitForSuccess();+ cy.log("run the transform to re-create the original target");+ runTransformAndWaitForSuccess();- cy.log("verify the target is available");- getTableLink().click();- H.queryBuilderHeader()- .findByText("Transform Table")- .should("be.visible");- H.assertQueryBuilderRowCount(3);- },- );+ cy.log("verify the target is available");+ getTableLink().click();+ H.queryBuilderHeader().findByText("Transform Table").should("be.visible");+ H.assertQueryBuilderRowCount(3);+ });it("should not allow to overwrite an existing table when changing the target", () => {createMbqlTransform({ visitTransform: true });diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsxindex 13a4e3ec00d..ae120ab85fd 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx@@ -152,12 +152,12 @@ function JobPageBody({ job }: JobPageBodyProps) {);}-export function getParsedParams({ jobId }: JobPageParams): JobPageParsedParams {+function getParsedParams({ jobId }: JobPageParams): JobPageParsedParams {return {jobId: Urls.extractEntityId(jobId),};}-export function isPollingNeeded(job?: TransformJob) {+function isPollingNeeded(job?: TransformJob) {return job?.last_run?.status === "started";}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsxindex f497f406818..d56eb4a0195 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx@@ -105,7 +105,6 @@ function UpdateTargetForm({const isLoading = isDatabaseLoading || isSchemasLoading;const error = databaseError ?? schemasError;-const supportsSchemas = database && hasFeature(database, "schemas");if (isLoading || error != null) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsxindex 5f61d06c6bd..e709287cbe0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import { skipToken } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { parseTimestamp } from "metabase/lib/time-dayjs";import * as Urls from "metabase/lib/urls";import { Stack } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";@@ -66,7 +67,7 @@ export function TransformPage({ params }: TransformPageProps) {);}-export function getParsedParams({+function getParsedParams({transformId,}: TransformPageParams): TransformPageParsedParams {return {@@ -74,9 +75,29 @@ export function getParsedParams({};}-export function isPollingNeeded(transform?: Transform) {- return (- transform?.last_run?.status === "started" ||- (transform?.last_run?.status === "succeeded" && transform.table == null)- );+function isPollingNeeded(transform?: Transform) {+ const lastRun = transform?.last_run;++ if (transform == null || lastRun == null) {+ return false;+ }++ if (lastRun.status === "started") {+ return true;+ }++ // If the last run succeeded but there is no table yet, wait for the sync to+ // finish. If the transform is changed until the sync finishes, stop polling,+ // because the table could be already deleted.+ if (+ transform.table == null &&+ lastRun.status === "succeeded" &&+ lastRun.end_time != null+ ) {+ const endedAt = parseTimestamp(lastRun.end_time);+ const updatedAt = parseTimestamp(transform.updated_at);+ return endedAt.isAfter(updatedAt);+ }++ return false;}