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
Bot 1146 transform context is included twice (#74126)
Sloan Sparger221f22da5240
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsxindex ae1ceee4703..3c4172b7474 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx@@ -3,7 +3,6 @@ import { useEffect } from "react";import { usePrevious } from "react-use";import type { PythonTransformEditorProps } from "metabase/plugins";-import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { Flex, Stack } from "metabase/ui";import type {DatabaseId,@@ -30,17 +29,20 @@ export function PythonTransformEditor({onChangeSource,onAcceptProposed,onRejectProposed,+ onDryRunErrorChange,onRunTransform,onRun,}: PythonTransformEditorProps) {const { isRunning, cancel, run, executionResult, isDirty } =useTestPythonTransform(source);- useRegisterMetabotTransformContext(- transform,- source,- executionResult?.error?.message,- );+ useEffect(() => {+ const errMsg = [executionResult?.error?.message, executionResult?.logs]+ .filter((x) => !!x)+ .join("\n\n");+ onDryRunErrorChange?.(errMsg);+ return () => onDryRunErrorChange?.(undefined);+ }, [executionResult, onDryRunErrorChange]);const wasRunning = usePrevious(isRunning);diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.tsindex 8e8a9929678..bb15e6c6ea1 100644--- a/frontend/src/metabase/plugins/oss/transforms.ts+++ b/frontend/src/metabase/plugins/oss/transforms.ts@@ -34,6 +34,7 @@ export type PythonTransformEditorProps = {onChangeSource: (source: PythonTransformSourceDraft) => void;onAcceptProposed: () => void;onRejectProposed: () => void;+ onDryRunErrorChange?: (error: string | undefined) => void;onRunTransform?: (result: any) => void;onRun?: () => void;};diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 4229e39d113..b7db87db738 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -19,6 +19,7 @@ import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";+import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center } from "metabase/ui";import * as Urls from "metabase/urls";@@ -31,7 +32,6 @@ import type {import { TransformEditor } from "../../components/TransformEditor";import { NAME_MAX_LENGTH } from "../../constants";-import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";import { useSourceState } from "../../hooks/use-source-state";import { getValidationResult, isCompleteSource } from "../../utils";@@ -119,7 +119,8 @@ function NewTransformPageBody({const [isModalOpened, { open: openModal, close: closeModal }] =useDisclosure();const dispatch = useDispatch();- useRegisterMetabotTransformContext(undefined, source);+ const [dryRunError, setDryRunError] = useState<string | undefined>(undefined);+ useRegisterMetabotTransformContext(undefined, source, dryRunError);const validationResult = useMemo(() => {return source.type === "query"@@ -187,6 +188,7 @@ function NewTransformPageBody({onChangeSource={setSourceAndRejectProposed}onAcceptProposed={acceptProposed}onRejectProposed={rejectProposed}+ onDryRunErrorChange={setDryRunError}/>) : (<TransformEditordiff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex 4190b7f3d78..bca04ac97ea 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -22,6 +22,7 @@ import {} from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";+import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center, Group, Icon } from "metabase/ui";import * as Urls from "metabase/urls";@@ -37,7 +38,6 @@ import {type TransformEditorProps,} from "../../components/TransformEditor";import { TransformHeader } from "../../components/TransformHeader";-import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";import { useSourceState } from "../../hooks/use-source-state";import { isCompleteSource } from "../../utils";@@ -127,8 +127,12 @@ function TransformQueryPageBody({? (transform.last_run.message ?? undefined): undefined;}, [transform.last_run]);-- useRegisterMetabotTransformContext(transform, source, lastRunError);+ const [dryRunError, setDryRunError] = useState<string | undefined>(undefined);+ useRegisterMetabotTransformContext(+ transform,+ source,+ dryRunError ?? lastRunError,+ );const {checkData,@@ -244,6 +248,7 @@ function TransformQueryPageBody({onChangeSource={setSourceAndRejectProposed}onAcceptProposed={acceptProposed}onRejectProposed={rejectProposed}+ onDryRunErrorChange={setDryRunError}/>) : (<TransformEditor@@ -298,6 +303,7 @@ export type TransformQueryPageEditorProps = {acceptProposed: () => void;rejectProposed: () => void;uiOptions?: TransformEditorProps["uiOptions"];+ onDryRunErrorChange?: (error: string | undefined) => void;onRunQueryStart?: (query: DatasetQuery) => boolean | void;onRunTransform?: (result: any) => void;onRun?: () => void;@@ -315,6 +321,7 @@ export function TransformQueryPageEditor({isEditMode = false,acceptProposed,rejectProposed,+ onDryRunErrorChange,onRunQueryStart,onRunTransform,onRun,@@ -330,6 +337,7 @@ export function TransformQueryPageEditor({onChangeSource={setSourceAndRejectProposed}onAcceptProposed={acceptProposed}onRejectProposed={rejectProposed}+ onDryRunErrorChange={onDryRunErrorChange}onRunTransform={onRunTransform}onRun={onRun}/>