Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Extract QueryEditor from transforms (#65160)

Alexander Polyankinb859cbfd592e
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
index 6914f7f39c7..42b1df40830 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
@@ -252,11 +252,7 @@ function getSourceCode(
function getTransformUrl(transform: SuggestedTransform): string {
return match(transform)
.with({ id: P.number }, ({ id }) => Urls.transformQuery(id))
- .with({ source: { type: "python" } }, () =>
- Urls.newTransformFromType("python"),
- )
- .with({ source: { type: "query" } }, () =>
- Urls.newTransformFromType("native"),
- )
+ .with({ source: { type: "python" } }, () => Urls.newPythonTransform())
+ .with({ source: { type: "query" } }, () => Urls.newNativeTransform())
.exhaustive();
}
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.tsx
index 7b51e03bcee..598e61acc1f 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
@@ -1,16 +1,9 @@
import { useHotkeys } from "@mantine/hooks";
-import { useState } from "react";
+import type { PythonTransformEditorProps } from "metabase/plugins";
import { Flex, Stack } from "metabase/ui";
-import { EditorHeader } from "metabase-enterprise/transforms/components/QueryEditor/EditorHeader";
-import { useRegisterMetabotTransformContext } from "metabase-enterprise/transforms/hooks/use-register-transform-metabot-context";
-import type {
- PythonTransformSource,
- PythonTransformSourceDraft,
- PythonTransformTableAliases,
- Table,
- Transform,
-} from "metabase-types/api";
+import { EditorHeader } from "metabase-enterprise/transforms/components/TransformEditor/EditorHeader";
+import type { PythonTransformTableAliases, Table } from "metabase-types/api";
import { PythonDataPicker } from "./PythonDataPicker";
import { PythonEditorBody } from "./PythonEditorBody";
@@ -23,40 +16,20 @@ import {
useTestPythonTransform,
} from "./utils";
-export type PythonTransformEditorProps = {
- transform?: Transform | undefined;
- initialSource: PythonTransformSourceDraft;
- proposedSource?: PythonTransformSource;
- isNew?: boolean;
- isSaving?: boolean;
- isRunnable?: boolean;
- onChange?: (newSource: PythonTransformSourceDraft) => void;
- onSave: (newSource: PythonTransformSource) => void;
- onCancel: () => void;
- onRejectProposed?: () => void;
- onAcceptProposed?: (query: PythonTransformSource) => void;
-};
-
export function PythonTransformEditor({
- transform,
- initialSource,
+ name,
+ source,
proposedSource,
- isNew = true,
+ isNew = false,
+ isDirty = false,
isSaving = false,
- isRunnable = true,
- onChange,
+ onChangeSource,
onSave,
onCancel,
- onRejectProposed,
onAcceptProposed,
+ onRejectProposed,
}: PythonTransformEditorProps) {
- const [source, setSource] = useState(initialSource);
- const saveSource = proposedSource ?? source;
- const [isSourceDirty, setIsSourceDirty] = useState(false);
-
- useRegisterMetabotTransformContext(transform, proposedSource ?? source);
-
- const { isRunning, isDirty, cancel, run, executionResult } =
+ const { isRunning, cancel, run, executionResult } =
useTestPythonTransform(source);
const handleScriptChange = (body: string) => {
@@ -64,9 +37,7 @@ export function PythonTransformEditor({
...source,
body,
};
- setSource(newSource);
- setIsSourceDirty(true);
- onChange?.(newSource);
+ onChangeSource(newSource);
};
const handleDataChange = (
@@ -86,25 +57,9 @@ export function PythonTransformEditor({
"source-database": database,
"source-tables": sourceTables,
};
- setSource(newSource);
- setIsSourceDirty(true);
+ onChangeSource(newSource);
};
- const handleSave = () => {
- if (isPythonTransformSource(saveSource)) {
- onSave(saveSource);
- }
- };
-
- const handleAcceptProposed =
- proposedSource && onAcceptProposed
- ? () => {
- setSource(proposedSource);
- setIsSourceDirty(true);
- onAcceptProposed(proposedSource);
- }
- : undefined;
-
const showDebugger = useShouldShowPythonDebugger();
const handleCmdEnter = () => {
@@ -113,14 +68,14 @@ export function PythonTransformEditor({
}
if (isRunning) {
cancel();
- } else if (isRunnable && isPythonTransformSource(saveSource)) {
+ } else if (isPythonTransformSource(source)) {
run();
}
};
useHotkeys([["mod+Enter", handleCmdEnter]], []);
- const validationResult = getValidationResult(saveSource);
+ const validationResult = getValidationResult(source);
return (
<Stack
@@ -131,23 +86,23 @@ export function PythonTransformEditor({
gap={0}
>
<EditorHeader
+ name={name}
+ validationResult={validationResult}
isNew={isNew}
+ isDirty={isDirty}
isSaving={isSaving}
- hasProposedQuery={!!proposedSource}
- onSave={handleSave}
+ onSave={onSave}
onCancel={onCancel}
- validationResult={validationResult}
- isQueryDirty={isSourceDirty}
/>
<Flex h="100%" w="100%">
<PythonDataPicker
- database={saveSource["source-database"]}
- tables={saveSource["source-tables"]}
+ database={source["source-database"]}
+ tables={source["source-tables"]}
onChange={handleDataChange}
/>
<Stack w="100%" h="100%" gap={0}>
<PythonEditorBody
- isRunnable={isRunnable && isPythonTransformSource(source)}
+ isRunnable={isPythonTransformSource(source)}
isRunning={isRunning}
isDirty={isDirty}
onRun={run}
@@ -156,7 +111,7 @@ export function PythonTransformEditor({
proposedSource={proposedSource?.body}
onChange={handleScriptChange}
withDebugger={showDebugger}
- onAcceptProposed={handleAcceptProposed}
+ onAcceptProposed={onAcceptProposed}
onRejectProposed={onRejectProposed}
/>
{showDebugger && (
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
index 1340277d1ad..0c8a963519e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
@@ -156,9 +156,8 @@ export type ExecutionResult = {
};
type TestPythonScriptState = {
- isRunning: boolean;
- isDirty: boolean;
executionResult: ExecutionResult | null;
+ isRunning: boolean;
run: () => void;
cancel: () => void;
};
@@ -166,14 +165,11 @@ type TestPythonScriptState = {
export function useTestPythonTransform(
source: PythonTransformSourceDraft,
): TestPythonScriptState {
- const [executePython, { isLoading: isRunning, originalArgs }] =
- useExecutePythonMutation();
+ const [executePython, { isLoading: isRunning }] = useExecutePythonMutation();
const abort = useRef<(() => void) | null>(null);
const [executionResult, setData] =
useState<ExecutePythonTransformResponse | null>(null);
- const isDirty = originalArgs?.code !== source.body;
-
const run = async () => {
if (source["source-database"] === undefined) {
return null;
@@ -205,11 +201,10 @@ export function useTestPythonTransform(
};
return {
+ executionResult,
isRunning,
- isDirty,
- cancel,
run,
- executionResult,
+ cancel,
};
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
index 97b2fe720c7..9ab4794a5b2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
@@ -1,13 +1,10 @@
import { t } from "ttag";
import { AdminNavItem } from "metabase/admin/components/AdminNav";
-import { ForwardRefLink } from "metabase/common/components/Link";
import { Route } from "metabase/hoc/Title";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
-import { Icon, Menu } from "metabase/ui";
import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { trackTransformCreate } from "metabase-enterprise/transforms/analytics";
import { FullWidthTransformPageLayout } from "metabase-enterprise/transforms/pages/TransformPageLayout";
import { PythonTransformEditor } from "./components/PythonTransformEditor";
@@ -17,6 +14,7 @@ import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";
import { PythonRunnerSettingsPage } from "./pages/PythonRunnerSettingsPage";
if (hasPremiumFeature("transforms-python")) {
+ PLUGIN_TRANSFORMS_PYTHON.isEnabled = true;
PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage = PythonRunnerSettingsPage;
PLUGIN_TRANSFORMS_PYTHON.TransformEditor = PythonTransformEditor;
PLUGIN_TRANSFORMS_PYTHON.SourceSection = SourceSection;
@@ -34,20 +32,4 @@ if (hasPremiumFeature("transforms-python")) {
icon="code_block"
/>
);
-
- PLUGIN_TRANSFORMS_PYTHON.getCreateTransformsMenuItems = () => (
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newTransformFromType("python")}
- leftSection={<Icon name="code_block" />}
- onClick={() => {
- trackTransformCreate({
- triggeredFrom: "transform-page-create-menu",
- creationType: "python",
- });
- }}
- >
- {t`Python script`}
- </Menu.Item>
- );
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx
index 906c60bea44..3ca950c6b76 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx
@@ -6,13 +6,13 @@ import { getScheduleExplanation } from "metabase/lib/cron";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Divider, Group, Tooltip } from "metabase/ui";
import { useRunTransformJobMutation } from "metabase-enterprise/api";
-import { trackTransformJobTriggerManualRun } from "metabase-enterprise/transforms/analytics";
import type {
ScheduleDisplayType,
ScheduleSettings,
ScheduleType,
} from "metabase-types/api";
+import { trackTransformJobTriggerManualRun } from "../../../analytics";
import { RunButton } from "../../../components/RunButton";
import { RunStatus } from "../../../components/RunStatus";
import { SplitSection } from "../../../components/SplitSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/index.ts
deleted file mode 100644
index f6fe2b0759d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./EditorBody";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/index.ts
deleted file mode 100644
index 406f6c4ed29..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./EditorSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.tsx
deleted file mode 100644
index 58cb374fc3c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { t } from "ttag";
-
-import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
-import { Button, Card, Stack, Text } from "metabase/ui";
-
-import type { QueryValidationResult } from "../types";
-
-import { TRANSFORM_ERROR_SEEN_KEY } from "./constants";
-
-type EditorValidationCardProps = {
- validationResult: QueryValidationResult;
-};
-
-export function EditorValidationCard({
- validationResult: { errorMessage },
-}: EditorValidationCardProps) {
- if (errorMessage == null) {
- return null;
- }
-
- return (
- <UserHasSeen id={TRANSFORM_ERROR_SEEN_KEY}>
- {({ hasSeen, ack }) =>
- !hasSeen && <ErrorCard errorMessage={errorMessage} onClose={ack} />
- }
- </UserHasSeen>
- );
-}
-
-type ErrorCardProps = {
- errorMessage: string;
- onClose: () => void;
-};
-
-function ErrorCard({ errorMessage, onClose }: ErrorCardProps) {
- return (
- <Card pos="fixed" left="2rem" bottom="2rem" maw="21rem" withBorder>
- <Stack align="start">
- <Text>{errorMessage}</Text>
- <Button variant="filled" onClick={onClose}>{t`Okay`}</Button>
- </Stack>
- </Card>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.unit.spec.tsx
deleted file mode 100644
index f78f3eb26ea..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/EditorValidationCard.unit.spec.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { setupUserKeyValueEndpoints } from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-
-import type { QueryValidationResult } from "../types";
-
-import { EditorValidationCard } from "./EditorValidationCard";
-import { TRANSFORM_ERROR_SEEN_KEY } from "./constants";
-
-const VALID_RESULT = {
- isValid: true,
-};
-
-const ERROR_RESULT = {
- isValid: false,
- errorMessage: "Error message",
-};
-
-type SetupOpts = {
- validationResult: QueryValidationResult;
- hasSeen?: boolean;
-};
-
-function setup({ validationResult, hasSeen = false }: SetupOpts) {
- setupUserKeyValueEndpoints({
- namespace: "user_acknowledgement",
- key: TRANSFORM_ERROR_SEEN_KEY,
- value: hasSeen,
- });
-
- renderWithProviders(
- <EditorValidationCard validationResult={validationResult} />,
- );
-}
-
-describe("EditorValidationCard", () => {
- it("should not show the error when the result is valid", () => {
- setup({ validationResult: VALID_RESULT, hasSeen: false });
- expect(screen.queryByText("Okay")).not.toBeInTheDocument();
- });
-
- it("should not show the error when the user has already seen it", () => {
- setup({ validationResult: ERROR_RESULT, hasSeen: true });
- expect(
- screen.queryByText(ERROR_RESULT.errorMessage),
- ).not.toBeInTheDocument();
- });
-
- it("should show the error if it was not seen before", async () => {
- setup({ validationResult: ERROR_RESULT, hasSeen: false });
- expect(
- await screen.findByText(ERROR_RESULT.errorMessage),
- ).toBeInTheDocument();
- });
-
- it("should hide the error when the user clicks the button", async () => {
- setup({ validationResult: ERROR_RESULT, hasSeen: false });
- await userEvent.click(await screen.findByText("Okay"));
- expect(
- screen.queryByText(ERROR_RESULT.errorMessage),
- ).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/constants.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/constants.ts
deleted file mode 100644
index 07f275091a1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const TRANSFORM_ERROR_SEEN_KEY = "transform-native-variable-error";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/index.ts
deleted file mode 100644
index 01a52a2cab1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorValidationCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./EditorValidationCard";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/index.ts
deleted file mode 100644
index fcd40a59a75..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./EditorVisualization";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.module.css
deleted file mode 100644
index a88df72809e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
- overflow: auto;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.tsx
deleted file mode 100644
index beb6f713fb8..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/QueryEditor.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import { useDisclosure, useHotkeys, useToggle } from "@mantine/hooks";
-import { useMemo, useState } from "react";
-import { t } from "ttag";
-
-import { useListDatabasesQuery } from "metabase/api";
-import type { SelectionRange } from "metabase/query_builder/components/NativeQueryEditor/types";
-import type { QueryModalType } from "metabase/query_builder/constants";
-import { NativeQueryPreview } from "metabase/querying/notebook/components/NativeQueryPreview";
-import { Center, Flex, Loader, Modal, Stack } from "metabase/ui";
-import { useRegisterMetabotTransformContext } from "metabase-enterprise/transforms/hooks/use-register-transform-metabot-context";
-import * as Lib from "metabase-lib";
-import type Question from "metabase-lib/v1/Question";
-import type {
- NativeQuerySnippet,
- QueryTransformSource,
- Transform,
-} from "metabase-types/api";
-
-import { useQueryMetadata } from "../../hooks/use-query-metadata";
-import { useQueryResults } from "../../hooks/use-query-results";
-import { useQueryState } from "../../hooks/use-query-state";
-
-import { EditorBody } from "./EditorBody";
-import { EditorHeader } from "./EditorHeader";
-import { EditorSidebar } from "./EditorSidebar";
-import { EditorValidationCard } from "./EditorValidationCard";
-import { EditorVisualization } from "./EditorVisualization";
-import {
- NativeQuerySidebar,
- NativeQuerySidebarToggle,
-} from "./NativeQuerySidebar";
-import S from "./QueryEditor.module.css";
-import {
- getValidationResult,
- useInsertSnippetHandler,
- useSelectedText,
-} from "./utils";
-
-type QueryEditorProps = {
- transform?: Transform | undefined;
- initialSource: QueryTransformSource;
- proposedSource?: QueryTransformSource;
- isNew?: boolean;
- isSaving?: boolean;
- onSave: (source: QueryTransformSource) => void;
- onChange?: (source: QueryTransformSource) => void;
- onCancel: () => void;
- onRejectProposed?: () => void;
- onAcceptProposed?: (query: QueryTransformSource) => void;
-};
-
-export function QueryEditor({
- transform,
- initialSource,
- proposedSource,
- isNew = true,
- isSaving = false,
- onSave,
- onChange,
- onCancel,
- onRejectProposed,
- onAcceptProposed,
-}: QueryEditorProps) {
- const { question, proposedQuestion, isQueryDirty, setQuestion } =
- useQueryState(initialSource.query, proposedSource?.query);
- const { isInitiallyLoaded } = useQueryMetadata(question);
- const {
- result,
- rawSeries,
- isRunnable,
- isRunning,
- isResultDirty,
- runQuery,
- cancelQuery,
- } = useQueryResults(question, proposedQuestion);
- const { isNative } = Lib.queryDisplayInfo(question.query());
- const [isShowingNativeQueryPreview, toggleNativeQueryPreview] = useToggle();
- const [isPreviewQueryModalOpen, togglePreviewQueryModal] = useToggle();
- const validationResult = getValidationResult(question.query());
-
- const source = useMemo(() => {
- const query = proposedSource?.query ?? question.datasetQuery();
- return { type: "query" as const, query };
- }, [proposedSource, question]);
- useRegisterMetabotTransformContext(transform, source);
-
- const handleChange = async (newQuestion: Question) => {
- setQuestion(newQuestion);
- onChange?.({ type: "query", query: newQuestion.datasetQuery() });
- };
-
- const handleSave = () => {
- onSave({
- type: "query",
- query: proposedQuestion?.datasetQuery() ?? question.datasetQuery(),
- });
- };
-
- const handleCmdEnter = () => {
- if (isRunning) {
- cancelQuery();
- } else if (isRunnable) {
- runQuery();
- }
- };
-
- const [
- isDataReferenceOpen,
- { toggle: toggleDataReference, close: closeDataReference },
- ] = useDisclosure();
- const [
- isSnippetSidebarOpen,
- { toggle: toggleSnippetSidebar, close: closeSnippetSidebar },
- ] = useDisclosure();
-
- useHotkeys([["mod+Enter", handleCmdEnter]], []);
-
- const handleToggleDataReference = () => {
- closeSnippetSidebar();
- toggleDataReference();
- };
-
- const handleToggleSnippetSidebar = () => {
- closeDataReference();
- toggleSnippetSidebar();
- };
-
- const handleOpenModal = (type: QueryModalType) => {
- if (type === "preview-query") {
- togglePreviewQueryModal(true);
- }
- };
-
- const [selectionRange, setSelectionRange] = useState<SelectionRange[]>([]);
- const selectedText = useSelectedText(question, selectionRange);
- const handleInsertSnippet = useInsertSnippetHandler({
- question,
- selectionRange,
- onChange: handleChange,
- });
-
- const [modalSnippet, setModalSnippet] = useState<NativeQuerySnippet | null>(
- null,
- );
-
- const { data: databases, isLoading } = useListDatabasesQuery({
- include_analytics: true,
- });
-
- if (!isInitiallyLoaded || isLoading) {
- return (
- <Center>
- <Loader />
- </Center>
- );
- }
-
- return (
- <>
- <Stack
- className={S.root}
- pos="relative"
- w="100%"
- h="100%"
- bg="bg-white"
- data-testid="transform-query-editor"
- gap={0}
- >
- <EditorHeader
- validationResult={validationResult}
- name={transform?.name}
- isNew={isNew}
- isSaving={isSaving}
- hasProposedQuery={!!proposedSource}
- isQueryDirty={isQueryDirty}
- onSave={handleSave}
- onCancel={onCancel}
- />
- <Flex h="100%" w="100%" mih="0">
- <Stack flex="2 1 100%" pos="relative">
- <EditorBody
- question={question}
- proposedQuestion={proposedQuestion}
- isNative={isNative}
- isRunnable={isRunnable}
- isRunning={isRunning}
- isResultDirty={isResultDirty}
- isShowingDataReference={isDataReferenceOpen}
- isShowingSnippetSidebar={isSnippetSidebarOpen}
- onChange={handleChange}
- onRunQuery={runQuery}
- onCancelQuery={cancelQuery}
- onRejectProposed={onRejectProposed}
- onAcceptProposed={
- proposedSource
- ? () => onAcceptProposed?.(proposedSource)
- : undefined
- }
- databases={databases?.data ?? []}
- onToggleDataReference={handleToggleDataReference}
- onToggleSnippetSidebar={handleToggleSnippetSidebar}
- onOpenModal={handleOpenModal}
- modalSnippet={modalSnippet}
- onInsertSnippet={handleInsertSnippet}
- onChangeModalSnippet={setModalSnippet}
- onChangeNativeEditorSelection={setSelectionRange}
- nativeEditorSelectedText={selectedText}
- />
- <EditorVisualization
- question={question}
- result={result}
- rawSeries={rawSeries}
- isNative={isNative}
- isRunnable={isRunnable}
- isRunning={isRunning}
- isResultDirty={isResultDirty}
- onRunQuery={runQuery}
- onCancelQuery={() => undefined}
- />
- {!isNative && (
- <NativeQuerySidebarToggle
- isShowingNativeQueryPreview={isShowingNativeQueryPreview}
- onToggleNativeQueryPreview={toggleNativeQueryPreview}
- />
- )}
- </Stack>
-
- {!isNative && isShowingNativeQueryPreview && (
- <NativeQuerySidebar
- question={question}
- onConvertToNativeClick={(newQuestion) => {
- toggleNativeQueryPreview(false);
- setQuestion(newQuestion);
- }}
- />
- )}
-
- <EditorSidebar
- question={question}
- isNative={isNative}
- isDataReferenceOpen={isDataReferenceOpen}
- isSnippetSidebarOpen={isSnippetSidebarOpen}
- onToggleDataReference={toggleDataReference}
- onToggleSnippetSidebar={toggleSnippetSidebar}
- onChangeModalSnippet={setModalSnippet}
- onInsertSnippet={handleInsertSnippet}
- />
- </Flex>
- <EditorValidationCard validationResult={validationResult} />
- </Stack>
- {isNative && (
- <Modal
- title={t`Query preview`}
- opened={isPreviewQueryModalOpen}
- onClose={togglePreviewQueryModal}
- >
- <NativeQueryPreview query={question.query()} />
- </Modal>
- )}
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/index.ts
deleted file mode 100644
index 249efdaeec3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./QueryEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.ts
deleted file mode 100644
index de159064ab7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { useMemo } from "react";
-import { t } from "ttag";
-
-import type {
- Location,
- SelectionRange,
-} from "metabase/query_builder/components/NativeQueryEditor/types";
-import * as Lib from "metabase-lib";
-import type Question from "metabase-lib/v1/Question";
-import type { NativeQuerySnippet } from "metabase-types/api";
-
-import type { QueryValidationResult } from "./types";
-
-const EMPTY_SELECTION_RANGE: SelectionRange = {
- start: { row: 0, column: 0 },
- end: { row: 0, column: 0 },
-};
-
-function locationToPosition(text: string, location: Location): number {
- const lines = text.split("\n");
- return lines.reduce((acc, line, index) => {
- if (index < location.row) {
- return acc + line.length + 1;
- }
- return acc;
- }, location.column);
-}
-
-function getSelectionPositions(text: string, selectionRange: SelectionRange[]) {
- const range = selectionRange[0] ?? EMPTY_SELECTION_RANGE;
-
- return {
- start: locationToPosition(text, range.start),
- end: locationToPosition(text, range.end),
- };
-}
-
-export function useSelectedText(
- question: Question,
- selectionRange: SelectionRange[],
-) {
- return useMemo(() => {
- const query = question.query();
- const text = Lib.rawNativeQuery(query) ?? "";
- const { start, end } = getSelectionPositions(text, selectionRange);
- return text.slice(start, end);
- }, [question, selectionRange]);
-}
-
-export function useInsertSnippetHandler({
- selectionRange,
- question,
- onChange,
-}: {
- selectionRange: SelectionRange[];
- question: Question;
- onChange: (question: Question) => void;
-}) {
- return function handleInsertSnippet(snippet: NativeQuerySnippet) {
- const query = question.query();
- const text = Lib.rawNativeQuery(query) ?? "";
-
- const { start, end } = getSelectionPositions(text, selectionRange);
-
- const pre = text.slice(0, start);
- const post = text.slice(end);
-
- const newText = `${pre}{{snippet: ${snippet.name}}}${post}`;
- const newQuery = Lib.withNativeQuery(query, newText);
-
- onChange(question.setQuery(newQuery));
- };
-}
-
-export function getValidationResult(query: Lib.Query): QueryValidationResult {
- const { isNative } = Lib.queryDisplayInfo(query);
- if (isNative) {
- const tags = Object.values(Lib.templateTags(query));
- if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
- return {
- isValid: false,
- errorMessage: t`In transforms, you can use snippets and question or model references, but not variables.`,
- };
- }
- }
-
- return { isValid: Lib.canSave(query, "question") };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.unit.spec.ts
deleted file mode 100644
index d7a06a760a9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/utils.unit.spec.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { createMockMetadata } from "__support__/metadata";
-import * as Lib from "metabase-lib";
-import {
- createMockCard,
- createMockNativeQuerySnippet,
-} from "metabase-types/api/mocks";
-import {
- SAMPLE_DB_ID,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { getValidationResult } from "./utils";
-
-const METADATA = createMockMetadata({
- databases: [createSampleDatabase()],
- questions: [createMockCard({ id: 1 })],
- snippets: [createMockNativeQuerySnippet({ id: 1, name: "MySnippet" })],
-});
-
-describe("getValidationResult", () => {
- const metadataProvider = Lib.metadataProvider(SAMPLE_DB_ID, METADATA);
-
- it("should not return errors for a query without tags", () => {
- const query = Lib.nativeQuery(SAMPLE_DB_ID, metadataProvider, "SELECT 1");
- expect(getValidationResult(query)).toEqual({
- isValid: true,
- });
- });
-
- it("should not return errors for a query with card or snippet tags", () => {
- const query = Lib.nativeQuery(
- SAMPLE_DB_ID,
- metadataProvider,
- "SELECT * FROM {{#1-card}} {{snippet:MySnippet}}",
- );
- expect(getValidationResult(query)).toEqual({
- isValid: true,
- });
- });
-
- it("should mark the query as invalid but not return the error message for an empty query", () => {
- const query = Lib.nativeQuery(SAMPLE_DB_ID, metadataProvider, "");
- expect(getValidationResult(query)).toEqual({
- isValid: false,
- errorMessage: undefined,
- });
- });
-
- it("should return errors if there are variables", () => {
- const query = Lib.nativeQuery(
- SAMPLE_DB_ID,
- metadataProvider,
- "{{var1}} {{var2}}",
- );
- expect(getValidationResult(query)).toEqual({
- isValid: false,
- errorMessage: expect.stringContaining("variables"),
- });
- });
-
- it("should return errors if variables are mixed with tags that are allowed", () => {
- const query = Lib.nativeQuery(
- SAMPLE_DB_ID,
- metadataProvider,
- "{{snippet:MySnippet}} {{var}}",
- );
- expect(getValidationResult(query)).toEqual({
- isValid: false,
- errorMessage: expect.stringContaining("variables"),
- });
- });
-
- it("should still return the variable error if there are variables, even if there are syntax errors", () => {
- const query = Lib.nativeQuery(
- SAMPLE_DB_ID,
- metadataProvider,
- "{{snippet: }} {{var}}",
- );
- expect(getValidationResult(query)).toEqual({
- isValid: false,
- errorMessage: expect.stringContaining("variables"),
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx
index ea00ff6d191..5264bd963ce 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx
@@ -3,6 +3,7 @@ import { useMemo } from "react";
import { useSetting } from "metabase/common/hooks";
import { useSelector } from "metabase/lib/redux";
import { CodeMirrorEditor as Editor } from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor";
+import { useQueryMetadata } from "metabase/querying/editor/hooks/use-query-metadata";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { getMetadata } from "metabase/selectors/metadata";
import { Center, Loader } from "metabase/ui";
@@ -10,8 +11,6 @@ import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { DatasetQuery } from "metabase-types/api";
-import { useQueryMetadata } from "../../hooks/use-query-metadata";
-
type QueryViewProps = {
query: DatasetQuery;
};
@@ -23,10 +22,10 @@ export function QueryView({ query }: QueryViewProps) {
[query, metadata],
);
const { isNative } = Lib.queryDisplayInfo(question.query());
- const { isInitiallyLoaded } = useQueryMetadata(question);
+ const { isLoading } = useQueryMetadata(question);
const reportTimezone = useSetting("report-timezone-long");
- if (!isInitiallyLoaded) {
+ if (isLoading) {
return (
<Center>
<Loader />
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx
index d20531767ce..a7f39fe9e57 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatus/RunStatus.tsx
@@ -2,11 +2,12 @@ import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
import { Box, Group, Icon } from "metabase/ui";
-import { parseTimestampWithTimezone } from "metabase-enterprise/transforms/utils";
import type { TransformRun } from "metabase-types/api";
import { RunInfo } from "../RunInfo";
+import { parseTimestampWithTimezone } from "./../../utils";
+
type RunStatusSectionProps = {
run: TransformRun | null;
neverRunMessage: string;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorHeader/EditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx
similarity index 76%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorHeader/EditorHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx
index b224302f2c7..bb6d057b45d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorHeader/EditorHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx
@@ -4,37 +4,32 @@ import Button from "metabase/common/components/Button";
import EditBar from "metabase/common/components/EditBar";
import { Tooltip } from "metabase/ui";
-import type { QueryValidationResult } from "../types";
+import type { ValidationResult } from "./types";
type EditorHeaderProps = {
- validationResult: QueryValidationResult;
name?: string;
+ validationResult: ValidationResult;
isNew: boolean;
- isQueryDirty: boolean;
+ isDirty: boolean;
isSaving: boolean;
- hasProposedQuery: boolean;
onSave: () => void;
onCancel: () => void;
};
export function EditorHeader({
- validationResult,
name,
+ validationResult,
isNew,
- isQueryDirty,
+ isDirty,
isSaving,
- hasProposedQuery,
onSave,
onCancel,
}: EditorHeaderProps) {
- const canSave =
- (isNew || isQueryDirty || hasProposedQuery) &&
- validationResult.isValid &&
- !isSaving;
+ const canSave = (isNew || isDirty) && !isSaving && validationResult.isValid;
return (
<EditBar
- title={getTitle(isNew, name)}
+ title={getTitle(name, isNew)}
admin
buttons={[
<Button key="cancel" small onClick={onCancel}>{t`Cancel`}</Button>,
@@ -52,7 +47,7 @@ export function EditorHeader({
);
}
-function getTitle(isNew: boolean, name?: string) {
+function getTitle(name: string | undefined, isNew: boolean) {
if (isNew) {
return t`You’re creating a new transform`;
} else {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorHeader/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts
similarity index 55%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/types.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts
index 876d0337cf9..14c0f604290 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts
@@ -1,4 +1,4 @@
-export type QueryValidationResult = {
+export type ValidationResult = {
isValid: boolean;
errorMessage?: string;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
new file mode 100644
index 00000000000..832539be73b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
@@ -0,0 +1,92 @@
+import { useMemo } from "react";
+
+import { useSelector } from "metabase/lib/redux";
+import {
+ QueryEditor,
+ type QueryEditorUiState,
+} from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Stack } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Database, QueryTransformSource } from "metabase-types/api";
+
+import { EditorHeader } from "./EditorHeader";
+import { getEditorOptions, getQuery, getValidationResult } from "./utils";
+
+type TransformEditorProps = {
+ name?: string;
+ source: QueryTransformSource;
+ uiState: QueryEditorUiState;
+ proposedSource: QueryTransformSource | undefined;
+ databases: Database[];
+ isNew: boolean;
+ isDirty: boolean;
+ isSaving: boolean;
+ onChangeSource: (source: QueryTransformSource) => void;
+ onChangeUiState: (state: QueryEditorUiState) => void;
+ onSave: () => void;
+ onCancel: () => void;
+ onAcceptProposed: () => void;
+ onRejectProposed: () => void;
+};
+
+export function TransformEditor({
+ name,
+ source,
+ proposedSource,
+ databases,
+ uiState,
+ isNew,
+ isDirty,
+ isSaving,
+ onSave,
+ onChangeSource,
+ onChangeUiState,
+ onCancel,
+ onAcceptProposed,
+ onRejectProposed,
+}: TransformEditorProps) {
+ const metadata = useSelector(getMetadata);
+ const query = useMemo(() => getQuery(source, metadata), [source, metadata]);
+ const proposedQuery = useMemo(
+ () => (proposedSource ? getQuery(proposedSource, metadata) : undefined),
+ [proposedSource, metadata],
+ );
+ const uiOptions = useMemo(() => getEditorOptions(databases), [databases]);
+ const validationResult = useMemo(() => getValidationResult(query), [query]);
+
+ const handleQueryChange = (query: Lib.Query) => {
+ onChangeSource({ type: "query", query: Lib.toJsQuery(query) });
+ };
+
+ return (
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="transform-query-editor"
+ gap={0}
+ >
+ <EditorHeader
+ name={name}
+ validationResult={validationResult}
+ isNew={isNew}
+ isDirty={isDirty}
+ isSaving={isSaving}
+ onSave={onSave}
+ onCancel={onCancel}
+ />
+ <QueryEditor
+ query={query}
+ uiState={uiState}
+ uiOptions={uiOptions}
+ proposedQuery={proposedQuery}
+ onChangeQuery={handleQueryChange}
+ onChangeUiState={onChangeUiState}
+ onAcceptProposed={onAcceptProposed}
+ onRejectProposed={onRejectProposed}
+ />
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/index.ts
new file mode 100644
index 00000000000..7071b94b760
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/index.ts
@@ -0,0 +1 @@
+export * from "./TransformEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
new file mode 100644
index 00000000000..b727d1b8d12
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
@@ -0,0 +1,63 @@
+import { t } from "ttag";
+
+import type { QueryEditorUiOptions } from "metabase/querying/editor/types";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { Database, QueryTransformSource } from "metabase-types/api";
+
+import { doesDatabaseSupportTransforms } from "../../utils";
+
+import type { ValidationResult } from "./EditorHeader/types";
+
+export function getQuery(source: QueryTransformSource, metadata: Metadata) {
+ return Question.create({ dataset_query: source.query, metadata }).query();
+}
+
+export function getValidationResult(query: Lib.Query): ValidationResult {
+ const { isNative } = Lib.queryDisplayInfo(query);
+ if (isNative) {
+ const tags = Object.values(Lib.templateTags(query));
+ if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
+ return {
+ isValid: false,
+ errorMessage: t`In transforms, you can use snippets and question or model references, but not variables.`,
+ };
+ }
+ }
+
+ return { isValid: Lib.canSave(query, "question") };
+}
+
+export function getEditorOptions(databases: Database[]): QueryEditorUiOptions {
+ return {
+ convertToNativeTitle: t`SQL for this transform`,
+ convertToNativeButtonLabel: t`Convert this transform to SQL`,
+ shouldDisableDatabasePickerItem: (item) => {
+ const database = databases.find((database) => database.id === item.id);
+ return !doesDatabaseSupportTransforms(database);
+ },
+ shouldDisableDataPickerItem: (item) => {
+ if (item.model === "database") {
+ const database = databases.find((db) => db.id === item.id);
+ return !doesDatabaseSupportTransforms(database);
+ }
+
+ if (
+ item.model === "card" ||
+ item.model === "dataset" ||
+ item.model === "metric" ||
+ item.model === "table"
+ ) {
+ const database = databases.find((db) => db.id === item.database_id);
+ return !doesDatabaseSupportTransforms(database);
+ }
+
+ if (item.model === "dashboard") {
+ return true;
+ }
+
+ return false;
+ },
+ };
+}
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.ts
deleted file mode 100644
index 71d7e8f4ad4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/use-query-results.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-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";
-import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type { DatasetQuery } from "metabase-types/api";
-
-export function useQueryResults(
- question: Question,
- proposedQuestion?: 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 currentQuestion = proposedQuestion ?? question;
-
- const [{ value: results = null, loading: isRunning }, runQuery] = useAsyncFn(
- () =>
- runQuestionQuery(currentQuestion, {
- cancelDeferred: deferred(),
- }),
- [currentQuestion],
- );
-
- const { result, rawSeries, isRunnable, isResultDirty } = useMemo(() => {
- const lastRunQuestion = lastRunQuery
- ? Question.create({
- dataset_query: lastRunQuery,
- metadata,
- visualization_settings: currentQuestion.settings(),
- })
- : null;
- const result = results ? results[0] : null;
- const rawSeries =
- lastRunQuestion && result
- ? [{ card: lastRunQuestion.card(), data: result.data }]
- : null;
- const isRunnable = Lib.canRun(
- currentQuestion.query(),
- currentQuestion.type(),
- );
- const isResultDirty =
- lastRunQuestion == null ||
- currentQuestion.isDirtyComparedTo(lastRunQuestion);
-
- return {
- result,
- rawSeries,
- isRunnable,
- isResultDirty,
- };
- }, [currentQuestion, results, metadata, lastRunQuery]);
-
- const handleRunQuery = useCallback(async () => {
- await runQuery();
- setLastRunQuery(currentQuestion.datasetQuery());
- }, [currentQuestion, runQuery]);
-
- const handleCancelQuery = useCallback(() => {
- return deferredRef.current?.resolve();
- }, []);
-
- return {
- result,
- rawSeries,
- isRunnable,
- isRunning,
- isResultDirty,
- runQuery: handleRunQuery,
- cancelQuery: handleCancelQuery,
- };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/index.ts
deleted file mode 100644
index 616eede97c4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./use-query-state";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/use-query-state.ts b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/use-query-state.ts
deleted file mode 100644
index 48c0a890fe6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-state/use-query-state.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useMemo, useState } from "react";
-
-import { useSelector } from "metabase/lib/redux";
-import { getMetadata } from "metabase/selectors/metadata";
-import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type { DatasetQuery, VisualizationSettings } from "metabase-types/api";
-
-const DEFAULT_VIZ_SETTINGS: VisualizationSettings = {
- "table.pivot": false,
-};
-
-export function useQueryState(
- initialQuery: DatasetQuery,
- proposedQuery?: DatasetQuery,
-) {
- const [query, setQuery] = useState(initialQuery);
- const metadata = useSelector(getMetadata);
-
- const question = useMemo(
- () =>
- Question.create({
- dataset_query: query,
- metadata,
- visualization_settings: DEFAULT_VIZ_SETTINGS,
- }),
- [query, metadata],
- );
-
- const proposedQuestion = useMemo(() => {
- if (!proposedQuery) {
- return undefined;
- }
-
- const question = Question.create({
- dataset_query: proposedQuery,
- metadata,
- });
- const { isNative } = Lib.queryDisplayInfo(question.query());
-
- if (isNative) {
- const nativeQuery = question.legacyNativeQuery();
- if (nativeQuery) {
- const queryText = nativeQuery.queryText();
- // For native queries, ensure template tags are processed
- const updatedQuery = nativeQuery.setQueryText(queryText);
- return updatedQuery.question();
- }
- }
-
- return question;
- }, [proposedQuery, metadata]);
-
- const isQueryDirty = useMemo(
- () => !Lib.areLegacyQueriesEqual(query, initialQuery),
- [query, initialQuery],
- );
-
- const setQuestion = (newQuestion: Question) => {
- setQuery(newQuestion.datasetQuery());
- };
-
- return { question, proposedQuestion, isQueryDirty, setQuestion };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts
index 24d35b504c2..960c45fc4e2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-source-state.ts
@@ -1,75 +1,93 @@
-import { useCallback, useMemo, useState } from "react";
-import _ from "underscore";
+import { useMemo, useState } from "react";
import { useDispatch, useSelector } from "metabase/lib/redux";
import {
- type MetabotSuggestedTransform,
deactivateSuggestedTransform,
getMetabotSuggestedTransform,
} from "metabase-enterprise/metabot/state";
-import type { Transform, TransformSource } from "metabase-types/api";
+import type {
+ DraftTransformSource,
+ SuggestedTransform,
+ TransformId,
+} from "metabase-types/api";
-interface UseSourceStateResult<SourceType> {
- source: SourceType | TransformSource;
- setSource: (source: SourceType) => void;
- suggestedTransform: MetabotSuggestedTransform | undefined;
- proposedSource: TransformSource | undefined;
- clearProposed: () => void;
- acceptProposed: (source: TransformSource) => void;
+import { isSameSource } from "../utils";
+
+type UseSourceStateProps = {
+ transformId?: TransformId;
+ initialSource: DraftTransformSource;
+};
+
+type UseSourceStateResult = {
+ source: DraftTransformSource;
+ proposedSource: DraftTransformSource | undefined;
+ suggestedTransform: SuggestedTransform | undefined;
isDirty: boolean;
-}
+ setSource: (source: DraftTransformSource) => void;
+ setSourceAndRejectProposed: (source: DraftTransformSource) => void;
+ acceptProposed: () => void;
+ rejectProposed: () => void;
+};
-export const useSourceState = <SourceType>(
- transformId: Transform["id"] | undefined,
- initialSource: SourceType,
-): UseSourceStateResult<SourceType> => {
+export function useSourceState({
+ transformId,
+ initialSource,
+}: UseSourceStateProps): UseSourceStateResult {
const dispatch = useDispatch();
- const [source, setSource] = useState<SourceType | TransformSource>(
- initialSource,
+ const suggestedTransform = useSelector((state) =>
+ getMetabotSuggestedTransform(state, transformId),
);
- const suggestedTransform = useSelector(
- (state) => getMetabotSuggestedTransform(state, transformId) as any,
- ) as ReturnType<typeof getMetabotSuggestedTransform>;
-
- const isPropsedSame = useMemo(
- () => _.isEqual(suggestedTransform?.source, source),
- [suggestedTransform?.source, source],
+ const [source, setSource] = useState(
+ transformId != null
+ ? initialSource
+ : (suggestedTransform?.source ?? initialSource),
);
- const proposedSource = isPropsedSame ? undefined : suggestedTransform?.source;
+
+ const proposedSource = useMemo(() => {
+ return suggestedTransform != null &&
+ !isSameSource(suggestedTransform.source, source)
+ ? suggestedTransform.source
+ : undefined;
+ }, [source, suggestedTransform]);
const isDirty = useMemo(() => {
- return !_.isEqual(initialSource, source) || !!proposedSource;
- }, [initialSource, source, proposedSource]);
+ return (
+ transformId == null ||
+ proposedSource != null ||
+ !isSameSource(source, initialSource)
+ );
+ }, [source, initialSource, proposedSource, transformId]);
- const handleSetSource = useCallback(
- (source: SourceType) => {
- dispatch(deactivateSuggestedTransform(suggestedTransform?.id));
- setSource(source);
- },
- [dispatch, suggestedTransform],
- );
+ const setSourceAndRejectProposed = (source: DraftTransformSource) => {
+ if (suggestedTransform != null) {
+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ }
+ setSource(source);
+ };
- const clearProposed = useCallback(() => {
- dispatch(deactivateSuggestedTransform(suggestedTransform?.id));
- }, [dispatch, suggestedTransform]);
+ const acceptProposed = () => {
+ if (suggestedTransform != null) {
+ setSource(suggestedTransform.source);
+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ }
+ };
- const acceptProposed = useCallback(
- async (source: TransformSource) => {
- setSource(source);
- dispatch(deactivateSuggestedTransform(suggestedTransform?.id));
- },
- [dispatch, suggestedTransform],
- );
+ const rejectProposed = () => {
+ if (suggestedTransform != null) {
+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));
+ }
+ };
return {
source,
- setSource: handleSetSource,
- isDirty,
- suggestedTransform,
proposedSource,
- clearProposed,
+ suggestedTransform,
+ isDirty,
+ setSource,
+ setSourceAndRejectProposed,
acceptProposed,
+ rejectProposed,
};
-};
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
index a4376ed6013..a0a723ab4de 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
@@ -15,7 +15,12 @@ import { TransformPicker } from "./components/TransformPicker";
import { JobListPage } from "./pages/JobListPage";
import { JobPage } from "./pages/JobPage";
import { NewJobPage } from "./pages/NewJobPage";
-import { NewTransformPage } from "./pages/NewTransformPage";
+import {
+ NewCardTransformPage,
+ NewNativeTransformPage,
+ NewPythonTransformPage,
+ NewQueryTransformPage,
+} from "./pages/NewTransformPage";
import { RunListPage } from "./pages/RunListPage";
import { TransformListPage } from "./pages/TransformListPage";
import { TransformPage } from "./pages/TransformPage";
@@ -44,8 +49,12 @@ if (hasPremiumFeature("transforms")) {
<Route path=":transformId" component={TransformPage} />
</Route>
{PLUGIN_TRANSFORMS_PYTHON.getAdminRoutes()}
- <Route path="new/:type" component={NewTransformPage} />
- <Route path="new/card/:cardId" component={NewTransformPage} />
+ <Route path="new/query" component={NewQueryTransformPage} />
+ <Route path="new/native" component={NewNativeTransformPage} />
+ <Route path="new/card/:cardId" component={NewCardTransformPage} />
+ {PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
+ <Route path="new/python" component={NewPythonTransformPage} />
+ )}
<Route path=":transformId/query" component={TransformQueryPage} />
</Route>
</Route>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
index 85c0f4ab094..1557a0c05fe 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
@@ -13,12 +13,12 @@ import {
useListTransformJobsQuery,
useListTransformTagsQuery,
} from "metabase-enterprise/api";
-import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";
import type { TransformJob, TransformJobId } from "metabase-types/api";
import { ListEmptyState } from "../../../components/ListEmptyState";
import { RunStatusInfo } from "../../../components/RunStatusInfo";
import { TagList } from "../../../components/TagList";
+import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
import { parseTimestampWithTimezone } from "../../../utils";
import { hasFilterParams } from "../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
index 1f473d5cccf..ac5e3728c01 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
@@ -20,14 +20,17 @@ import {
import * as Errors from "metabase/lib/errors";
import { Box, Button, FocusTrap, Group, Modal, Stack } from "metabase/ui";
import { useCreateTransformMutation } from "metabase-enterprise/api";
-import { trackTransformCreated } from "metabase-enterprise/transforms/analytics";
-import { SchemaFormSelect } from "metabase-enterprise/transforms/components/SchemaFormSelect";
import type {
CreateTransformRequest,
+ SuggestedTransform,
Transform,
TransformSource,
} from "metabase-types/api";
+import { trackTransformCreated } from "../../../analytics";
+
+import { SchemaFormSelect } from "./../../../components/SchemaFormSelect";
+
const NEW_TRANSFORM_SCHEMA = Yup.object({
name: Yup.string().required(Errors.required),
description: Yup.string().nullable(),
@@ -35,18 +38,18 @@ const NEW_TRANSFORM_SCHEMA = Yup.object({
targetSchema: Yup.string().nullable(),
});
-export type NewTransformValues = Yup.InferType<typeof NEW_TRANSFORM_SCHEMA>;
+type NewTransformValues = Yup.InferType<typeof NEW_TRANSFORM_SCHEMA>;
type CreateTransformModalProps = {
source: TransformSource;
- initValues?: Partial<NewTransformValues>;
+ suggestedTransform: SuggestedTransform | undefined;
onCreate: (transform: Transform) => void;
onClose: () => void;
};
export function CreateTransformModal({
source,
- initValues,
+ suggestedTransform,
onCreate,
onClose,
}: CreateTransformModalProps) {
@@ -55,7 +58,7 @@ export function CreateTransformModal({
<FocusTrap.InitialFocus />
<CreateTransformForm
source={source}
- initValues={initValues}
+ suggestedTransform={suggestedTransform}
onCreate={onCreate}
onClose={onClose}
/>
@@ -65,14 +68,14 @@ export function CreateTransformModal({
type CreateTransformFormProps = {
source: TransformSource;
- initValues?: Partial<NewTransformValues>;
+ suggestedTransform: SuggestedTransform | undefined;
onCreate: (transform: Transform) => void;
onClose: () => void;
};
function CreateTransformForm({
source,
- initValues,
+ suggestedTransform,
onCreate,
onClose,
}: CreateTransformFormProps) {
@@ -100,8 +103,8 @@ function CreateTransformForm({
const supportsSchemas = database && hasFeature(database, "schemas");
const initialValues: NewTransformValues = useMemo(
- () => getInitialValues(schemas, initValues),
- [schemas, initValues],
+ () => getInitialValues(schemas, suggestedTransform),
+ [schemas, suggestedTransform],
);
if (isLoading || error != null) {
@@ -167,14 +170,15 @@ function CreateTransformForm({
function getInitialValues(
schemas: string[],
- initValues?: Partial<NewTransformValues>,
+ suggestedTransform: SuggestedTransform | undefined,
): NewTransformValues {
return {
name: "",
- description: null,
- targetName: "",
- targetSchema: schemas?.[0] || null,
- ...initValues,
+ description: suggestedTransform ? suggestedTransform.description : null,
+ targetName: suggestedTransform ? suggestedTransform.target.name : "",
+ targetSchema: suggestedTransform
+ ? suggestedTransform.target.schema
+ : schemas?.[0] || null,
};
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 9f57259205c..3c18ec2847f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -1,237 +1,217 @@
import { useDisclosure } from "@mantine/hooks";
-import type { Location } from "history";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import type { Route } from "react-router";
import { push } from "react-router-redux";
-import { skipToken, useGetCardQuery } from "metabase/api";
+import {
+ skipToken,
+ useGetCardQuery,
+ useListDatabasesQuery,
+} from "metabase/api";
import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
-import { getMetabotSuggestedTransform } from "metabase-enterprise/metabot/state";
-import { useSourceState } from "metabase-enterprise/transforms/hooks/use-source-state";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { Center } from "metabase/ui";
import type {
- CardId,
- DraftTransform,
+ Database,
DraftTransformSource,
- LegacyDatasetQuery,
Transform,
- TransformSource,
} from "metabase-types/api";
-import { QueryEditor } from "../../components/QueryEditor";
+import { TransformEditor } from "../../components/TransformEditor";
+import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";
+import { useSourceState } from "../../hooks/use-source-state";
+import { isNotDraftSource } from "../../utils";
+import { CreateTransformModal } from "./CreateTransformModal";
import {
- CreateTransformModal,
- type NewTransformValues,
-} from "./CreateTransformModal";
-import {
- type InitialTransformSource,
- getInitialTransformSource,
+ getInitialCardSource,
+ getInitialNativeSource,
+ getInitialPythonSource,
+ getInitialQuerySource,
} from "./utils";
-type NewTransformPageParams = {
- type?: string;
- cardId?: string;
-};
-
-type NewTransformPageParsedParams = {
- type: LegacyDatasetQuery["type"] | "python";
- cardId?: CardId;
-};
-
type NewTransformPageProps = {
- location: Location;
- params: NewTransformPageParams;
+ initialSource: DraftTransformSource;
route: Route;
};
-export function NewTransformPage({
- location,
- route,
- params,
-}: NewTransformPageProps) {
- const { type, cardId } = getParsedParams(params);
-
+function NewTransformPage({ initialSource, route }: NewTransformPageProps) {
const {
- data: card,
+ data: databases,
isLoading,
error,
- } = useGetCardQuery(cardId ? { id: cardId } : skipToken);
-
- const suggestedTransform = useSelector(
- getMetabotSuggestedTransform as any,
- ) as ReturnType<typeof getMetabotSuggestedTransform>;
+ } = useListDatabasesQuery({ include_analytics: true });
- if (isLoading || error) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ if (isLoading || error != null || databases == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
}
return (
- <AdminSettingsLayout fullWidth>
- <NewTransformPageInner
- route={route}
- location={location}
- initialSource={getInitialTransformSource(
- card,
- type,
- suggestedTransform,
- )}
- />
- </AdminSettingsLayout>
+ <NewTransformPageBody
+ initialSource={initialSource}
+ databases={databases.data}
+ route={route}
+ />
);
}
-export function NewTransformPageInner({
+type NewTransformPageBodyProps = {
+ initialSource: DraftTransformSource;
+ databases: Database[];
+ route: Route;
+};
+
+function NewTransformPageBody({
initialSource,
- location,
+ databases,
route,
-}: {
- initialSource: InitialTransformSource;
- location: Location;
- route: Route;
-}) {
+}: NewTransformPageBodyProps) {
const {
source,
- setSource,
- suggestedTransform,
proposedSource,
- acceptProposed,
- clearProposed,
+ suggestedTransform,
isDirty,
- } = useSourceState<TransformSource | DraftTransformSource>(
- undefined,
- initialSource,
- );
-
+ setSourceAndRejectProposed,
+ acceptProposed,
+ rejectProposed,
+ } = useSourceState({ initialSource });
+ const [uiState, setUiState] = useState(getInitialUiState);
const [isModalOpened, { open: openModal, close: closeModal }] =
useDisclosure();
const dispatch = useDispatch();
+ useRegisterMetabotTransformContext(undefined, source);
const handleCreate = (transform: Transform) => {
dispatch(push(Urls.transform(transform.id)));
};
- const handleSave = (newSource: TransformSource) => {
- setSource(newSource);
- openModal();
- };
-
const handleCancel = () => {
- setSource(initialSource);
dispatch(push(Urls.transformList()));
- clearProposed();
- };
-
- const [createTransformInitValues, setCreateTransformInitValues] = useState<
- Partial<NewTransformValues> | undefined
- >(undefined);
-
- const handleAcceptProposed = (source: TransformSource) => {
- if (suggestedTransform) {
- setCreateTransformInitValues({
- name: suggestedTransform.name,
- description: suggestedTransform.description,
- targetName: suggestedTransform.target.name,
- });
- }
- acceptProposed(source);
};
return (
<>
- <NewTransformEditorBody
- initialSource={initialSource}
- proposedSource={proposedSource}
- onChange={setSource}
- onSave={handleSave}
- onCancel={handleCancel}
- onRejectProposed={clearProposed}
- onAcceptProposed={handleAcceptProposed}
- />
- {isModalOpened && source && (
+ <AdminSettingsLayout fullWidth>
+ {source.type === "python" ? (
+ <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
+ source={source}
+ proposedSource={
+ proposedSource?.type === "python" ? proposedSource : undefined
+ }
+ isNew={true}
+ isDirty={isDirty}
+ isSaving={false}
+ onChangeSource={setSourceAndRejectProposed}
+ onSave={openModal}
+ onCancel={handleCancel}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ ) : (
+ <TransformEditor
+ source={source}
+ proposedSource={
+ proposedSource?.type === "query" ? proposedSource : undefined
+ }
+ uiState={uiState}
+ databases={databases}
+ isNew={true}
+ isSaving={false}
+ isDirty={isDirty}
+ onChangeSource={setSourceAndRejectProposed}
+ onChangeUiState={setUiState}
+ onSave={openModal}
+ onCancel={handleCancel}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ )}
+ </AdminSettingsLayout>
+ {isModalOpened && isNotDraftSource(source) && (
<CreateTransformModal
- source={source as TransformSource}
- initValues={createTransformInitValues}
+ source={source}
+ suggestedTransform={suggestedTransform}
onCreate={handleCreate}
onClose={closeModal}
/>
)}
<LeaveRouteConfirmModal
- key={location.key}
- isEnabled={isDirty && !isModalOpened}
route={route}
- onConfirm={clearProposed}
+ isEnabled={isDirty && !isModalOpened}
+ onConfirm={rejectProposed}
/>
</>
);
}
-interface NewTransformEditorBody {
- initialSource: InitialTransformSource;
- proposedSource?: TransformSource;
- onChange: (source: DraftTransform["source"]) => void;
- onSave: (source: TransformSource) => void;
- onCancel: () => void;
- onRejectProposed?: () => void;
- onAcceptProposed?: (query: TransformSource) => void;
+type NewQueryTransformPageProps = {
+ route: Route;
+};
+
+export function NewQueryTransformPage({ route }: NewQueryTransformPageProps) {
+ const initialSource = useMemo(() => getInitialQuerySource(), []);
+ return <NewTransformPage initialSource={initialSource} route={route} />;
}
-function NewTransformEditorBody({
- initialSource,
- proposedSource,
- onChange,
- onSave,
- onCancel,
- onRejectProposed,
- onAcceptProposed,
-}: NewTransformEditorBody) {
- if (initialSource.type === "python") {
- return (
- <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
- initialSource={initialSource}
- proposedSource={
- proposedSource?.type === "python" ? proposedSource : undefined
- }
- isNew
- onSave={onSave}
- onCancel={onCancel}
- onChange={onChange}
- onRejectProposed={onRejectProposed}
- onAcceptProposed={onAcceptProposed}
- />
- );
- }
+type NewNativeTransformPageProps = {
+ route: Route;
+};
- return (
- <QueryEditor
- initialSource={initialSource}
- proposedSource={
- proposedSource?.type === "query" ? proposedSource : undefined
- }
- isNew
- onSave={onSave}
- onCancel={onCancel}
- onChange={onChange}
- onRejectProposed={onRejectProposed}
- onAcceptProposed={onAcceptProposed}
- />
- );
+export function NewNativeTransformPage({ route }: NewNativeTransformPageProps) {
+ const initialSource = useMemo(() => getInitialNativeSource(), []);
+ return <NewTransformPage initialSource={initialSource} route={route} />;
+}
+
+type NewPythonTransformPageProps = {
+ route: Route;
+};
+
+export function NewPythonTransformPage({ route }: NewPythonTransformPageProps) {
+ const initialSource = useMemo(() => getInitialPythonSource(), []);
+ return <NewTransformPage initialSource={initialSource} route={route} />;
}
-function getParsedParams({
- type,
- cardId,
-}: NewTransformPageParams): NewTransformPageParsedParams {
- if (type === "python") {
- return { type: "python" };
+type NewCardTransformPageParams = {
+ cardId: string;
+};
+
+type NewCardTransformPageProps = {
+ params: NewCardTransformPageParams;
+ route: Route;
+};
+
+export function NewCardTransformPage({
+ params,
+ route,
+}: NewCardTransformPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const {
+ data: card,
+ isLoading,
+ error,
+ } = useGetCardQuery(cardId != null ? { id: cardId } : skipToken);
+
+ const initialSource = useMemo(
+ () => (card != null ? getInitialCardSource(card) : undefined),
+ [card],
+ );
+
+ if (isLoading || error || initialSource == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
}
- return {
- type: type === "native" ? "native" : "query",
- cardId: cardId != null ? Urls.extractEntityId(cardId) : undefined,
- };
+ return <NewTransformPage initialSource={initialSource} route={route} />;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
index 81a928ef234..eb77029e7da 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
@@ -1,57 +1,29 @@
-import { match } from "ts-pattern";
-
import Question from "metabase-lib/v1/Question";
import type {
Card,
- LegacyDatasetQuery,
PythonTransformSourceDraft,
QueryTransformSource,
- SuggestedTransform,
} from "metabase-types/api";
-export type InitialTransformSource =
- | QueryTransformSource
- | PythonTransformSourceDraft;
-
-export function getInitialTransformSource(
- card: Card | undefined,
- type: LegacyDatasetQuery["type"] | "python",
- suggestedTransform: SuggestedTransform | undefined,
-): InitialTransformSource {
- const canUseSuggestedTransform = match({
- type,
- suggestionSourceType: suggestedTransform?.source.type,
- })
- .with({ type: "native", suggestionSourceType: "query" }, () => true)
- .with({ type: "python", suggestionSourceType: "python" }, () => true)
- .otherwise(() => false);
-
- if (!card?.id && suggestedTransform && canUseSuggestedTransform) {
- return suggestedTransform.source;
- }
-
- if (type === "python") {
- return getInitialPythonTransformSource();
- }
-
- return getInitialQueryTransformSource(card, type);
+export function getInitialQuerySource(): QueryTransformSource {
+ const question = Question.create({ DEPRECATED_RAW_MBQL_type: "query" });
+ return {
+ type: "query",
+ query: question.datasetQuery(),
+ };
}
-export function getInitialQueryTransformSource(
- card: Card | undefined,
- type: LegacyDatasetQuery["type"] | undefined,
-): QueryTransformSource {
- const query =
- card != null
- ? card.dataset_query
- : Question.create({ DEPRECATED_RAW_MBQL_type: type }).datasetQuery();
-
- return { type: "query" as const, query };
+export function getInitialNativeSource(): QueryTransformSource {
+ const question = Question.create({ DEPRECATED_RAW_MBQL_type: "native" });
+ return {
+ type: "query",
+ query: question.datasetQuery(),
+ };
}
-export function getInitialPythonTransformSource(): PythonTransformSourceDraft {
+export function getInitialPythonSource(): PythonTransformSourceDraft {
return {
- type: "python" as const,
+ type: "python",
"source-database": undefined,
"source-tables": {},
body: `# Write your Python transformation script here
@@ -70,3 +42,7 @@ def transform():
return pd.DataFrame([{"message": "Hello from Python transform!"}])`,
};
}
+
+export function getInitialCardSource(card: Card): QueryTransformSource {
+ return { type: "query", query: card.dataset_query };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
index 3e26e826c20..9654cecf769 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
@@ -11,11 +11,11 @@ import {
Popover,
Stack,
} from "metabase/ui";
-import { formatRunMethod } from "metabase-enterprise/transforms/utils";
import type { TransformRunMethod } from "metabase-types/api";
import { FilterFieldSet } from "../../../../components/FilterFieldSet";
import { FILTER_WIDGET_MIN_WIDTH } from "../../../../constants";
+import { formatRunMethod } from "../../../../utils";
const RUN_METHODS: TransformRunMethod[] = ["manual", "cron"];
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
index 00f36c991f6..73ad8a16df3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
@@ -7,12 +7,12 @@ import { useSetting } from "metabase/common/hooks";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Card, Flex, Group, Stack } from "metabase/ui";
-import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";
import type { TransformRun, TransformTag } from "metabase-types/api";
import { ListEmptyState } from "../../../components/ListEmptyState";
import { RunStatusInfo } from "../../../components/RunStatusInfo";
import { TagList } from "../../../components/TagList";
+import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";
import { PAGE_SIZE } from "../constants";
import { hasFilterParams } from "../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
index a79a0a7bbf0..245f8abfaae 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
@@ -10,9 +10,10 @@ import {
useListTransformTagsQuery,
useListTransformsQuery,
} from "metabase-enterprise/api";
-import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";
import type { TransformRun } from "metabase-types/api";
+import { POLLING_INTERVAL } from "../../constants";
+
import { RunFilterList } from "./RunFilterList";
import { RunList } from "./RunList";
import { PAGE_SIZE } from "./constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
index a101eb9542f..0db4b188d32 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
@@ -13,8 +13,10 @@ import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { Button, Center, Icon, Loader, Menu } from "metabase/ui";
-import { trackTransformCreate } from "metabase-enterprise/transforms/analytics";
-import { doesDatabaseSupportTransforms } from "metabase-enterprise/transforms/utils";
+
+import { trackTransformCreate } from "../../../analytics";
+
+import { shouldDisableItem } from "./utils";
export function CreateTransformMenu() {
const dispatch = useDispatch();
@@ -30,7 +32,7 @@ export function CreateTransformMenu() {
};
const handlePickerChange = (item: QuestionPickerValueItem) => {
- dispatch(push(Urls.newTransformFromCard(item.id)));
+ dispatch(push(Urls.newCardTransform(item.id)));
};
const { data: databases, isLoading } = useListDatabasesQuery({
@@ -58,7 +60,7 @@ export function CreateTransformMenu() {
<Menu.Label>{t`Create your transform with…`}</Menu.Label>
<Menu.Item
component={ForwardRefLink}
- to={Urls.newTransformFromType("query")}
+ to={Urls.newQueryTransform()}
leftSection={<Icon name="notebook" />}
onClick={() => {
trackTransformCreate({
@@ -71,7 +73,7 @@ export function CreateTransformMenu() {
</Menu.Item>
<Menu.Item
component={ForwardRefLink}
- to={Urls.newTransformFromType("native")}
+ to={Urls.newNativeTransform()}
leftSection={<Icon name="sql" />}
onClick={() => {
trackTransformCreate({
@@ -82,7 +84,21 @@ export function CreateTransformMenu() {
>
{t`SQL query`}
</Menu.Item>
- {PLUGIN_TRANSFORMS_PYTHON.getCreateTransformsMenuItems()}
+ {PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newPythonTransform()}
+ leftSection={<Icon name="code_block" />}
+ onClick={() => {
+ trackTransformCreate({
+ triggeredFrom: "transform-page-create-menu",
+ creationType: "python",
+ });
+ }}
+ >
+ {t`Python script`}
+ </Menu.Item>
+ )}
<Menu.Item
leftSection={<Icon name="folder" />}
onClick={handleSavedQuestionClick}
@@ -99,25 +115,9 @@ export function CreateTransformMenu() {
models={["card", "dataset"]}
onChange={handlePickerChange}
onClose={closePicker}
- shouldDisableItem={(item: QuestionPickerItem) => {
- if (
- // Disable questions based on unsuppported databases
- item.model === "card" ||
- item.model === "dataset" ||
- item.model === "metric"
- ) {
- const database = databases?.data.find(
- (database) => database.id === item.database_id,
- );
- return !doesDatabaseSupportTransforms(database);
- }
-
- if (item.model === "dashboard") {
- return true;
- }
-
- return false;
- }}
+ shouldDisableItem={(item: QuestionPickerItem) =>
+ shouldDisableItem(item, databases?.data ?? [])
+ }
/>
)}
</>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts
new file mode 100644
index 00000000000..89fc79d3332
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts
@@ -0,0 +1,26 @@
+import type { QuestionPickerItem } from "metabase/common/components/Pickers/QuestionPicker";
+import type { Database } from "metabase-types/api";
+
+import { doesDatabaseSupportTransforms } from "../../../utils";
+
+export function shouldDisableItem(
+ item: QuestionPickerItem,
+ databases: Database[],
+) {
+ if (
+ item.model === "card" ||
+ item.model === "dataset" ||
+ item.model === "metric"
+ ) {
+ const database = databases.find(
+ (database) => database.id === item.database_id,
+ );
+ return !doesDatabaseSupportTransforms(database);
+ }
+
+ if (item.model === "dashboard") {
+ return true;
+ }
+
+ return false;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
index 8789b9c9321..23075966880 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
@@ -11,12 +11,12 @@ import {
useListTransformTagsQuery,
useListTransformsQuery,
} from "metabase-enterprise/api";
-import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";
import type { Transform } from "metabase-types/api";
import { ListEmptyState } from "../../../components/ListEmptyState";
import { RunStatusInfo } from "../../../components/RunStatusInfo";
import { TagList } from "../../../components/TagList";
+import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
import { parseTimestampWithTimezone } from "../../../utils";
import { hasFilterParams } from "../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx
index 4d346b9baa6..cae0879cfc5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx
@@ -13,10 +13,10 @@ import {
useRunTransformMutation,
useUpdateTransformMutation,
} from "metabase-enterprise/api";
-import { trackTransformTriggerManualRun } from "metabase-enterprise/transforms/analytics";
-import { LogOutput } from "metabase-enterprise/transforms/components/LogOutput";
import type { Transform, TransformTagId } from "metabase-types/api";
+import { trackTransformTriggerManualRun } from "../../../analytics";
+import { LogOutput } from "../../../components/LogOutput";
import { RunButton } from "../../../components/RunButton";
import { RunStatus } from "../../../components/RunStatus";
import { SplitSection } from "../../../components/SplitSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx
index 72fa8d442d0..735fddbb723 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx
@@ -19,10 +19,10 @@ import {
Loader,
Text,
} from "metabase/ui";
-import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";
import type { Transform } from "metabase-types/api";
import { SplitSection } from "../../../components/SplitSection";
+import { sourceDatabaseId } from "../../../utils";
import { isTransformRunning } from "../utils";
import { UpdateTargetModal } from "./UpdateTargetModal";
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.tsx
index d4dfc693389..14346604a21 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
@@ -30,10 +30,11 @@ import {
useDeleteTransformTargetMutation,
useUpdateTransformMutation,
} from "metabase-enterprise/api";
-import { SchemaFormSelect } from "metabase-enterprise/transforms/components/SchemaFormSelect";
-import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";
import type { Transform, UpdateTransformRequest } from "metabase-types/api";
+import { SchemaFormSelect } from "../../../../components/SchemaFormSelect";
+import { sourceDatabaseId } from "../../../../utils";
+
type UpdateTargetModalProps = {
transform: Transform;
onUpdate: () => void;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index 72c2cdce7e2..d510b9654d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -1,9 +1,10 @@
-import type { Location } from "history";
+import { useLayoutEffect, useState } from "react";
import type { Route } from "react-router";
import { push } from "react-router-redux";
+import { useLatest } from "react-use";
import { t } from "ttag";
-import { skipToken } from "metabase/api";
+import { skipToken, useListDatabasesQuery } from "metabase/api";
import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
@@ -14,18 +15,17 @@ import {
PLUGIN_DEPENDENCIES,
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import {
useGetTransformQuery,
useUpdateTransformMutation,
} from "metabase-enterprise/api";
-import { useSourceState } from "metabase-enterprise/transforms/hooks/use-source-state";
-import type {
- DraftTransformSource,
- Transform,
- TransformSource,
-} from "metabase-types/api";
+import type { Database, Transform } from "metabase-types/api";
-import { QueryEditor } from "../../components/QueryEditor";
+import { TransformEditor } from "../../components/TransformEditor";
+import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";
+import { useSourceState } from "../../hooks/use-source-state";
+import { isNotDraftSource } from "../../utils";
type TransformQueryPageParams = {
transformId: string;
@@ -33,34 +33,36 @@ type TransformQueryPageParams = {
type TransformQueryPageProps = {
params: TransformQueryPageParams;
- location: Location;
route: Route;
};
-export function TransformQueryPage({
- params,
- location,
- route,
-}: TransformQueryPageProps) {
+export function TransformQueryPage({ params, route }: TransformQueryPageProps) {
const transformId = Urls.extractEntityId(params.transformId);
const {
data: transform,
- isLoading,
- error,
+ isLoading: isLoadingTransform,
+ error: transformError,
} = useGetTransformQuery(transformId ?? skipToken);
+ const {
+ data: databases,
+ isLoading: isLoadingDatabases,
+ error: databasesError,
+ } = useListDatabasesQuery({ include_analytics: true });
+ const isLoading = isLoadingTransform || isLoadingDatabases;
+ const error = transformError || databasesError;
if (isLoading || error != null) {
return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
}
- if (transform == null) {
+ if (transform == null || databases == null) {
return <LoadingAndErrorWrapper error={t`Transform not found.`} />;
}
return (
<TransformQueryPageBody
transform={transform}
- location={location}
+ databases={databases.data}
route={route}
/>
);
@@ -68,22 +70,42 @@ export function TransformQueryPage({
type TransformQueryPageBodyProps = {
transform: Transform;
- location: Location;
+ databases: Database[];
route: Route;
};
export function TransformQueryPageBody({
transform,
- location,
+ databases,
route,
}: TransformQueryPageBodyProps) {
+ const {
+ source,
+ proposedSource,
+ isDirty,
+ setSource,
+ setSourceAndRejectProposed,
+ acceptProposed,
+ rejectProposed,
+ } = useSourceState({
+ transformId: transform.id,
+ initialSource: transform.source,
+ });
+ const [uiState, setUiState] = useState(getInitialUiState);
const [updateTransform, { isLoading: isSaving }] =
useUpdateTransformMutation();
const dispatch = useDispatch();
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+ useRegisterMetabotTransformContext(transform, source);
+
+ const resetRef = useLatest(() => {
+ setSource(transform.source);
+ setUiState(getInitialUiState());
+ });
- const { setSource, proposedSource, acceptProposed, clearProposed, isDirty } =
- useSourceState<DraftTransformSource>(transform.id, transform.source);
+ useLayoutEffect(() => {
+ resetRef.current();
+ }, [transform.id, resetRef]);
const {
checkData,
@@ -99,39 +121,62 @@ export function TransformQueryPageBody({
sendErrorToast(t`Failed to update transform query`);
} else {
sendSuccessToast(t`Transform query updated`);
- clearProposed();
dispatch(push(Urls.transform(transform.id)));
}
},
});
- const handleSaveSource = async (source: TransformSource) => {
- await handleInitialSave({
- id: transform.id,
- source,
- });
+ const handleSave = async () => {
+ if (isNotDraftSource(source)) {
+ await handleInitialSave({
+ id: transform.id,
+ source,
+ });
+ }
};
const handleCancel = () => {
- // set to initial source to fix isDirty calc on route leave
- setSource(transform.source);
- clearProposed();
dispatch(push(Urls.transform(transform.id)));
};
return (
- <AdminSettingsLayout fullWidth key={transform.id}>
- <TransformEditorBody
- transform={transform}
- initialSource={transform.source}
- proposedSource={proposedSource}
- isSaving={isSaving || isCheckingDependencies}
- onChange={setSource}
- onSave={handleSaveSource}
- onCancel={handleCancel}
- onRejectProposed={clearProposed}
- onAcceptProposed={acceptProposed}
- />
+ <AdminSettingsLayout fullWidth>
+ {source.type === "python" ? (
+ <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
+ name={transform.name}
+ source={source}
+ proposedSource={
+ proposedSource?.type === "python" ? proposedSource : undefined
+ }
+ isNew={false}
+ isDirty={isDirty}
+ isSaving={isSaving || isCheckingDependencies}
+ onChangeSource={setSourceAndRejectProposed}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ ) : (
+ <TransformEditor
+ name={transform.name}
+ source={source}
+ proposedSource={
+ proposedSource?.type === "query" ? proposedSource : undefined
+ }
+ uiState={uiState}
+ databases={databases}
+ isNew={false}
+ isDirty={isDirty}
+ isSaving={isSaving || isCheckingDependencies}
+ onChangeSource={setSourceAndRejectProposed}
+ onChangeUiState={setUiState}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ )}
{isConfirmationShown && checkData != null && (
<PLUGIN_DEPENDENCIES.CheckDependenciesModal
checkData={checkData}
@@ -141,71 +186,10 @@ export function TransformQueryPageBody({
/>
)}
<LeaveRouteConfirmModal
- key={location.key}
- isEnabled={isDirty && !isConfirmationShown && !isSaving}
route={route}
- onConfirm={clearProposed}
+ isEnabled={isDirty && !isSaving && !isCheckingDependencies}
+ onConfirm={rejectProposed}
/>
</AdminSettingsLayout>
);
}
-
-interface TransformEditorBodyProps {
- transform: Transform;
- initialSource: TransformSource;
- proposedSource?: TransformSource;
- isSaving?: boolean;
- onChange?: (source: DraftTransformSource) => void;
- onSave: (source: TransformSource) => void;
- onCancel: () => void;
- onRejectProposed?: () => void;
- onAcceptProposed?: (source: TransformSource) => void;
-}
-
-function TransformEditorBody({
- transform,
- initialSource,
- proposedSource,
- isSaving,
- onChange,
- onSave,
- onCancel,
- onRejectProposed,
- onAcceptProposed,
-}: TransformEditorBodyProps) {
- if (initialSource.type === "python") {
- return (
- <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
- transform={transform}
- initialSource={initialSource}
- proposedSource={
- proposedSource?.type === "python" ? proposedSource : undefined
- }
- isNew={false}
- isSaving={isSaving}
- onChange={onChange}
- onSave={onSave}
- onCancel={onCancel}
- onRejectProposed={onRejectProposed}
- onAcceptProposed={onAcceptProposed}
- />
- );
- }
-
- return (
- <QueryEditor
- initialSource={initialSource}
- transform={transform}
- isNew={false}
- isSaving={isSaving}
- onSave={onSave}
- onChange={onChange}
- onCancel={onCancel}
- proposedSource={
- proposedSource?.type === "query" ? proposedSource : undefined
- }
- onRejectProposed={onRejectProposed}
- onAcceptProposed={onAcceptProposed}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
index dff0be14d4e..fe12713cfd0 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
@@ -1,11 +1,14 @@
import { t } from "ttag";
+import _ from "underscore";
import { hasFeature } from "metabase/admin/databases/utils";
import { parseTimestamp } from "metabase/lib/time-dayjs";
import { isNotNull } from "metabase/lib/types";
+import * as Lib from "metabase-lib";
import type {
Database,
DatabaseId,
+ DraftTransformSource,
TransformRunMethod,
TransformRunStatus,
TransformSource,
@@ -121,3 +124,22 @@ export function parseRunMethod(value: unknown): TransformRunMethod | undefined {
return undefined;
}
}
+
+export function isSameSource(
+ source1: DraftTransformSource,
+ source2: DraftTransformSource,
+) {
+ if (source1.type === "query" && source2.type === "query") {
+ return Lib.areLegacyQueriesEqual(source1.query, source2.query);
+ }
+ if (source1.type === "python" && source2.type === "python") {
+ return _.isEqual(source1, source2);
+ }
+ return false;
+}
+
+export function isNotDraftSource(
+ source: DraftTransformSource,
+): source is TransformSource {
+ return source.type !== "python" || source["source-database"] != null;
+}
diff --git a/frontend/src/metabase/api/dataset.ts b/frontend/src/metabase/api/dataset.ts
index 65f8378803e..45eb7378a50 100644
--- a/frontend/src/metabase/api/dataset.ts
+++ b/frontend/src/metabase/api/dataset.ts
@@ -95,6 +95,7 @@ export const datasetApi = Api.injectEndpoints({
export const {
useGetAdhocQueryQuery,
+ useLazyGetAdhocQueryQuery,
useGetAdhocPivotQueryQuery,
useGetAdhocQueryMetadataQuery,
useLazyGetAdhocQueryMetadataQuery,
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
index 5f9969f6f5e..2c42def9623 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
@@ -33,6 +33,7 @@ export const TableList = ({
model: "table",
name: table.display_name,
database: { id: table.db_id },
+ database_id: table.db_id,
}));
}, [tables]);
diff --git a/frontend/src/metabase/lib/urls/transforms.ts b/frontend/src/metabase/lib/urls/transforms.ts
index a379f5fe952..55c45a147dc 100644
--- a/frontend/src/metabase/lib/urls/transforms.ts
+++ b/frontend/src/metabase/lib/urls/transforms.ts
@@ -61,11 +61,19 @@ export function transformList({
}
}
-export function newTransformFromType(type: "query" | "native" | "python") {
- return `${ROOT_URL}/new/${type}`;
+export function newQueryTransform() {
+ return `${ROOT_URL}/new/query`;
}
-export function newTransformFromCard(cardId: CardId) {
+export function newNativeTransform() {
+ return `${ROOT_URL}/new/native`;
+}
+
+export function newPythonTransform() {
+ return `${ROOT_URL}/new/python`;
+}
+
+export function newCardTransform(cardId: CardId) {
return `${ROOT_URL}/new/card/${cardId}`;
}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx
index bffa7d059b0..95aad63df1f 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx
@@ -7,6 +7,7 @@ import {
useUpdateTableMutation,
} from "metabase/api";
import EmptyState from "metabase/common/components/EmptyState";
+import * as Urls from "metabase/lib/urls";
import {
FieldOrderPicker,
NameDescriptionInput,
@@ -166,7 +167,7 @@ const TableSectionBase = ({ params, table, onSyncOptionsClick }: Props) => {
<Tooltip label={t`Go to this table`} position="top">
<ActionIcon
component={Link}
- to={getQueryBuilderUrl(table)}
+ to={Urls.queryBuilderTable(table.id, table.db_id)}
variant="subtle"
color="text-light"
size="sm"
@@ -267,8 +268,4 @@ const TableSectionBase = ({ params, table, onSyncOptionsClick }: Props) => {
);
};
-function getQueryBuilderUrl(table: Table) {
- return `/question#?db=${table.db_id}&table=${table.id}`;
-}
-
export const TableSection = memo(TableSectionBase);
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index 182f2195139..fadf21d1a8b 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -81,8 +81,7 @@ import type {
ModelCacheRefreshStatus,
ParameterId,
Pulse,
- PythonTransformSource,
- PythonTransformTableAliases,
+ PythonTransformSourceDraft,
Revision,
SearchModel,
Series,
@@ -941,44 +940,40 @@ export const PLUGIN_REMOTE_SYNC: {
}),
};
+export type PythonTransformEditorProps = {
+ name?: string;
+ source: PythonTransformSourceDraft;
+ proposedSource?: PythonTransformSourceDraft;
+ isNew: boolean;
+ isDirty: boolean;
+ isSaving: boolean;
+ onChangeSource: (source: PythonTransformSourceDraft) => void;
+ onSave: () => void;
+ onCancel: () => void;
+ onAcceptProposed: () => void;
+ onRejectProposed: () => void;
+};
+
+export type PythonTransformSourceSectionProps = {
+ transform: Transform;
+};
+
export type PythonTransformsPlugin = {
+ isEnabled: boolean;
+ TransformEditor: ComponentType<PythonTransformEditorProps>;
+ SourceSection: ComponentType<PythonTransformSourceSectionProps>;
PythonRunnerSettingsPage: ComponentType;
- SourceSection: ComponentType<{ transform: Transform }>;
- TransformEditor: ComponentType<{
- transform?: Transform | undefined;
- initialSource: {
- type: "python";
- body: string;
- "source-database": DatabaseId | undefined;
- "source-tables": PythonTransformTableAliases;
- };
- proposedSource?: PythonTransformSource;
- isNew?: boolean;
- isSaving?: boolean;
- isRunnable?: boolean;
- onChange?: (newSource: {
- type: "python";
- body: string;
- "source-database": DatabaseId | undefined;
- "source-tables": PythonTransformTableAliases;
- }) => void;
- onSave: (newSource: PythonTransformSource) => void;
- onCancel: () => void;
- onRejectProposed?: () => void;
- onAcceptProposed?: (query: PythonTransformSource) => void;
- }>;
getAdminRoutes: () => ReactNode;
getTransformsNavLinks: () => ReactNode;
- getCreateTransformsMenuItems: () => ReactNode;
};
export const PLUGIN_TRANSFORMS_PYTHON: PythonTransformsPlugin = {
- PythonRunnerSettingsPage: NotFoundPlaceholder,
- TransformEditor: NotFoundPlaceholder,
+ isEnabled: false,
+ TransformEditor: PluginPlaceholder,
SourceSection: PluginPlaceholder,
+ PythonRunnerSettingsPage: NotFoundPlaceholder,
getAdminRoutes: () => null,
getTransformsNavLinks: () => null,
- getCreateTransformsMenuItems: () => null,
};
type DependenciesPlugin = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.module.css
index 993e6069551..1bb576a835e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.module.css
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.module.css
@@ -1,10 +1,10 @@
+.nativeSidebar {
+ border-left: 1px solid var(--mb-color-border);
+ margin-inline-start: 0.25rem;
+}
+
.nativeSidebarToggle {
position: absolute;
top: var(--mantine-spacing-lg);
right: var(--mantine-spacing-md);
}
-
-.nativeSidebar {
- border-left: 1px solid var(--mb-color-border);
- margin-inline-start: 0.25rem;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
similarity index 61%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
index c3183426604..603366e2459 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
@@ -8,41 +8,22 @@ import type Question from "metabase-lib/v1/Question";
import { ResizeHandle } from "../ResizeHandle";
-import S from "./NativeQuerySidebar.module.css";
+import S from "./NativeQueryPreviewSidebar.module.css";
-export function NativeQuerySidebarToggle({
- isShowingNativeQueryPreview,
- onToggleNativeQueryPreview,
-}: {
- isNative?: boolean;
- isShowingNativeQueryPreview: boolean;
- onToggleNativeQueryPreview: () => void;
-}) {
- return (
- <Tooltip label={isShowingNativeQueryPreview ? t`Hide SQL` : t`View SQL`}>
- <ActionIcon
- key="view-sql"
- onClick={onToggleNativeQueryPreview}
- size="lg"
- className={S.nativeSidebarToggle}
- color="text"
- variant="subtle"
- >
- <Icon name="sql" color="text" />
- </ActionIcon>
- </Tooltip>
- );
-}
+type NativeQueryPreviewSidebarProps = {
+ question: Question;
+ convertToNativeTitle?: string;
+ convertToNativeButtonLabel?: string;
+ onConvertToNativeClick: (newQuestion: Question) => void;
+};
-export function NativeQuerySidebar({
+export function NativeQueryPreviewSidebar({
question,
+ convertToNativeTitle,
+ convertToNativeButtonLabel,
onConvertToNativeClick,
-}: {
- question: Question;
- onConvertToNativeClick: (newQuestion: Question) => void;
-}) {
+}: NativeQueryPreviewSidebarProps) {
const { width: windowWidth } = useWindowSize();
-
const minSidebarWidth = 428;
const minNotebookWidth = 640;
const maxSidebarWidth = windowWidth - minNotebookWidth;
@@ -59,9 +40,37 @@ export function NativeQuerySidebar({
>
<NotebookNativePreview
question={question}
+ title={convertToNativeTitle}
+ buttonTitle={convertToNativeButtonLabel}
onConvertClick={onConvertToNativeClick}
- buttonTitle={t`Convert this transform to SQL`}
/>
</ResizableBox>
);
}
+
+type NativeQueryPreviewSidebarToggleProps = {
+ isNativeQueryPreviewSidebarOpen: boolean;
+ onToggleNativeQueryPreviewSidebar: () => void;
+};
+
+export function NativeQueryPreviewSidebarToggle({
+ isNativeQueryPreviewSidebarOpen,
+ onToggleNativeQueryPreviewSidebar,
+}: NativeQueryPreviewSidebarToggleProps) {
+ return (
+ <Tooltip
+ label={isNativeQueryPreviewSidebarOpen ? t`Hide SQL` : t`View SQL`}
+ >
+ <ActionIcon
+ key="view-sql"
+ onClick={onToggleNativeQueryPreviewSidebar}
+ size="lg"
+ className={S.nativeSidebarToggle}
+ color="text"
+ variant="subtle"
+ >
+ <Icon name="sql" color="text" />
+ </ActionIcon>
+ </Tooltip>
+ );
+}
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/index.ts
new file mode 100644
index 00000000000..64c569a5dc1
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/index.ts
@@ -0,0 +1 @@
+export * from "./NativeQueryPreviewSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/EditorSidebar.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/EditorSidebar.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/EditorSidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
similarity index 79%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/EditorSidebar.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
index 97b6ba8437e..af6d8149af7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorSidebar/EditorSidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
@@ -8,32 +8,25 @@ import { Box } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import type { NativeQuerySnippet } from "metabase-types/api";
-import S from "./EditorSidebar.module.css";
+import S from "./NativeQuerySidebar.module.css";
-type EditorSidebarProps = {
+type NativeQuerySidebarProps = {
question: Question;
- isNative?: boolean;
+ isNative: boolean;
isSnippetSidebarOpen?: boolean;
isDataReferenceOpen?: boolean;
+ onInsertSnippet: (snippet: NativeQuerySnippet) => void;
onToggleDataReference: () => void;
onToggleSnippetSidebar: () => void;
onChangeModalSnippet: (snippet: NativeQuerySnippet) => void;
- onInsertSnippet: (snippet: NativeQuerySnippet) => void;
+ onOpenSnippetModalWithSelectedText: () => void;
};
-export function EditorSidebar(props: EditorSidebarProps) {
- const { isNative } = props;
- if (!isNative) {
- return null;
- }
- return <NativeQueryEditorSidebar {...props} />;
-}
-
-function NativeQueryEditorSidebar({
+export function NativeQuerySidebar({
isSnippetSidebarOpen,
isDataReferenceOpen,
...props
-}: EditorSidebarProps) {
+}: NativeQuerySidebarProps) {
if (!isSnippetSidebarOpen && !isDataReferenceOpen) {
return null;
}
@@ -42,20 +35,20 @@ function NativeQueryEditorSidebar({
<Box className={S.sidebar} h="100%" w="40%" data-testid="editor-sidebar">
{match({ isSnippetSidebarOpen, isDataReferenceOpen })
.with({ isSnippetSidebarOpen: true }, () => (
- <EditorSnippetSidebar {...props} />
+ <QuerySnippetSidebar {...props} />
))
.with({ isDataReferenceOpen: true }, () => (
- <EditorDataReferenceSidebar {...props} />
+ <QueryDataReferenceSidebar {...props} />
))
.otherwise(() => null)}
</Box>
);
}
-function EditorDataReferenceSidebar({
+function QueryDataReferenceSidebar({
question,
onToggleDataReference,
-}: EditorSidebarProps) {
+}: NativeQuerySidebarProps) {
const [dataReferenceStack, setDataReferenceStack] = useState<any[]>([]);
useMount(() => {
@@ -87,18 +80,19 @@ function EditorDataReferenceSidebar({
);
}
-function EditorSnippetSidebar({
+function QuerySnippetSidebar({
+ onInsertSnippet,
onToggleSnippetSidebar,
onChangeModalSnippet,
- onInsertSnippet,
-}: EditorSidebarProps) {
+ onOpenSnippetModalWithSelectedText,
+}: NativeQuerySidebarProps) {
return (
<SnippetSidebar
- onClose={onToggleSnippetSidebar}
- setModalSnippet={onChangeModalSnippet}
- openSnippetModalWithSelectedText={onChangeModalSnippet}
snippetCollectionId={null}
+ openSnippetModalWithSelectedText={onOpenSnippetModalWithSelectedText}
+ setModalSnippet={onChangeModalSnippet}
insertSnippet={onInsertSnippet}
+ onClose={onToggleSnippetSidebar}
/>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/NativeQuerySidebar/index.ts
rename to frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/index.ts
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx
new file mode 100644
index 00000000000..d9c1b1558fc
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx
@@ -0,0 +1,165 @@
+import { t } from "ttag";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { NativeQueryPreview } from "metabase/querying/notebook/components/NativeQueryPreview";
+import { Center, Flex, Modal } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+
+import { useQueryEditor } from "../../hooks/use-query-editor";
+import type { QueryEditorUiOptions, QueryEditorUiState } from "../../types";
+
+import {
+ NativeQueryPreviewSidebar,
+ NativeQueryPreviewSidebarToggle,
+} from "./NativeQueryPreviewSidebar";
+import { NativeQuerySidebar } from "./NativeQuerySidebar";
+import { QuerySection } from "./QuerySection";
+import { VisualizationSection } from "./VisualizationSection";
+
+type QueryEditorProps = {
+ query: Lib.Query;
+ uiState: QueryEditorUiState;
+ uiOptions?: QueryEditorUiOptions;
+ proposedQuery?: Lib.Query;
+ onChangeQuery: (newQuery: Lib.Query) => void;
+ onChangeUiState: (newUiState: QueryEditorUiState) => void;
+ onAcceptProposed?: () => void;
+ onRejectProposed?: () => void;
+};
+
+export function QueryEditor({
+ query,
+ uiState,
+ uiOptions,
+ proposedQuery,
+ onChangeQuery,
+ onChangeUiState,
+ onAcceptProposed,
+ onRejectProposed,
+}: QueryEditorProps) {
+ const {
+ question,
+ proposedQuestion,
+ error,
+ result,
+ rawSeries,
+ selectedText,
+ isLoading,
+ isNative,
+ isRunnable,
+ isRunning,
+ isResultDirty,
+ setQuestion,
+ runQuery,
+ cancelQuery,
+ openModal,
+ setSelectionRange,
+ setModalSnippet,
+ openSnippetModalWithSelectedText,
+ insertSnippet,
+ convertToNative,
+ toggleDataReferenceSidebar,
+ toggleSnippetSidebar,
+ toggleNativeQuerySidebar,
+ togglePreviewQueryModal,
+ } = useQueryEditor({
+ query,
+ uiState,
+ proposedQuery,
+ onChangeQuery,
+ onChangeUiState,
+ });
+
+ if (isLoading || error != null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <>
+ <Flex flex={1} h="100%">
+ <Flex flex="2 1 0" direction="column" pos="relative">
+ <QuerySection
+ question={question}
+ proposedQuestion={proposedQuestion}
+ modalSnippet={uiState.modalSnippet}
+ nativeEditorSelectedText={selectedText}
+ isNative={isNative}
+ isRunnable={isRunnable}
+ isRunning={isRunning}
+ isResultDirty={isResultDirty}
+ isShowingDataReference={uiState.sidebarType === "data-reference"}
+ isShowingSnippetSidebar={uiState.sidebarType === "snippet"}
+ shouldDisableItem={uiOptions?.shouldDisableDataPickerItem}
+ shouldDisableDatabase={uiOptions?.shouldDisableDatabasePickerItem}
+ onChange={setQuestion}
+ onRunQuery={runQuery}
+ onCancelQuery={cancelQuery}
+ onToggleDataReference={toggleDataReferenceSidebar}
+ onToggleSnippetSidebar={toggleSnippetSidebar}
+ onOpenModal={openModal}
+ onChangeModalSnippet={setModalSnippet}
+ onInsertSnippet={insertSnippet}
+ onChangeNativeEditorSelection={setSelectionRange}
+ onAcceptProposed={onAcceptProposed}
+ onRejectProposed={onRejectProposed}
+ />
+ <VisualizationSection
+ question={question}
+ result={result}
+ rawSeries={rawSeries}
+ isNative={isNative}
+ isRunnable={isRunnable}
+ isRunning={isRunning}
+ isResultDirty={isResultDirty}
+ onRunQuery={runQuery}
+ onCancelQuery={cancelQuery}
+ />
+ {!isNative && (
+ <NativeQueryPreviewSidebarToggle
+ isNativeQueryPreviewSidebarOpen={
+ uiState.sidebarType === "native-query"
+ }
+ onToggleNativeQueryPreviewSidebar={toggleNativeQuerySidebar}
+ />
+ )}
+ </Flex>
+ {isNative && (
+ <NativeQuerySidebar
+ question={question}
+ isNative={isNative}
+ isDataReferenceOpen={uiState.sidebarType === "data-reference"}
+ isSnippetSidebarOpen={uiState.sidebarType === "snippet"}
+ onInsertSnippet={insertSnippet}
+ onToggleDataReference={toggleDataReferenceSidebar}
+ onToggleSnippetSidebar={toggleSnippetSidebar}
+ onChangeModalSnippet={setModalSnippet}
+ onOpenSnippetModalWithSelectedText={
+ openSnippetModalWithSelectedText
+ }
+ />
+ )}
+ {!isNative && uiState.sidebarType === "native-query" && (
+ <NativeQueryPreviewSidebar
+ question={question}
+ convertToNativeTitle={uiOptions?.convertToNativeTitle}
+ convertToNativeButtonLabel={uiOptions?.convertToNativeButtonLabel}
+ onConvertToNativeClick={convertToNative}
+ />
+ )}
+ </Flex>
+ {isNative && (
+ <Modal
+ title={t`Query preview`}
+ opened={uiState.modalType === "preview-query"}
+ onClose={togglePreviewQueryModal}
+ >
+ <NativeQueryPreview query={query} />
+ </Modal>
+ )}
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.module.css
similarity index 50%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.module.css
index adb47fe6518..67dadfc8b09 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.module.css
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.module.css
@@ -1,5 +1,10 @@
-.root {
+.queryResizableBox {
display: flex;
border-bottom: 1px solid var(--mb-color-border);
+}
+
+.nativeResizableBox {
+ display: flex;
border-top: 1px solid var(--mb-color-border);
+ border-bottom: 1px solid var(--mb-color-border);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx
similarity index 70%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx
index 8d681b5cd90..d9274f65bcd 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorBody/EditorBody.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx
@@ -11,23 +11,19 @@ import NativeQueryEditor, {
import type { QueryModalType } from "metabase/query_builder/constants";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { Box } from "metabase/ui";
-import { doesDatabaseSupportTransforms } from "metabase-enterprise/transforms/utils";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type {
- Database as ApiDatabase,
- DatasetQuery,
NativeQuerySnippet,
- RecentItem,
+ RecentCollectionItem,
} from "metabase-types/api";
import { ResizeHandle } from "../ResizeHandle";
-import S from "./EditorBody.module.css";
+import S from "./QuerySection.module.css";
const EDITOR_HEIGHT = 550;
-
const NATIVE_HEADER_HEIGHT = 55;
const HEADER_HEIGHT = 65 + 50;
@@ -40,66 +36,76 @@ const NATIVE_EDITOR_SIDEBAR_FEATURES = {
aiGeneration: false,
};
-type EditorBodyProps = {
+type QuerySectionProps = {
question: Question;
+ proposedQuestion: Question | undefined;
+ modalSnippet?:
+ | NativeQuerySnippet
+ | Partial<Omit<NativeQuerySnippet, "id">>
+ | null;
+ nativeEditorSelectedText?: string | null;
isNative: boolean;
isRunnable: boolean;
isRunning: boolean;
isResultDirty: boolean;
isShowingDataReference: boolean;
isShowingSnippetSidebar: boolean;
+ shouldDisableDatabase?: (database: Database) => boolean;
+ shouldDisableItem?: (
+ item: DataPickerItem | CollectionPickerItem | RecentCollectionItem,
+ ) => boolean;
onChange: (newQuestion: Question) => void;
onRunQuery: () => Promise<void>;
onToggleDataReference: () => void;
onToggleSnippetSidebar: () => void;
onCancelQuery: () => void;
onInsertSnippet: (snippet: NativeQuerySnippet) => void;
- modalSnippet?: NativeQuerySnippet | null;
onChangeModalSnippet: (snippet: NativeQuerySnippet | null) => void;
onChangeNativeEditorSelection: (range: SelectionRange[]) => void;
onOpenModal: (type: QueryModalType) => void;
- nativeEditorSelectedText?: string | null;
-
- databases: ApiDatabase[];
- proposedQuestion?: Question;
+ onAcceptProposed?: () => void;
onRejectProposed?: () => void;
- onAcceptProposed?: (query: DatasetQuery) => void;
};
-export function EditorBody({
+export function QuerySection({
question,
+ proposedQuestion,
+ modalSnippet,
+ nativeEditorSelectedText,
isNative,
isRunnable,
isRunning,
isResultDirty,
isShowingDataReference,
isShowingSnippetSidebar,
+ shouldDisableDatabase,
+ shouldDisableItem,
onChange,
onRunQuery,
- onCancelQuery,
onToggleDataReference,
onToggleSnippetSidebar,
- databases,
- modalSnippet,
+ onCancelQuery,
onInsertSnippet,
onChangeModalSnippet,
onChangeNativeEditorSelection,
- nativeEditorSelectedText,
onOpenModal,
- proposedQuestion,
- onRejectProposed,
onAcceptProposed,
-}: EditorBodyProps) {
+ onRejectProposed,
+}: QuerySectionProps) {
const [isResizing, setIsResizing] = useState(false);
const reportTimezone = useSetting("report-timezone-long");
-
const editorHeight = useInitialEditorHeight(isNative);
+ const dataPickerOptions = useMemo(
+ () => ({ shouldDisableItem }),
+ [shouldDisableItem],
+ );
+
const resizableBoxProps: Partial<ResizableBoxProps> = useMemo(
() => ({
+ className: S.nativeResizableBox,
height: editorHeight,
resizeHandles: ["s"],
- className: S.root,
style: isResizing ? undefined : { transition: "height 0.25s" },
onResizeStart: () => setIsResizing(true),
onResizeStop: () => setIsResizing(false),
@@ -107,11 +113,7 @@ export function EditorBody({
[isResizing, editorHeight],
);
- const handleResize = () => {
- return null;
- };
-
- const handleQuestionChange = (newQuestion: Question) => {
+ const setQuestion = (newQuestion: Question) => {
onChange(newQuestion);
return Promise.resolve();
};
@@ -120,28 +122,27 @@ export function EditorBody({
onChange(newNativeQuery.question());
};
- const dataPickerOptions = useDataPickerOptions({ databases });
-
return isNative ? (
<NativeQueryEditor
question={question}
+ proposedQuestion={proposedQuestion}
query={question.legacyNativeQuery()}
resizableBoxProps={resizableBoxProps}
placeholder="SELECT * FROM TABLE_NAME"
+ hasTopBar
+ hasRunButton
+ isInitiallyOpen
+ isNativeEditorOpen
+ readOnly={false}
+ hasParametersList={false}
isRunnable={isRunnable}
isRunning={isRunning}
isResultDirty={isResultDirty}
- isInitiallyOpen
isShowingDataReference={isShowingDataReference}
isShowingSnippetSidebar={isShowingSnippetSidebar}
- isNativeEditorOpen
- hasTopBar
- hasRunButton
- readOnly={false}
- hasParametersList={false}
- handleResize={handleResize}
runQuery={onRunQuery}
cancelQuery={onCancelQuery}
+ databaseIsDisabled={shouldDisableDatabase}
setDatasetQuery={handleNativeQueryChange}
sidebarFeatures={NATIVE_EDITOR_SIDEBAR_FEATURES}
toggleDataReference={onToggleDataReference}
@@ -149,21 +150,16 @@ export function EditorBody({
modalSnippet={modalSnippet}
insertSnippet={onInsertSnippet}
closeSnippetModal={() => onChangeModalSnippet(null)}
- databaseIsDisabled={(db: Database) => {
- const database = databases.find((database) => database.id === db.id);
- return !doesDatabaseSupportTransforms(database);
- }}
setNativeEditorSelectedRange={onChangeNativeEditorSelection}
nativeEditorSelectedText={nativeEditorSelectedText}
onOpenModal={onOpenModal}
- proposedQuestion={proposedQuestion}
- onRejectProposed={onRejectProposed}
onAcceptProposed={onAcceptProposed}
+ onRejectProposed={onRejectProposed}
/>
) : (
<ResizableBox
axis="y"
- className={S.root}
+ className={S.queryResizableBox}
height={editorHeight}
handle={<ResizeHandle />}
resizeHandles={["s"]}
@@ -178,7 +174,7 @@ export function EditorBody({
isResultDirty={false}
reportTimezone={reportTimezone}
hasVisualizeButton={false}
- updateQuestion={handleQuestionChange}
+ updateQuestion={setQuestion}
runQuestionQuery={onRunQuery}
dataPickerOptions={dataPickerOptions}
/>
@@ -187,47 +183,6 @@ export function EditorBody({
);
}
-function useDataPickerOptions({ databases }: { databases: ApiDatabase[] }) {
- return useMemo(() => {
- return {
- shouldDisableItem: (
- item: DataPickerItem | CollectionPickerItem | RecentItem,
- ) => {
- // Disable unsuppported databases
- if (item.model === "database") {
- const database = databases.find((db) => db.id === item.id);
- return !doesDatabaseSupportTransforms(database);
- }
-
- if (
- // Disable questions based on unsuppported databases
- item.model === "card" ||
- item.model === "dataset" ||
- item.model === "metric" ||
- // Disable tables based on unsuppported databases
- item.model === "table"
- ) {
- if ("database_id" in item) {
- const database = databases.find((db) => db.id === item.database_id);
- return !doesDatabaseSupportTransforms(database);
- }
- if ("database" in item) {
- const database = databases.find((db) => db.id === item.database.id);
- return !doesDatabaseSupportTransforms(database);
- }
- }
-
- // Disable dashboards altogether
- if (item.model === "dashboard") {
- return true;
- }
-
- return false;
- },
- };
- }, [databases]);
-}
-
function getHeaderHeight(isNative: boolean) {
if (isNative) {
return HEADER_HEIGHT + NATIVE_HEADER_HEIGHT;
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts
new file mode 100644
index 00000000000..168aad143a9
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts
@@ -0,0 +1 @@
+export * from "./QuerySection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/ResizeHandle.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/ResizeHandle.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/ResizeHandle.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
index a5957e4880b..72987a75531 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
@@ -4,14 +4,14 @@ import { Box, Flex, rem } from "metabase/ui";
import S from "./ResizeHandle.module.css";
-type Props = HTMLAttributes<HTMLDivElement> & {
+type ResizeHandleProps = HTMLAttributes<HTMLDivElement> & {
handleAxis?: "n" | "e" | "s" | "w";
};
const THICKNESS = "6.25rem";
export const ResizeHandle = forwardRef(function ResizableBoxHandle(
- props: Props,
+ props: ResizeHandleProps,
ref: Ref<HTMLDivElement>,
) {
const { handleAxis, ...rest } = props;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/ResizeHandle/index.ts
rename to frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/EditorVisualization.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/EditorVisualization.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/EditorVisualization.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx
similarity index 87%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/EditorVisualization.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx
index 1264984fbbd..8040cf163ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryEditor/EditorVisualization/EditorVisualization.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx
@@ -3,9 +3,9 @@ import QueryVisualization from "metabase/query_builder/components/QueryVisualiza
import type Question from "metabase-lib/v1/Question";
import type { Dataset, RawSeries } from "metabase-types/api";
-import S from "./EditorVisualization.module.css";
+import S from "./VisualizationSection.module.css";
-type EditorVisualizationProps = {
+type VisualizationSectionProps = {
question: Question;
result: Dataset | null;
rawSeries: RawSeries | null;
@@ -17,7 +17,7 @@ type EditorVisualizationProps = {
onCancelQuery: () => void;
};
-export function EditorVisualization({
+export function VisualizationSection({
question,
result,
rawSeries,
@@ -27,7 +27,7 @@ export function EditorVisualization({
isResultDirty,
onRunQuery,
onCancelQuery,
-}: EditorVisualizationProps) {
+}: VisualizationSectionProps) {
return (
<DebouncedFrame className={S.root}>
<QueryVisualization
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts
new file mode 100644
index 00000000000..93607d85049
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts
@@ -0,0 +1 @@
+export * from "./VisualizationSection";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/index.ts
new file mode 100644
index 00000000000..0c049b968f5
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/index.ts
@@ -0,0 +1,3 @@
+export * from "./QueryEditor";
+export * from "../../types";
+export { getInitialUiState } from "./utils";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts
new file mode 100644
index 00000000000..d01175e8795
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts
@@ -0,0 +1,11 @@
+import type { QueryEditorUiState } from "../../types";
+
+export function getInitialUiState(): QueryEditorUiState {
+ return {
+ lastRunQuery: null,
+ selectionRange: [],
+ modalSnippet: null,
+ sidebarType: null,
+ modalType: null,
+ };
+}
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-controls/index.ts b/frontend/src/metabase/querying/editor/hooks/use-query-controls/index.ts
new file mode 100644
index 00000000000..969942c1298
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-controls/index.ts
@@ -0,0 +1 @@
+export * from "./use-query-controls";
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
new file mode 100644
index 00000000000..f04aff3d6c8
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
@@ -0,0 +1,137 @@
+import { useMemo } from "react";
+
+import type {
+ Location,
+ SelectionRange,
+} from "metabase/query_builder/components/NativeQueryEditor/types";
+import type { QueryModalType } from "metabase/query_builder/constants";
+import * as Lib from "metabase-lib";
+import type Question from "metabase-lib/v1/Question";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
+import type {
+ QueryEditorModalType,
+ QueryEditorSidebarType,
+ QueryEditorUiState,
+} from "../../types";
+
+const EMPTY_SELECTION_RANGE: SelectionRange = {
+ start: { row: 0, column: 0 },
+ end: { row: 0, column: 0 },
+};
+
+export function useQueryControls(
+ question: Question,
+ uiState: QueryEditorUiState,
+ setQuestion: (newQuestion: Question) => void,
+ setUiState: (newUiState: QueryEditorUiState) => void,
+) {
+ const selectedText = useMemo(() => {
+ const query = question.query();
+ const text = Lib.rawNativeQuery(query) ?? "";
+ const { start, end } = getSelectionPositions(text, uiState.selectionRange);
+ return text.slice(start, end);
+ }, [question, uiState.selectionRange]);
+
+ const setSelectionRange = (selectionRange: SelectionRange[]) => {
+ setUiState({ ...uiState, selectionRange });
+ };
+
+ const setModalSnippet = (modalSnippet: NativeQuerySnippet | null) => {
+ setUiState({ ...uiState, modalSnippet });
+ };
+
+ const openSnippetModalWithSelectedText = () => {
+ setUiState({ ...uiState, modalSnippet: { content: selectedText } });
+ };
+
+ const openModal = (type: QueryModalType) => {
+ if (type === "preview-query") {
+ setUiState({
+ ...uiState,
+ modalType: "preview-query",
+ });
+ }
+ };
+
+ const insertSnippet = (snippet: NativeQuerySnippet) => {
+ const query = question.query();
+ const text = Lib.rawNativeQuery(query) ?? "";
+
+ const { start, end } = getSelectionPositions(text, uiState.selectionRange);
+ const pre = text.slice(0, start);
+ const post = text.slice(end);
+ const newText = `${pre}{{snippet: ${snippet.name}}}${post}`;
+ const newQuery = Lib.withNativeQuery(query, newText);
+
+ setQuestion(question.setQuery(newQuery));
+ };
+
+ const convertToNative = (newQuestion: Question) => {
+ setUiState({ ...uiState, sidebarType: null });
+ setQuestion(newQuestion);
+ };
+
+ const toggleSidebar = (sidebarType: QueryEditorSidebarType) => {
+ setUiState({
+ ...uiState,
+ sidebarType: uiState.sidebarType === sidebarType ? null : sidebarType,
+ });
+ };
+
+ const toggleDataReferenceSidebar = () => {
+ toggleSidebar("data-reference");
+ };
+
+ const toggleSnippetSidebar = () => {
+ toggleSidebar("snippet");
+ };
+
+ const toggleNativeQuerySidebar = () => {
+ toggleSidebar("native-query");
+ };
+
+ const toggleModal = (modalType: QueryEditorModalType) => {
+ setUiState({
+ ...uiState,
+ modalType: uiState.modalType === modalType ? null : modalType,
+ });
+ };
+
+ const togglePreviewQueryModal = () => {
+ toggleModal("preview-query");
+ };
+
+ return {
+ selectedText,
+ openModal,
+ setSelectionRange,
+ setModalSnippet,
+ openSnippetModalWithSelectedText,
+ insertSnippet,
+ convertToNative,
+ toggleDataReferenceSidebar,
+ toggleSnippetSidebar,
+ toggleNativeQuerySidebar,
+ togglePreviewQueryModal,
+ };
+}
+
+function locationToPosition(text: string, location: Location): number {
+ const lines = text.split("\n");
+ return lines.reduce((acc, line, index) => {
+ if (index < location.row) {
+ return acc + line.length + 1;
+ }
+ return acc;
+ }, location.column);
+}
+
+function getSelectionPositions(text: string, selectionRange: SelectionRange[]) {
+ const range = selectionRange[0] ?? EMPTY_SELECTION_RANGE;
+
+ return {
+ start: locationToPosition(text, range.start),
+ end: locationToPosition(text, range.end),
+ };
+}
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-editor/index.ts b/frontend/src/metabase/querying/editor/hooks/use-query-editor/index.ts
new file mode 100644
index 00000000000..1021e2ccdf6
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-editor/index.ts
@@ -0,0 +1 @@
+export * from "./use-query-editor";
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts b/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts
new file mode 100644
index 00000000000..93136517f06
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts
@@ -0,0 +1,80 @@
+import * as Lib from "metabase-lib";
+
+import type { QueryEditorUiState } from "../../types";
+import { useQueryControls } from "../use-query-controls";
+import { useQueryMetadata } from "../use-query-metadata";
+import { useQueryQuestion } from "../use-query-question";
+import { useQueryResults } from "../use-query-results";
+
+type UseQueryEditorProps = {
+ query: Lib.Query;
+ uiState: QueryEditorUiState;
+ proposedQuery?: Lib.Query;
+ onChangeQuery: (newQuery: Lib.Query) => void;
+ onChangeUiState: (newUiState: QueryEditorUiState) => void;
+};
+
+export function useQueryEditor({
+ query,
+ uiState,
+ proposedQuery,
+ onChangeQuery,
+ onChangeUiState,
+}: UseQueryEditorProps) {
+ const { question, proposedQuestion, setQuestion } = useQueryQuestion(
+ query,
+ proposedQuery,
+ onChangeQuery,
+ );
+ const { isLoading, error } = useQueryMetadata(question);
+ const {
+ result,
+ rawSeries,
+ isRunnable,
+ isRunning,
+ isResultDirty,
+ runQuery,
+ cancelQuery,
+ } = useQueryResults(question, uiState, onChangeUiState);
+ const {
+ selectedText,
+ openModal,
+ setSelectionRange,
+ setModalSnippet,
+ openSnippetModalWithSelectedText,
+ insertSnippet,
+ convertToNative,
+ toggleDataReferenceSidebar,
+ toggleSnippetSidebar,
+ toggleNativeQuerySidebar,
+ togglePreviewQueryModal,
+ } = useQueryControls(question, uiState, setQuestion, onChangeUiState);
+ const { isNative } = Lib.queryDisplayInfo(question.query());
+
+ return {
+ question,
+ proposedQuestion,
+ error,
+ result,
+ rawSeries,
+ selectedText,
+ isLoading,
+ isNative,
+ isRunnable,
+ isRunning,
+ isResultDirty,
+ setQuestion,
+ runQuery,
+ cancelQuery,
+ openModal,
+ setSelectionRange,
+ setModalSnippet,
+ openSnippetModalWithSelectedText,
+ insertSnippet,
+ convertToNative,
+ toggleDataReferenceSidebar,
+ toggleSnippetSidebar,
+ togglePreviewQueryModal,
+ toggleNativeQuerySidebar,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-metadata/index.ts b/frontend/src/metabase/querying/editor/hooks/use-query-metadata/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-metadata/index.ts
rename to frontend/src/metabase/querying/editor/hooks/use-query-metadata/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-metadata/use-query-metadata.ts b/frontend/src/metabase/querying/editor/hooks/use-query-metadata/use-query-metadata.ts
similarity index 65%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-metadata/use-query-metadata.ts
rename to frontend/src/metabase/querying/editor/hooks/use-query-metadata/use-query-metadata.ts
index fd523e1ea04..1e1a89512e8 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-metadata/use-query-metadata.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-metadata/use-query-metadata.ts
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef } from "react";
import _ from "underscore";
import { useLazyGetAdhocQueryMetadataQuery } from "metabase/api";
@@ -6,9 +6,18 @@ import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
export function useQueryMetadata(question: Question) {
- const [loadMetadata, { isLoading }] = useLazyGetAdhocQueryMetadataQuery();
+ const [loadMetadata, { error }] = useLazyGetAdhocQueryMetadataQuery();
const dependenciesRef = useRef<Lib.DependentItem[]>([]);
- const [isInitiallyLoaded, setIsInitiallyLoaded] = useState(false);
+
+ const isSourceTableLoaded = useMemo(() => {
+ const query = question.query();
+ const sourceTableId = Lib.sourceTableOrCardId(query);
+ const sourceTable =
+ sourceTableId != null
+ ? Lib.tableOrCardMetadata(query, sourceTableId)
+ : null;
+ return sourceTableId == null || sourceTable != null;
+ }, [question]);
useEffect(() => {
const dependencies = Lib.dependentMetadata(
@@ -18,21 +27,12 @@ export function useQueryMetadata(question: Question) {
);
if (!_.isEqual(dependencies, dependenciesRef.current)) {
dependenciesRef.current = dependencies;
- loadMetadata(question.datasetQuery());
+ loadMetadata(question.datasetQuery(), true);
}
}, [question, loadMetadata]);
- if (!isInitiallyLoaded) {
- const query = question.query();
- const sourceTableId = Lib.sourceTableOrCardId(query);
- const sourceTable =
- sourceTableId != null
- ? Lib.tableOrCardMetadata(query, sourceTableId)
- : null;
- if (!isLoading && (sourceTableId == null || sourceTable != null)) {
- setIsInitiallyLoaded(true);
- }
- }
-
- return { isInitiallyLoaded };
+ return {
+ isLoading: !isSourceTableLoaded,
+ error,
+ };
}
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/index.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/index.ts
new file mode 100644
index 00000000000..b3dd24aecfc
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/index.ts
@@ -0,0 +1 @@
+export * from "./use-query-question";
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
new file mode 100644
index 00000000000..3cf0268e255
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
@@ -0,0 +1,44 @@
+import { useMemo } from "react";
+
+import { useSelector } from "metabase/lib/redux";
+import { getMetadata } from "metabase/selectors/metadata";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import type { VisualizationSettings } from "metabase-types/api";
+
+const DEFAULT_VIZ_SETTINGS: VisualizationSettings = {
+ "table.pivot": false,
+};
+
+export function useQueryQuestion(
+ query: Lib.Query,
+ proposedQuery: Lib.Query | undefined,
+ setQuery: (newQuery: Lib.Query) => void,
+) {
+ const metadata = useSelector(getMetadata);
+
+ const { question, proposedQuestion } = useMemo(
+ () => ({
+ question: Question.create({
+ dataset_query: Lib.toJsQuery(query),
+ metadata,
+ visualization_settings: DEFAULT_VIZ_SETTINGS,
+ }),
+ proposedQuestion:
+ proposedQuery != null
+ ? Question.create({
+ dataset_query: Lib.toJsQuery(proposedQuery),
+ metadata,
+ visualization_settings: DEFAULT_VIZ_SETTINGS,
+ })
+ : undefined,
+ }),
+ [query, proposedQuery, metadata],
+ );
+
+ const setQuestion = (newQuestion: Question) => {
+ setQuery(newQuestion.query());
+ };
+
+ return { question, proposedQuestion, setQuestion };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/index.ts b/frontend/src/metabase/querying/editor/hooks/use-query-results/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/hooks/use-query-results/index.ts
rename to frontend/src/metabase/querying/editor/hooks/use-query-results/index.ts
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts b/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts
new file mode 100644
index 00000000000..3506ac77278
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts
@@ -0,0 +1,72 @@
+import { useMemo, useRef } from "react";
+
+import { useLazyGetAdhocQueryQuery } from "metabase/api";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import { normalizeParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
+
+import type { QueryEditorUiState } from "../../types";
+
+export function useQueryResults(
+ question: Question,
+ uiState: QueryEditorUiState,
+ setUiState: (newUiState: QueryEditorUiState) => void,
+) {
+ const { lastRunQuery } = uiState;
+ const [runAdhocQuery, { data = null, isFetching: isRunning = false }] =
+ useLazyGetAdhocQueryQuery();
+ const abortRef = useRef<() => void>();
+
+ const { result, rawSeries, isRunnable, isResultDirty } = useMemo(() => {
+ const lastRunQuestion = lastRunQuery
+ ? Question.create({
+ dataset_query: lastRunQuery,
+ metadata: question.metadata(),
+ visualization_settings: question.settings(),
+ })
+ : null;
+ const rawSeries =
+ lastRunQuestion && data
+ ? [{ card: lastRunQuestion.card(), data: data.data }]
+ : null;
+ const isRunnable = Lib.canRun(question.query(), question.type());
+ const isResultDirty =
+ lastRunQuestion == null ||
+ !Lib.areLegacyQueriesEqual(
+ question.datasetQuery(),
+ lastRunQuestion.datasetQuery(),
+ );
+
+ return {
+ result: data,
+ rawSeries,
+ isRunnable,
+ isResultDirty,
+ };
+ }, [question, data, lastRunQuery]);
+
+ const runQuery = async () => {
+ const result = runAdhocQuery({
+ ...question.datasetQuery(),
+ parameters: normalizeParameters(question.parameters()),
+ });
+ abortRef.current = result.abort;
+ await result;
+ setUiState({ ...uiState, lastRunQuery: question.datasetQuery() });
+ };
+
+ const cancelQuery = () => {
+ abortRef.current?.();
+ abortRef.current = undefined;
+ };
+
+ return {
+ result,
+ rawSeries,
+ isRunnable,
+ isRunning,
+ isResultDirty,
+ runQuery,
+ cancelQuery,
+ };
+}
diff --git a/frontend/src/metabase/querying/editor/types.ts b/frontend/src/metabase/querying/editor/types.ts
new file mode 100644
index 00000000000..a1a7b14e275
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/types.ts
@@ -0,0 +1,46 @@
+import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker/types";
+import type { DataPickerItem } from "metabase/common/components/Pickers/DataPicker/types";
+import type { SelectionRange } from "metabase/query_builder/components/NativeQueryEditor/types";
+import type {
+ Database,
+ DatasetQuery,
+ NativeQuerySnippet,
+ RecentCollectionItem,
+} from "metabase-types/api";
+
+export type QueryEditorSidebarType =
+ | "data-reference"
+ | "snippet"
+ | "native-query";
+
+export type QueryEditorModalType = "preview-query";
+
+export type QueryEditorDataPickerItem =
+ | DataPickerItem
+ | CollectionPickerItem
+ | RecentCollectionItem;
+
+export type QueryEditorDatabasePickerItem = Omit<
+ Database,
+ "tables" | "schemas"
+>;
+
+export type QueryEditorUiState = {
+ lastRunQuery: DatasetQuery | null;
+ selectionRange: SelectionRange[];
+ modalSnippet:
+ | NativeQuerySnippet
+ | Partial<Omit<NativeQuerySnippet, "id">>
+ | null;
+ modalType: QueryEditorModalType | null;
+ sidebarType: QueryEditorSidebarType | null;
+};
+
+export type QueryEditorUiOptions = {
+ convertToNativeTitle?: string;
+ convertToNativeButtonLabel?: string;
+ shouldDisableDataPickerItem?: (item: QueryEditorDataPickerItem) => boolean;
+ shouldDisableDatabasePickerItem?: (
+ item: QueryEditorDatabasePickerItem,
+ ) => boolean;
+};
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
index 42471146fa0..d6c454a086f 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
@@ -29,15 +29,19 @@ const BUTTON_TITLE = {
},
};
+type NotebookNativePreviewProps = {
+ question: Question;
+ title?: string;
+ buttonTitle?: string;
+ onConvertClick: (newQuestion: Question) => void;
+};
+
export const NotebookNativePreview = ({
question,
- onConvertClick,
+ title,
buttonTitle,
-}: {
- question: Question;
- onConvertClick: (newQuestion: Question) => void;
- buttonTitle?: string;
-}) => {
+ onConvertClick,
+}: NotebookNativePreviewProps) => {
const database = question.database();
const engine = database?.engine;
const engineType = getEngineNativeType(engine);
@@ -85,7 +89,7 @@ export const NotebookNativePreview = ({
ta="start"
p="1.5rem"
>
- {TITLE[engineType]}
+ {title ?? TITLE[engineType]}
</Box>
<Flex
style={{