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
Cancel sql transform preview (#64726)
Romeo Van Snickd1cb9336da6f
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/admin/transforms.cy.spec.tsindex 1c3fbe438b8..dff344b4d48 100644--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts+++ b/e2e/test/scenarios/admin/transforms.cy.spec.ts@@ -1618,6 +1618,19 @@ LIMIT"This run succeeded before it had a chance to cancel.",);});++ it("should be possible to cancel a SQL transform from the preview (metabase#64474)", () => {+ createSlowTransform(500);+ getTransformPage().findByText("Edit query").click();++ getQueryEditor().within(() => {+ cy.findAllByTestId("run-button").eq(0).click();+ cy.findByTestId("loading-indicator").should("be.visible");++ cy.findAllByTestId("run-button").eq(0).click();+ cy.findByTestId("loading-indicator").should("not.exist");+ });+ });});describe("dependencies", () => {@@ -2686,7 +2699,7 @@ function getQueryEditor() {}function getRunButton(options: { timeout?: number } = {}) {- return cy.findByTestId("run-button", options);+ return cy.findAllByTestId("run-button", options).eq(0);}function getCancelButton() {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/use-query-results.ts b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/use-query-results.tsindex 6466052c508..f75e518a5f7 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/use-query-results.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/use-query-results.ts@@ -1,6 +1,7 @@-import { useCallback, useMemo, useState } from "react";+import { useCallback, useMemo, useRef, useState } from "react";import { useAsyncFn } from "react-use";+import { type Deferred, defer } from "metabase/lib/promise";import { useSelector } from "metabase/lib/redux";import { getMetadata } from "metabase/selectors/metadata";import { runQuestionQuery } from "metabase/services";@@ -11,9 +12,21 @@ import type { DatasetQuery } from "metabase-types/api";export function useQueryResults(question: Question) {const metadata = useSelector(getMetadata);const [lastRunQuery, setLastRunQuery] = useState<DatasetQuery | null>(null);+ const deferredRef = useRef<Deferred>();++ function deferred() {+ // Cancel the previous query when a new one is started.+ deferredRef.current?.resolve();+ deferredRef.current = defer();++ return deferredRef.current;+ }const [{ value: results = null, loading: isRunning }, runQuery] = useAsyncFn(- () => runQuestionQuery(question),+ () =>+ runQuestionQuery(question, {+ cancelDeferred: deferred(),+ }),[question],);@@ -48,7 +61,7 @@ export function useQueryResults(question: Question) {}, [question, runQuery]);const handleCancelQuery = useCallback(() => {- return null;+ return deferredRef.current?.resolve();}, []);return {