The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Update Transforms detail view (#66532)
Andersond85ffad7cbfc
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex 3a3cebeafd8..46f7a5f4495 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -15,6 +15,7 @@ export const DataStudio = {header: () => cy.findByTestId("transforms-header"),list: () => cy.findByTestId("transforms-list"),saveChangesButton: () => DataStudio.Transforms.queryEditor().button("Save"),+ editDefinition: () => cy.findByRole("link", { name: "Edit definition" }),queryEditor: () => cy.findByTestId("transform-query-editor"),runTab: () => DataStudio.Transforms.header().findByText("Run"),targetTab: () => DataStudio.Transforms.header().findByText("Target"),diff --git a/e2e/test/scenarios/actions/model-actions.cy.spec.js b/e2e/test/scenarios/actions/model-actions.cy.spec.jsindex e34191f5ebf..b0e8e3b7fe4 100644--- a/e2e/test/scenarios/actions/model-actions.cy.spec.js+++ b/e2e/test/scenarios/actions/model-actions.cy.spec.js@@ -812,9 +812,11 @@ function openActionEditorFor(actionName, { isReadOnly = false } = {}) {}function assertQueryEditorDisabled() {- // Ace doesn't act as a normal input, so we can't use `should("be.disabled")`- // Instead we'd assert that a user can't type in the editor- H.fillActionQuery("QWERTY");+ H.NativeEditor.get().click();+ H.NativeEditor.get().should("not.be.focused");+ H.NativeEditor.get().should("have.attr", "contenteditable", "false");++ H.NativeEditor.type("QWERTY", { focus: false });cy.findByText("QWERTY").should("not.exist");}diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.tsindex 3c93afebca2..c35c4174915 100644--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts@@ -404,6 +404,9 @@ LIMIT5`;createMbqlTransform({ visitTransform: true });+ H.DataStudio.Transforms.editDefinition().click();+ cy.url().should("include", "/edit");+getQueryEditor().findByLabelText("View SQL").click();H.sidebar().should("be.visible");H.NativeEditor.value().should("eq", EXPECTED_QUERY);@@ -1108,10 +1111,45 @@ LIMIT});describe("queries", () => {+ it("should show SQL query transforms in view-only mode", () => {+ cy.log("create a new transform");+ createSqlTransform({+ sourceQuery: `SELECT * FROM "${TARGET_SCHEMA}"."${SOURCE_TABLE}"`,+ visitTransform: true,+ });+ H.NativeEditor.get().should("have.attr", "contenteditable", "false");+ H.NativeEditor.get().should("have.attr", "aria-readonly", "true");+ H.DataStudio.Transforms.editDefinition().should("be.visible");+ H.DataStudio.Transforms.editDefinition().should(+ "have.attr",+ "href",+ "/data-studio/transforms/1/edit",+ );+ });++ it("should show MBQL transforms in view-only mode", () => {+ cy.log("create a new transform");+ createMbqlTransform({ visitTransform: true });+ H.getNotebookStep("data")+ .findByText("Animals")+ .closest("button")+ .should("be.disabled");+ H.DataStudio.Transforms.editDefinition().should("be.visible");+ H.DataStudio.Transforms.editDefinition().should(+ "have.attr",+ "href",+ "/data-studio/transforms/1/edit",+ );+ });+it("should be able to update a MBQL query", () => {cy.log("create a new transform");createMbqlTransform({ visitTransform: true });+ cy.log("visit edit mode");+ H.DataStudio.Transforms.editDefinition().click();+ cy.url().should("include", "/edit");+cy.log("update the query");H.getNotebookStep("data").button("Filter").click();H.popover().within(() => {@@ -1140,6 +1178,10 @@ LIMITvisitTransform: true,});+ cy.log("visit edit mode");+ H.DataStudio.Transforms.editDefinition().click();+ cy.url().should("include", "/edit");+cy.log("update the query");H.NativeEditor.type(" WHERE name = 'Duck'");getQueryEditor().button("Save").click();@@ -1393,6 +1435,9 @@ LIMITit("should be possible to cancel a SQL transform from the preview (metabase#64474)", () => {createSlowTransform(500);+ H.DataStudio.Transforms.editDefinition().click();+ cy.url().should("include", "/edit");+getQueryEditor().within(() => {cy.findAllByTestId("run-button").eq(0).click();cy.findByTestId("loading-indicator").should("be.visible");diff --git a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.tsindex 3336e2cd1ab..2e94cfc56b2 100644--- a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts@@ -185,12 +185,18 @@ describe("scenarios > dependencies > dependency checks", () => {});describe("transforms", () => {+ const goToEditorAndType = (queryString: string) => {+ H.DataStudio.Transforms.editDefinition().click();+ cy.url().should("include", "/edit");+ H.NativeEditor.clear().type(queryString);+ };+it("should be able to confirm or cancel breaking changes to a SQL transform after it was run", () => {createSqlTransformWithDependentMbqlQuestions();cy.log("make breaking changes");cy.get<number>("@transformId").then(H.visitTransform);- H.NativeEditor.clear().type('SELECT name FROM "Schema A"."Animals"');+ goToEditorAndType('SELECT name FROM "Schema A"."Animals"');cy.log("cancel breaking changes");H.DataStudio.Transforms.saveChangesButton().click();@@ -202,6 +208,8 @@ describe("scenarios > dependencies > dependency checks", () => {});cy.get("@updateTransform.all").should("have.length", 0);+ goToEditorAndType('SELECT name FROM "Schema A"."Animals"');+cy.log("confirm breaking changes");H.DataStudio.Transforms.saveChangesButton().click();H.modal().within(() => {@@ -216,9 +224,7 @@ describe("scenarios > dependencies > dependency checks", () => {it("should not show a confirmation if there are no breaking changes when updating a SQL transform after it was run", () => {createSqlTransformWithDependentMbqlQuestions();cy.get<number>("@transformId").then(H.visitTransform);- H.NativeEditor.clear().type(- 'SELECT score, name FROM "Schema A"."Animals"',- );+ goToEditorAndType('SELECT score, name FROM "Schema A"."Animals"');H.DataStudio.Transforms.saveChangesButton().click();cy.wait("@updateTransform");});@@ -228,6 +234,7 @@ describe("scenarios > dependencies > dependency checks", () => {cy.log("make breaking changes");cy.get<number>("@transformId").then(H.visitTransform);+ H.DataStudio.Transforms.editDefinition().click();H.getNotebookStep("data").findByLabelText("Pick columns").click();H.popover().findByLabelText("Score").click();@@ -241,6 +248,10 @@ describe("scenarios > dependencies > dependency checks", () => {});cy.get("@updateTransform.all").should("have.length", 0);+ H.DataStudio.Transforms.editDefinition().click();+ H.getNotebookStep("data").findByLabelText("Pick columns").click();+ H.popover().findByLabelText("Score").click();+cy.log("confirm breaking changes");H.DataStudio.Transforms.saveChangesButton().click();H.modal().within(() => {@@ -254,6 +265,7 @@ describe("scenarios > dependencies > dependency checks", () => {it("should not show a confirmation if there are no breaking changes when updating a MBQL transform before it was run", () => {createMbqlTransformWithDependentSqlTransforms();cy.get<number>("@transformId").then(H.visitTransform);+ H.DataStudio.Transforms.editDefinition().click();H.getNotebookStep("data").button("Sort").click();H.popover().findByText("Score").click();H.DataStudio.Transforms.saveChangesButton().click();diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsxindex 562e9d93b2e..571ffdcc29f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";import { PLUGIN_METABOT } from "metabase/plugins";-import { Box, Flex, Stack } from "metabase/ui";+import { Flex, Stack } from "metabase/ui";type SectionLayoutProps = {children?: ReactNode;@@ -11,9 +11,9 @@ export function SectionLayout({ children }: SectionLayoutProps) {return (<Stack h="100%" gap={0} bg="bg-light"><Flex flex={1} mih={0} miw={0}>- <Box flex={1} miw={0}>+ <Stack flex={1} miw={0} gap={0}>{children}- </Box>+ </Stack><PLUGIN_METABOT.MetabotDataStudioSidebar /></Flex></Stack>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.cssindex 2076c912ff4..a6f0768ef08 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css@@ -1,5 +1,6 @@.nav {border-right: 1px solid var(--mb-color-border);+ overflow: auto;}.opened {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsxindex fb94ea08b2e..fe67d335945 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -22,6 +22,8 @@ import {TextInput,} from "metabase/ui";import { CreateLibraryModal } from "metabase-enterprise/data-studio/common/components/CreateLibraryModal";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import { Table } from "metabase-enterprise/data-studio/common/components/Table";import { useTreeFilter } from "metabase-enterprise/data-studio/common/components/Table/useTreeFilter";import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";@@ -175,13 +177,19 @@ export function LibrarySectionLayout() {return (<><SectionLayout>- <Stack+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs>{t`Library`}</DataStudioBreadcrumbs>+ }px="3.5rem"- pt="4rem"- pb="2rem"+ py={0}+ />+ <Stackbg="background-light"- h="100%"data-testid="library-page"+ pb="2rem"+ px="3.5rem"+ style={{ overflow: "hidden" }}><Flex gap="md"><TextInputdiff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsxdeleted file mode 100644index 0368bb94db3..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsx+++ /dev/null@@ -1,21 +0,0 @@-import type { ReactNode } from "react";--import { PLUGIN_METABOT } from "metabase/plugins";-import { Box, Flex } from "metabase/ui";--interface TransformsSectionHeaderProps {- leftSection?: ReactNode;-}--export const TransformsSectionHeader = ({- leftSection: breadcrumbs,-}: TransformsSectionHeaderProps) => {- return (- <Flex px="3.5rem" my="md">- {breadcrumbs}- <Box ml="auto">- <PLUGIN_METABOT.MetabotDataStudioButton />- </Box>- </Flex>- );-};diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/index.tsnew file mode 100644index 00000000000..b394b267f4f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/index.ts@@ -0,0 +1 @@+export { DataStudioBreadcrumbs } from "./DataStudioBreadcrumbs";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.cssdeleted file mode 100644index 3928ba9b966..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css+++ /dev/null@@ -1,3 +0,0 @@-.header {- border-bottom: 1px solid var(--mb-color-border);-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsxindex 0c556301bc5..5063cba29a4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx@@ -1,24 +1,33 @@-import cx from "classnames";import type { ReactNode } from "react";import { Link } from "react-router";import { t } from "ttag";import EditableText from "metabase/common/components/EditableText";import { useSelector } from "metabase/lib/redux";+import { PLUGIN_METABOT } from "metabase/plugins";import { getLocation } from "metabase/selectors/routing";-import type { GroupProps, IconName } from "metabase/ui";-import { Box, Button, FixedSizeIcon, Group, Stack, Tooltip } from "metabase/ui";+import {+ Box,+ Button,+ FixedSizeIcon,+ Flex,+ Group,+ type IconName,+ Stack,+ type StackProps,+ Tooltip,+} from "metabase/ui";-import S from "./PaneHeader.module.css";import type { PaneHeaderTab } from "./types";-interface PaneHeaderProps extends Omit<GroupProps, "title"> {- title: ReactNode;+interface PaneHeaderProps extends Omit<StackProps, "title"> {+ title?: ReactNode;icon?: IconName;menu?: ReactNode;tabs?: ReactNode;actions?: ReactNode;breadcrumbs?: ReactNode;+ showMetabotButton?: boolean;}export const PaneHeader = ({@@ -29,33 +38,40 @@ export const PaneHeader = ({tabs,actions,breadcrumbs,+ showMetabotButton,...rest}: PaneHeaderProps) => {return (- <Group- className={cx(S.header, className)}- px="lg"- py="md"- justify="space-between"- gap="sm"- wrap="nowrap"- {...rest}- >- <Stack gap="sm">- {breadcrumbs && (- <Box mb="lg" mt="sm">- {breadcrumbs}- </Box>- )}- <Group align="center" gap="xs" wrap="nowrap">- {icon && <FixedSizeIcon name={icon} c="brand" size={20} />}- {title}- {menu}- </Group>- {tabs}- </Stack>- {actions}- </Group>+ <Stack px="lg" py="md" gap={0} {...rest}>+ {(breadcrumbs || showMetabotButton) && (+ <Flex mb="md" mt="md" h="2rem" w="100%">+ {breadcrumbs}+ {showMetabotButton && (+ <Box ml="auto">+ <PLUGIN_METABOT.MetabotDataStudioButton />+ </Box>+ )}+ </Flex>+ )}+ <Group+ className={className}+ gap="sm"+ justify="space-between"+ wrap="nowrap"+ >+ <Stack gap="sm" w="100%">+ {title && (+ <Group align="center" gap="sm" wrap="nowrap">+ {icon && <FixedSizeIcon name={icon} c="brand" size={20} />}+ {title}+ {menu}+ </Group>+ )}+ {tabs}+ </Stack>+ {actions}+ </Group>+ </Stack>);};@@ -146,6 +162,7 @@ type PaneHeaderActionsProps = {isValid?: boolean;isDirty?: boolean;isSaving?: boolean;+ alwaysVisible?: boolean;onSave: () => void;onCancel: () => void;};@@ -155,17 +172,18 @@ export function PaneHeaderActions({isValid = true,isDirty = false,isSaving = false,+ alwaysVisible = false,onSave,onCancel,}: PaneHeaderActionsProps) {const canSave = isDirty && !isSaving && isValid;- if (!isDirty && !isSaving) {+ if (!isDirty && !isSaving && !alwaysVisible) {return null;}return (- <Group>+ <Group wrap="nowrap"><Button onClick={onCancel}>{t`Cancel`}</Button><Tooltip label={errorMessage} disabled={errorMessage == null}><Button variant="filled" disabled={!canSave} onClick={onSave}>diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex 01cb38bd1fe..c765ac656b5 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -251,7 +251,7 @@ function getSourceCode(function getTransformUrl(transform: SuggestedTransform): string {return match(transform)- .with({ id: P.number }, ({ id }) => Urls.transform(id))+ .with({ id: P.number }, ({ id }) => Urls.transformEdit(id)).with({ source: { type: "python" } }, () => Urls.newPythonTransform()).with({ source: { type: "query" } }, () => Urls.newNativeTransform()).exhaustive();diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsxindex f85d5f99194..842008c224a 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx@@ -29,14 +29,17 @@ export const MetabotDataStudioButton = () => {return (<Tooltip label={label}><ActionIcon- p="sm"- h="2.25rem"- w="2.25rem"+ h="2rem"+ w="2rem"disabled={disabled}aria-label={label}onClick={handleClick}>- <Icon c={disabled ? undefined : "text-primary"} name="metabot" />+ <Icon+ c={disabled ? undefined : "text-primary"}+ name="metabot"+ size={16}+ /></ActionIcon></Tooltip>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsxnew file mode 100644index 00000000000..3a3ab9b2249--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx@@ -0,0 +1,49 @@+import { t } from "ttag";++import Link from "metabase/common/components/Link/Link";+import * as Urls from "metabase/lib/urls";+import { Button, Group } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import {+ PaneHeader,+ PanelHeaderTitle,+} from "metabase-enterprise/data-studio/common/components/PaneHeader";++type PythonLibraryEditorHeaderProps = {+ isDirty?: boolean;+ isSaving?: boolean;+ onSave: () => void;+ onRevert: () => void;+};++export const PythonLibraryEditorHeader = ({+ isDirty,+ isSaving,+ onSave,+ onRevert,+}: PythonLibraryEditorHeaderProps) => {+ return (+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link to={Urls.transformList()}>{t`Transforms`}</Link>+ {t`Python library`}+ </DataStudioBreadcrumbs>+ }+ title={<PanelHeaderTitle>{t`Python library`}</PanelHeaderTitle>}+ actions={+ (isDirty || isSaving) && (+ <Group wrap="nowrap">+ <Button disabled={isSaving} onClick={onRevert}>+ {t`Revert`}+ </Button>+ <Button variant="filled" disabled={isSaving} onClick={onSave}>+ {t`Save`}+ </Button>+ </Group>+ )+ }+ data-testid="python-library-header"+ />+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsxindex e8a69884a59..67e59f1d060 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx@@ -3,25 +3,19 @@ import type { Route } from "react-router";import { t } from "ttag";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";-import Link from "metabase/common/components/Link/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { isResourceNotFoundError } from "metabase/lib/errors";-import * as Urls from "metabase/lib/urls";+import type * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";-import { Box, Button, Flex, Group } from "metabase/ui";+import { Box, Flex } from "metabase/ui";import {useGetPythonLibraryQuery,useUpdatePythonLibraryMutation,} from "metabase-enterprise/api/python-transform-library";-import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";-import {- PaneHeader,- PanelHeaderTitle,-} from "metabase-enterprise/data-studio/common/components/PaneHeader";import { PythonEditor } from "../../components/PythonEditor";+import { PythonLibraryEditorHeader } from "./PythonLibraryEditorHeader";import S from "./PythonLibraryEditorPage.module.css";type PythonLibraryEditorPageProps = {@@ -96,15 +90,7 @@ export function PythonLibraryEditorPage({return (<><Flex h="100%" w="100%" gap={0} direction="column">- <TransformsSectionHeader- leftSection={- <DataStudioBreadcrumbs>- <Link to={Urls.transformList()}>{t`Transforms`}</Link>- {t`Python library`}- </DataStudioBreadcrumbs>- }- />- <LibraryEditorHeader+ <PythonLibraryEditorHeaderonSave={handleSave}onRevert={handleRevert}isDirty={isDirty}@@ -122,35 +108,3 @@ export function PythonLibraryEditorPage({</>);}--export function LibraryEditorHeader({- isDirty,- isSaving,- onSave,- onRevert,-}: {- isDirty?: boolean;- isSaving?: boolean;- onSave: () => void;- onRevert: () => void;-}) {- return (- <PaneHeader- pt={0}- title={<PanelHeaderTitle>{t`Python library`}</PanelHeaderTitle>}- actions={- (isDirty || isSaving) && (- <Group>- <Button disabled={isSaving} onClick={onRevert}>- {t`Revert`}- </Button>- <Button variant="filled" disabled={isSaving} onClick={onSave}>- {t`Save`}- </Button>- </Group>- )- }- data-testid="python-library-header"- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsxindex 4d541a9145f..0548b49a093 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx@@ -1,20 +1,21 @@import type { ReactNode } from "react";-import { Flex, Stack } from "metabase/ui";+import { Flex, type FlexProps, Stack } from "metabase/ui";import S from "./ColumnLayout.module.css";type ColumnLayoutProps = {children?: ReactNode;"data-testid"?: string;-};+} & FlexProps;export function ColumnLayout({children,"data-testid": dataTestId,+ ...flexProps}: ColumnLayoutProps) {return (- <Flex direction="column" h="100%" data-testid={dataTestId}>+ <Flex direction="column" h="100%" data-testid={dataTestId} {...flexProps}>{children}</Flex>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton.tsxnew file mode 100644index 00000000000..ac4597271e7--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton.tsx@@ -0,0 +1,26 @@+import { Link } from "react-router";+import { t } from "ttag";++import { transformEdit } from "metabase/lib/urls";+import { Button, type ButtonProps } from "metabase/ui";+import type { TransformId } from "metabase-types/api";++type EditDefinitionButtonProps = {+ transformId: TransformId;+} & ButtonProps;++export const EditDefinitionButton = ({+ transformId,+ ...buttonProps+}: EditDefinitionButtonProps) => {+ return (+ <Button+ component={Link}+ style={{ flexShrink: 0 }}+ to={transformEdit(transformId)}+ {...buttonProps}+ >+ {t`Edit definition`}+ </Button>+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsxindex 94ed1f7f280..d53bb17435c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx@@ -7,8 +7,13 @@ import {} from "metabase/querying/editor/components/QueryEditor";import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";-import type { Database, QueryTransformSource } from "metabase-types/api";+import type {+ Database,+ QueryTransformSource,+ TransformId,+} from "metabase-types/api";+import { EditDefinitionButton } from "./EditDefinitionButton";import { getEditorOptions } from "./utils";type TransformEditorProps = {@@ -20,6 +25,8 @@ type TransformEditorProps = {onChangeUiState: (state: QueryEditorUiState) => void;onAcceptProposed: () => void;onRejectProposed: () => void;+ readOnly?: boolean;+ transformId?: TransformId;};export function TransformEditor({@@ -31,6 +38,8 @@ export function TransformEditor({onChangeUiState,onAcceptProposed,onRejectProposed,+ readOnly,+ transformId,}: TransformEditorProps) {const metadata = useSelector(getMetadata);const query = useMemo(@@ -44,7 +53,10 @@ export function TransformEditor({: undefined,[proposedSource, metadata],);- const uiOptions = useMemo(() => getEditorOptions(databases), [databases]);+ const uiOptions = useMemo(+ () => getEditorOptions(databases, readOnly),+ [databases, readOnly],+ );const handleQueryChange = (query: Lib.Query) => {const newSource: QueryTransformSource = {@@ -66,6 +78,19 @@ export function TransformEditor({onChangeUiState={onChangeUiState}onAcceptProposed={onAcceptProposed}onRejectProposed={onRejectProposed}+ topBarInnerContent={+ readOnly &&+ !!transformId && (+ <EditDefinitionButton+ bg="transparent"+ fz="sm"+ h="1.5rem"+ px="sm"+ size="xs"+ transformId={transformId}+ />+ )+ }/>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.tsindex e0802af9148..7d750d044f1 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts@@ -5,7 +5,10 @@ import type { Database } from "metabase-types/api";import { doesDatabaseSupportTransforms } from "../../utils";-export function getEditorOptions(databases: Database[]): QueryEditorUiOptions {+export function getEditorOptions(+ databases: Database[],+ readOnly?: boolean,+): QueryEditorUiOptions {return {canConvertToNative: true,convertToNativeTitle: t`SQL for this transform`,@@ -38,5 +41,6 @@ export function getEditorOptions(databases: Database[]): QueryEditorUiOptions {return false;},shouldShowLibrary: false,+ readOnly,};}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsxindex 72af4417557..6995ce26951 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx@@ -3,116 +3,47 @@ import { t } from "ttag";import Link from "metabase/common/components/Link/Link";import * as Urls from "metabase/lib/urls";-import { useMetadataToasts } from "metabase/metadata/hooks";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { useUpdateTransformMutation } from "metabase-enterprise/api";-import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";-import {- PaneHeader,- PaneHeaderInput,- type PaneHeaderTab,- PaneHeaderTabs,-} from "metabase-enterprise/data-studio/common/components/PaneHeader";-import type { Transform, TransformId } from "metabase-types/api";--import { NAME_MAX_LENGTH } from "../../constants";+import type { StackProps } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";+import type { Transform } from "metabase-types/api";import { TransformMoreMenu } from "./TransformMoreMenu";+import { TransformNameInput } from "./TransformNameInput";+import { TransformTabs } from "./TransformTabs";type TransformHeaderProps = {- transform: Transform;actions?: ReactNode;hasMenu?: boolean;-};+ isEditMode?: boolean;+ transform: Transform;+} & Omit<StackProps, "title">;export function TransformHeader({transform,actions,hasMenu = true,+ isEditMode = false,+ ...restProps}: TransformHeaderProps) {return (- <>- <TransformsSectionHeader- leftSection={- <DataStudioBreadcrumbs>- <Link to={Urls.transformList()}>{t`Transforms`}</Link>- {transform.name}- </DataStudioBreadcrumbs>- }- />- <PaneHeader- title={<TransformNameInput transform={transform} />}- menu={hasMenu && <TransformMoreMenu transform={transform} />}- tabs={<TransformTabs transform={transform} />}- actions={actions}- data-testid="transforms-header"- />- </>- );-}--type TransformNameInputProps = {- transform: Transform;-};--function TransformNameInput({ transform }: TransformNameInputProps) {- const [updateTransform] = useUpdateTransformMutation();- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();-- const handleChangeName = async (newName: string) => {- const { error } = await updateTransform({- id: transform.id,- name: newName,- });-- if (error) {- sendErrorToast(t`Failed to update transform name`);- } else {- sendSuccessToast(t`Transform name updated`);- }- };-- return (- <PaneHeaderInput- initialValue={transform.name}- maxLength={NAME_MAX_LENGTH}- onChange={handleChangeName}+ <PaneHeader+ px={0}+ py={0}+ title={<TransformNameInput transform={transform} />}+ icon="transform"+ menu={hasMenu && <TransformMoreMenu transform={transform} />}+ tabs={!isEditMode && <TransformTabs transform={transform} />}+ actions={actions}+ data-testid="transforms-header"+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link to={Urls.transformList()}>{t`Transforms`}</Link>+ {transform.name}+ </DataStudioBreadcrumbs>+ }+ showMetabotButton+ {...restProps}/>);}--type TransformTabsProps = {- transform: Transform;-};--function TransformTabs({ transform }: TransformTabsProps) {- const tabs = getTabs(transform.id);- return <PaneHeaderTabs tabs={tabs} />;-}--function getTabs(id: TransformId): PaneHeaderTab[] {- const tabs: PaneHeaderTab[] = [- {- label: t`Definition`,- to: Urls.transform(id),- },- {- label: t`Run`,- to: Urls.transformRun(id),- },- {- label: t`Target`,- to: Urls.transformTarget(id),- },- ];-- if (PLUGIN_DEPENDENCIES.isEnabled) {- tabs.push({- label: t`Dependencies`,- to: Urls.transformDependencies(id),- });- }-- return tabs;-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.unit.spec.tsxnew file mode 100644index 00000000000..ff3fbf0d8a2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx@@ -0,0 +1,82 @@+import { Route } from "react-router";++import { renderWithProviders, screen } from "__support__/ui";+import { createMockTransform } from "metabase-types/api/mocks";++import { TransformHeader } from "./TransformHeader";++type SetupOpts = {+ hasMenu?: boolean;+ isEditMode?: boolean;+};++function setup({ hasMenu = true, isEditMode = false }: SetupOpts = {}) {+ const transform = createMockTransform({ id: 1, name: "Test Transform" });++ renderWithProviders(+ <Route+ component={() => (+ <TransformHeader+ transform={transform}+ hasMenu={hasMenu}+ isEditMode={isEditMode}+ />+ )}+ path="/"+ />,+ {+ withRouter: true,+ initialRoute: "/",+ },+ );++ return { transform };+}++describe("TransformHeader", () => {+ beforeEach(() => {+ jest.spyOn(console, "error").mockImplementation(() => {});+ });++ afterEach(() => {+ jest.restoreAllMocks();+ });++ describe("tabs visibility", () => {+ it("should render tabs when isEditMode is false", () => {+ setup({ isEditMode: false });++ expect(+ screen.getByRole("link", { name: "Definition" }),+ ).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Run" })).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Target" })).toBeInTheDocument();+ });++ it("should not render tabs when isEditMode is true", () => {+ setup({ isEditMode: true });++ expect(+ screen.queryByRole("link", { name: "Definition" }),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole("link", { name: "Run" }),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole("link", { name: "Target" }),+ ).not.toBeInTheDocument();+ });+ });++ describe("menu visibility", () => {+ it("should render menu when hasMenu is true", () => {+ setup({ hasMenu: true });+ expect(screen.getByLabelText("ellipsis icon")).toBeInTheDocument();+ });++ it("should not render menu when hasMenu is false", () => {+ setup({ hasMenu: false });+ expect(screen.queryByLabelText("ellipsis icon")).not.toBeInTheDocument();+ });+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsxnew file mode 100644index 00000000000..445f46f0199--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformNameInput.tsx@@ -0,0 +1,37 @@+import { t } from "ttag";++import { useMetadataToasts } from "metabase/metadata/hooks";+import { useUpdateTransformMutation } from "metabase-enterprise/api";+import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";+import { NAME_MAX_LENGTH } from "metabase-enterprise/transforms/constants";+import type { Transform } from "metabase-types/api";++type TransformNameInputProps = {+ transform: Transform;+};++export const TransformNameInput = ({ transform }: TransformNameInputProps) => {+ const [updateTransform] = useUpdateTransformMutation();+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();++ const handleChangeName = async (newName: string) => {+ const { error } = await updateTransform({+ id: transform.id,+ name: newName,+ });++ if (error) {+ sendErrorToast(t`Failed to update transform name`);+ } else {+ sendSuccessToast(t`Transform name updated`);+ }+ };++ return (+ <PaneHeaderInput+ initialValue={transform.name}+ maxLength={NAME_MAX_LENGTH}+ onChange={handleChangeName}+ />+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsxnew file mode 100644index 00000000000..1cb699c0b75--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformTabs.tsx@@ -0,0 +1,44 @@+import { t } from "ttag";++import * as Urls from "metabase/lib/urls";+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import {+ type PaneHeaderTab,+ PaneHeaderTabs,+} from "metabase-enterprise/data-studio/common/components/PaneHeader";+import type { Transform, TransformId } from "metabase-types/api";++type TransformTabsProps = {+ transform: Transform;+};++export const TransformTabs = ({ transform }: TransformTabsProps) => {+ const tabs = getTabs(transform.id);+ return <PaneHeaderTabs tabs={tabs} />;+};++function getTabs(id: TransformId): PaneHeaderTab[] {+ const tabs: PaneHeaderTab[] = [+ {+ label: t`Definition`,+ to: Urls.transform(id),+ },+ {+ label: t`Run`,+ to: Urls.transformRun(id),+ },+ {+ label: t`Target`,+ to: Urls.transformTarget(id),+ },+ ];++ if (PLUGIN_DEPENDENCIES.isEnabled) {+ tabs.push({+ label: t`Dependencies`,+ to: Urls.transformDependencies(id),+ });+ }++ return tabs;+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsxindex 496ba61260c..684a4224f41 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx@@ -11,8 +11,8 @@ import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { Button, Card, Flex, Icon, Stack, TextInput } from "metabase/ui";import { useListTransformJobsQuery } from "metabase-enterprise/api";-import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import { Table } from "metabase-enterprise/data-studio/common/components/Table";import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";import { ListLoadingState } from "metabase-enterprise/transforms/components/ListLoadingState";@@ -75,15 +75,19 @@ export const JobListPage = () => {return (<>- <TransformsSectionHeader- leftSection={<DataStudioBreadcrumbs>{t`Jobs`}</DataStudioBreadcrumbs>}+ <PaneHeader+ breadcrumbs={<DataStudioBreadcrumbs>{t`Jobs`}</DataStudioBreadcrumbs>}+ px="3.5rem"+ py={0}+ showMetabotButton/><Stack- px="3.5rem"- data-testid="transforms-job-list"- pb="2rem"bg="background-light"+ data-testid="transforms-job-list"h="100%"+ pb="2rem"+ px="3.5rem"+ style={{ overflow: "hidden" }}><Flex gap="0.5rem"><TextInputdiff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.cssdeleted file mode 100644index 6c501d14c20..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css+++ /dev/null@@ -1,3 +0,0 @@-.body {- overflow: auto;-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsxindex d72b51068b2..84311102add 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx@@ -10,14 +10,13 @@ import {useListTransformTagsQuery,useListTransformsQuery,} from "metabase-enterprise/api";-import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";import type { TransformRun } from "metabase-types/api";import { RunFilterList } from "./RunFilterList";import { RunList } from "./RunList";-import S from "./RunListPage.module.css";import { PAGE_SIZE } from "./constants";import { getParsedParams } from "./utils";@@ -29,21 +28,23 @@ export function RunListPage({ location }: RunListPageProps) {const params = getParsedParams(location);return (- <Stack- bg="bg-light"- className={S.body}- data-testid="transforms-run-list"- gap={0}- h="100%"- >- <TransformsSectionHeader- leftSection={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}+ <>+ <PaneHeader+ breadcrumbs={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}+ px="3.5rem"+ py={0}+ showMetabotButton/>- <Stack p="lg" pt={0} h="100%">+ <Stack+ px="3.5rem"+ h="100%"+ data-testid="transforms-run-list"+ style={{ overflow: "hidden" }}+ ><Box>{t`A list of when each transform ran.`}</Box><RunListPageBody params={params} /></Stack>- </Stack>+ </>);}@@ -109,7 +110,7 @@ function RunListPageBody({ params }: RunListPageBodyProps) {}return (- <Stack data-testid="run-list-page">+ <Stack><RunFilterList params={params} transforms={transforms} tags={tags} /><RunListruns={data.data}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsxindex 224e892c011..4b60e28327c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx@@ -43,7 +43,7 @@ export function TransformDependenciesPage({h="100%"data-testid="transforms-dependencies-content">- <TransformHeader transform={transform} />+ <TransformHeader transform={transform} px="3.5rem" /><PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{baseUrl: Urls.transformDependencies(transform.id),diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsxindex 51ce455686d..755e5c66936 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx@@ -10,8 +10,8 @@ import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { Card, Flex, Group, Icon, Stack, TextInput } from "metabase/ui";import { useListTransformsQuery } from "metabase-enterprise/api";-import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import { Table } from "metabase-enterprise/data-studio/common/components/Table";import { CreateTransformMenu } from "metabase-enterprise/transforms/components/CreateTransformMenu";import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";@@ -88,17 +88,20 @@ export const TransformListPage = () => {return (<>- <TransformsSectionHeader- leftSection={+ <PaneHeader+ breadcrumbs={<DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>}+ px="3.5rem"+ showMetabotButton+ py={0}/><Stack- px="3.5rem"+ bg="background-light"data-testid="transforms-list"pb="2rem"- bg="background-light"- h="100%"+ px="3.5rem"+ style={{ overflow: "hidden" }}><Flex gap="md"><TextInputdiff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsxnew file mode 100644index 00000000000..de1f8a50980--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx@@ -0,0 +1,71 @@+import { useMemo } from "react";++import { useSelector } from "metabase/lib/redux";+import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";+import { getMetadata } from "metabase/selectors/metadata";+import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";+import { EditDefinitionButton } from "metabase-enterprise/transforms/components/TransformEditor/EditDefinitionButton";+import { getValidationResult } from "metabase-enterprise/transforms/utils";+import * as Lib from "metabase-lib";+import type { DraftTransformSource, TransformId } from "metabase-types/api";++type Props = {+ handleCancel: VoidFunction;+ handleSave: () => Promise<void>;+ isDirty: boolean;+ isEditMode: boolean;+ isSaving: boolean;+ source: DraftTransformSource;+ transformId: TransformId;+};++export const TransformPaneHeaderActions = (props: Props) => {+ const {+ isDirty,+ source,+ handleSave,+ handleCancel,+ isSaving,+ isEditMode,+ transformId,+ } = props;+ const metadata = useSelector(getMetadata);++ const { validationResult, isNative } = useMemo(() => {+ if (source.type === "query") {+ const libQuery = Lib.fromJsQueryAndMetadata(metadata, source.query);+ const validationResult = getValidationResult(libQuery);+ return {+ validationResult,+ isNative: Lib.queryDisplayInfo(libQuery).isNative,+ };+ }++ return {+ validationResult:+ PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult(source),+ isNative: false,+ };+ }, [source, metadata]);+ const isPythonTransform = source.type === "python";++ if (!isPythonTransform && !isNative && !isEditMode) {+ return <EditDefinitionButton transformId={transformId} />;+ }++ if (!isEditMode && isNative) {+ return null;+ }++ return (+ <PaneHeaderActions+ alwaysVisible={!isPythonTransform && isEditMode}+ errorMessage={validationResult.errorMessage}+ isDirty={isDirty}+ isSaving={isSaving}+ isValid={validationResult.isValid}+ onCancel={handleCancel}+ onSave={handleSave}+ />+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsxnew file mode 100644index 00000000000..28df72be92d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx@@ -0,0 +1,150 @@+import { Route } from "react-router";++import { renderWithProviders, screen } from "__support__/ui";+import * as transformsUtils from "metabase-enterprise/transforms/utils";+import type { DraftTransformSource } from "metabase-types/api";++import { TransformPaneHeaderActions } from "./TransformPaneHeaderActions";++const mockQuerySource: DraftTransformSource = {+ type: "query",+ query: {+ database: 1,+ type: "query",+ query: {+ "source-table": 1,+ },+ },+};++type SetupOpts = {+ isDirty?: boolean;+ isEditMode?: boolean;+ isSaving?: boolean;+ source?: DraftTransformSource;+ isNative?: boolean;+};++function setup({+ isDirty = false,+ isEditMode = false,+ isSaving = false,+ source = mockQuerySource,+ isNative = false,+}: SetupOpts = {}) {+ const handleCancel = jest.fn();+ const handleSave = jest.fn().mockResolvedValue(undefined);++ const nativeSource: DraftTransformSource = {+ type: "query",+ query: {+ database: 1,+ type: "native",+ native: { query: "SELECT * FROM table" },+ },+ };++ const { unmount } = renderWithProviders(+ <Route+ component={() => (+ <TransformPaneHeaderActions+ handleCancel={handleCancel}+ handleSave={handleSave}+ isDirty={isDirty}+ isEditMode={isEditMode}+ isSaving={isSaving}+ source={isNative ? nativeSource : source}+ transformId={1}+ />+ )}+ path="/"+ />,+ {+ withRouter: true,+ initialRoute: "/",+ },+ );++ return { handleCancel, handleSave, unmount };+}++describe("TransformPaneHeaderActions", () => {+ beforeEach(() => {+ jest.spyOn(console, "error").mockImplementation(() => {});+ });++ afterEach(() => {+ jest.restoreAllMocks();+ jest.clearAllMocks();+ });++ describe("edit mode", () => {+ it("should render Save and Cancel", () => {+ setup({ isEditMode: true, isDirty: true });++ expect(screen.getByRole("button", { name: /save/i })).toBeInTheDocument();+ expect(+ screen.getByRole("button", { name: /cancel/i }),+ ).toBeInTheDocument();+ });++ it("should not render EditDefinitionButton", () => {+ setup({ isEditMode: true });+ expect(+ screen.queryByRole("link", { name: /edit definition/i }),+ ).not.toBeInTheDocument();+ });++ describe("button states", () => {+ const mockValidationResult = (isValid: boolean) => {+ jest.spyOn(transformsUtils, "getValidationResult").mockReturnValue({+ isValid,+ });+ };++ it("should disable Save button when not dirty", () => {+ mockValidationResult(true);+ setup({ isEditMode: true, isDirty: false });+ expect(screen.getByRole("button", { name: /save/i })).toBeDisabled();+ });++ it("should enable Save button when dirty", () => {+ mockValidationResult(true);+ setup({ isEditMode: true, isDirty: true });+ expect(screen.getByRole("button", { name: /save/i })).toBeEnabled();+ });++ it("should disable Save button when saving", () => {+ mockValidationResult(true);+ setup({ isEditMode: true, isDirty: true, isSaving: true });+ expect(screen.getByRole("button", { name: /save/i })).toBeDisabled();+ });++ it("should disable Save button when query is invalid", () => {+ mockValidationResult(false);+ setup({ isEditMode: true, isDirty: true });+ expect(screen.getByRole("button", { name: /save/i })).toBeDisabled();+ });+ });+ });++ describe("read-only mode (not edit mode)", () => {+ it("should render EditDefinitionButton", () => {+ setup({ isEditMode: false, isNative: false });+ expect(+ screen.getByRole("link", { name: /edit definition/i }),+ ).toBeInTheDocument();+ });++ it("should not render Save and Cancel", () => {+ setup({ isEditMode: false, isNative: true });++ expect(+ screen.queryByRole("button", { name: /cancel/i }),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole("button", { name: /save/i }),+ ).not.toBeInTheDocument();+ });+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.module.cssnew file mode 100644index 00000000000..16c3bc3888f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.module.css@@ -0,0 +1,7 @@+.visualization {+ background-color: var(--mb-color-bg-white);+ border-radius: var(--default-border-radius);+ border: 1px solid var(--mb-color-border);+ flex: 1;+ overflow: hidden;+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex c90f540e7a5..39874cfe902 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -1,12 +1,13 @@-import { useLayoutEffect, useMemo, useState } from "react";-import type { Route } from "react-router";+import { useEffect, useLayoutEffect, useState } from "react";+import type { Route, RouteProps } from "react-router";+import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";import { skipToken, useListDatabasesQuery } from "metabase/api";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSelector } from "metabase/lib/redux";+import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";import {@@ -14,21 +15,21 @@ import {PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";-import { getMetadata } from "metabase/selectors/metadata";-import { Stack } from "metabase/ui";+import { Box, Flex, Stack } from "metabase/ui";import {useGetTransformQuery,useUpdateTransformMutation,} from "metabase-enterprise/api";-import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";-import * as Lib from "metabase-lib";import type { Database, Transform } from "metabase-types/api";import { TransformEditor } from "../../components/TransformEditor";import { TransformHeader } from "../../components/TransformHeader";import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";import { useSourceState } from "../../hooks/use-source-state";-import { getValidationResult, isNotDraftSource } from "../../utils";+import { isNotDraftSource } from "../../utils";++import { TransformPaneHeaderActions } from "./TransformPaneHeaderActions";+import S from "./TransformQueryPage.module.css";type TransformQueryPageParams = {transformId: string;@@ -36,7 +37,7 @@ type TransformQueryPageParams = {type TransformQueryPageProps = {params: TransformQueryPageParams;- route: Route;+ route: RouteProps;};export function TransformQueryPage({ params, route }: TransformQueryPageProps) {@@ -74,7 +75,7 @@ export function TransformQueryPage({ params, route }: TransformQueryPageProps) {type TransformQueryPageBodyProps = {transform: Transform;databases: Database[];- route: Route;+ route: RouteProps;};function TransformQueryPageBody({@@ -94,19 +95,14 @@ function TransformQueryPageBody({transformId: transform.id,initialSource: transform.source,});+ const dispatch = useDispatch();const [uiState, setUiState] = useState(getInitialUiState);- const metadata = useSelector(getMetadata);const [updateTransform, { isLoading: isSaving }] =useUpdateTransformMutation();const { sendSuccessToast, sendErrorToast } = useMetadataToasts();+ const isEditMode = !!route.path?.includes("/edit");useRegisterMetabotTransformContext(transform, source);- const validationResult = useMemo(() => {- return source.type === "query"- ? getValidationResult(Lib.fromJsQueryAndMetadata(metadata, source.query))- : PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult(source);- }, [source, metadata]);-const {checkData,isCheckingDependencies,@@ -125,77 +121,103 @@ function TransformQueryPageBody({},});+ const handleResetRef = useLatest(() => {+ setSource(transform.source);+ setUiState(getInitialUiState());+ });++ useLayoutEffect(() => {+ handleResetRef.current();+ }, [transform.id, handleResetRef]);++ useEffect(() => {+ if (source.type !== "python" && !isEditMode) {+ setSourceAndRejectProposed(transform.source);+ }+ }, [source.type, isEditMode, setSourceAndRejectProposed, transform.source]);+const handleSave = async () => {if (isNotDraftSource(source)) {await handleInitialSave({id: transform.id,source,});++ if (isEditMode) {+ dispatch(push(Urls.transform(transform.id)));+ }}};const handleCancel = () => {setSourceAndRejectProposed(transform.source);- };- const handleResetRef = useLatest(() => {- setSource(transform.source);- setUiState(getInitialUiState());- });-- useLayoutEffect(() => {- handleResetRef.current();- }, [transform.id, handleResetRef]);+ if (isEditMode) {+ dispatch(push(Urls.transform(transform.id)));+ }+ };return (<><Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"+ align="stretch"data-testid="transform-query-editor"gap={0}+ h="100%"+ mx="auto"+ pb="sm"+ pos="relative"+ px="3.5rem"+ w="100%"><TransformHeadertransform={transform}actions={- <PaneHeaderActions- errorMessage={validationResult.errorMessage}- isValid={validationResult.isValid}+ <TransformPaneHeaderActions+ source={source}+ isSaving={isSaving}isDirty={isDirty}- isSaving={isSaving || isCheckingDependencies}- onSave={handleSave}- onCancel={handleCancel}+ handleSave={handleSave}+ handleCancel={handleCancel}+ transformId={transform.id}+ isEditMode={isEditMode}/>}- hasMenu={!isDirty}+ hasMenu={!isEditMode && !isDirty}+ isEditMode={isEditMode}+ pb="lg"/>- {source.type === "python" ? (- <PLUGIN_TRANSFORMS_PYTHON.TransformEditor- source={source}- proposedSource={- proposedSource?.type === "python" ? proposedSource : undefined- }- isDirty={isDirty}- onChangeSource={setSourceAndRejectProposed}- onAcceptProposed={acceptProposed}- onRejectProposed={rejectProposed}- />- ) : (- <TransformEditor- source={source}- proposedSource={- proposedSource?.type === "query" ? proposedSource : undefined- }- uiState={uiState}- databases={databases}- onChangeSource={setSourceAndRejectProposed}- onChangeUiState={setUiState}- onAcceptProposed={acceptProposed}- onRejectProposed={rejectProposed}- />- )}+ <Flex gap={0} className={S.visualization}>+ <Box w="100%">+ {source.type === "python" ? (+ <PLUGIN_TRANSFORMS_PYTHON.TransformEditor+ source={source}+ proposedSource={+ proposedSource?.type === "python" ? proposedSource : undefined+ }+ isDirty={isDirty}+ onChangeSource={setSourceAndRejectProposed}+ onAcceptProposed={acceptProposed}+ onRejectProposed={rejectProposed}+ />+ ) : (+ <TransformEditor+ source={source}+ proposedSource={+ proposedSource?.type === "query" ? proposedSource : undefined+ }+ uiState={uiState}+ readOnly={!isEditMode}+ databases={databases}+ onChangeSource={setSourceAndRejectProposed}+ onChangeUiState={setUiState}+ onAcceptProposed={acceptProposed}+ onRejectProposed={rejectProposed}+ transformId={transform.id}+ />+ )}+ </Box>+ </Flex></Stack>{isConfirmationShown && checkData != null && (<PLUGIN_DEPENDENCIES.CheckDependenciesModal@@ -206,7 +228,7 @@ function TransformQueryPageBody({/>)}<LeaveRouteConfirmModal- route={route}+ route={route as Route}isEnabled={isDirty && !isSaving && !isCheckingDependencies}onConfirm={rejectProposed}/>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsxindex 225b20bd17c..45e583c1d2b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx@@ -3,11 +3,11 @@ import { useState } from "react";import { skipToken } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";-import { Center } from "metabase/ui";+import { Box, Center } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";import type { Transform } from "metabase-types/api";-import { ColumnLayout, ColumnLayoutBody } from "../../components/ColumnLayout";+import { ColumnLayout } from "../../components/ColumnLayout";import { TransformHeader } from "../../components/TransformHeader";import { POLLING_INTERVAL } from "../../constants";import {@@ -50,11 +50,11 @@ export function TransformRunPage({ params }: TransformRunPageProps) {}return (- <ColumnLayout data-testid="transforms-run-content">+ <ColumnLayout data-testid="transforms-run-content" px="3.5rem"><TransformHeader transform={transform} />- <ColumnLayoutBody>+ <Box pt="3rem"><RunSection transform={transform} />- </ColumnLayoutBody>+ </Box></ColumnLayout>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsxindex 9d449db3011..39fba6dc67a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx@@ -3,11 +3,11 @@ import { useState } from "react";import { skipToken } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";-import { Center } from "metabase/ui";+import { Box, Center } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";import type { Transform } from "metabase-types/api";-import { ColumnLayout, ColumnLayoutBody } from "../../components/ColumnLayout";+import { ColumnLayout } from "../../components/ColumnLayout";import { TransformHeader } from "../../components/TransformHeader";import { POLLING_INTERVAL } from "../../constants";import {@@ -50,11 +50,11 @@ export function TransformTargetPage({ params }: TransformTargetPageProps) {}return (- <ColumnLayout data-testid="transforms-target-content">+ <ColumnLayout px="3.5rem" data-testid="transforms-target-content"><TransformHeader transform={transform} />- <ColumnLayoutBody>+ <Box pt="3rem"><TargetSection transform={transform} />- </ColumnLayoutBody>+ </Box></ColumnLayout>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsxindex 8388e280423..573478ce0b0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx@@ -40,6 +40,7 @@ export function getDataStudioTransformRoutes() {<Route path="new/python" component={NewPythonTransformPage} />)}<Route path=":transformId" component={TransformQueryPage} />+ <Route path=":transformId/edit" component={TransformQueryPage} /><Route path=":transformId/run" component={TransformRunPage} /><Route path=":transformId/target" component={TransformTargetPage} />{PLUGIN_DEPENDENCIES.isEnabled && (diff --git a/frontend/src/metabase/css/query_builder.module.css b/frontend/src/metabase/css/query_builder.module.cssindex d3682912bd7..4cc4031ec85 100644--- a/frontend/src/metabase/css/query_builder.module.css+++ b/frontend/src/metabase/css/query_builder.module.css@@ -215,7 +215,7 @@}.GuiBuilderData {- border-right: 1px solid var(--mb-color-border);+ line-height: 1rem;z-index: 1; /* moved the arrow thingy above the filter outline */}@@ -243,7 +243,7 @@.GuiBuilderSection {position: relative;- min-height: 55px;+ min-height: 3rem;min-width: 100px;}diff --git a/frontend/src/metabase/lib/urls/transforms.ts b/frontend/src/metabase/lib/urls/transforms.tsindex d94d66a99e3..dcc3a7b3eac 100644--- a/frontend/src/metabase/lib/urls/transforms.ts+++ b/frontend/src/metabase/lib/urls/transforms.ts@@ -42,6 +42,10 @@ export function transform(transformId: TransformId) {return `${TRANSFORMS_ROOT_URL}/${transformId}`;}+export function transformEdit(transformId: TransformId) {+ return `${TRANSFORMS_ROOT_URL}/${transformId}/edit`;+}+export function transformRun(transformId: TransformId) {return `${TRANSFORMS_ROOT_URL}/${transformId}/run`;}diff --git a/frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsx b/frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsxindex ae9ad48abd9..4cb0e78f414 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsx+++ b/frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsx@@ -44,8 +44,7 @@ export function Trigger({component="span"align="center"className={- className ||- cx(CS.px2, CS.py2, CS.textBold, CS.cursorPointer, CS.textDefault)+ className || cx(CS.px2, CS.py2, CS.cursorPointer, CS.textDefault)}data-testid="trigger"style={style}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsxindex 823c4dab542..89e71065981 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsx@@ -143,6 +143,7 @@ export const CodeMirrorEditor = forwardRef<ref={editorRef}data-testid="native-query-editor"className={S.editor}+ editable={!readOnly}extensions={extensions}value={value}readOnly={readOnly}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsxindex e28fd6c9932..bdf2b8fde43 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx@@ -174,7 +174,8 @@ const DatabaseSelector = ({QueryBuilderS.GuiBuilderData,CS.flex,CS.alignCenter,- CS.ml2,+ CS.ml1,+ readOnly && CS.pointerEventsNone,)}data-testid="gui-builder-data">@@ -193,7 +194,7 @@ DatabaseSelector.propTypes = DatabaseSelectorPropTypes;const SingleDatabaseName = ({ database }) => (<Flex- h="55px"+ h="3rem"px="md"align="center"fw="bold"@@ -212,7 +213,7 @@ const TableSelector = ({ database, readOnly, selectedTable, setTableId }) => (QueryBuilderS.GuiBuilderData,CS.flex,CS.alignCenter,- CS.ml2,+ CS.ml1,)}data-testid="gui-builder-data">@@ -238,7 +239,7 @@ const Placeholder = ({ query, editorContext }) => {return (<Flexalign="center"- h="55px"+ h="3rem"className={cx(CS.textNoWrap, CS.ml2, CS.px2, CS.textMedium)}>{t`This question is written in ${language}.`}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.cssindex bf008ef5126..ab9fb269bfd 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css@@ -50,5 +50,5 @@.actionButtons {/* min-height of the top bar, it's needed for vertical alignment when thereare several template tags */- height: 55px;+ height: 3rem;}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex 0bf28117c23..87f0c1ee029 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import {Component,type ForwardedRef,+ type ReactNode,createRef,forwardRef,useCallback,@@ -115,6 +116,7 @@ type OwnProps = {closeSnippetModal?: () => void;onSetDatabaseId?: (id: DatabaseId) => void;databaseIsDisabled?: (database: Database) => boolean;+ topBarInnerContent?: ReactNode;};interface ExplicitSizeProps {@@ -308,7 +310,10 @@ class NativeQueryEditor extends Component<Props, NativeQueryEditorState> {setDatasetQuery={this.props.setDatasetQuery}onFormatQuery={canFormatQuery ? this.handleFormatQuery : undefined}databaseIsDisabled={this.props.databaseIsDisabled}- />+ readOnly={readOnly}+ >+ {this.props.topBarInnerContent}+ </NativeQueryEditorTopBar>)}<divclassName={S.editorWrapper}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsxindex c8a937e8cf9..7d93290f403 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx@@ -1,3 +1,5 @@+import type { PropsWithChildren } from "react";+import { useDispatch } from "metabase/lib/redux";import { updateQuestion } from "metabase/query_builder/actions/core";import type { QueryModalType } from "metabase/query_builder/constants";@@ -19,7 +21,7 @@ import { NativeQueryEditorActionButtons } from "../NativeQueryEditorActionButtonimport { VisibilityToggler } from "../VisibilityToggler/VisibilityToggler";import type { SidebarFeatures } from "../types";-interface NativeQueryEditorTopBarProps {+interface NativeQueryEditorTopBarProps extends PropsWithChildren {question: Question;query: NativeQuery;@@ -55,6 +57,7 @@ interface NativeQueryEditorTopBarProps {const NativeQueryEditorTopBar = (props: NativeQueryEditorTopBarProps) => {const {+ children,query,question,canChangeDatabase,@@ -142,7 +145,8 @@ const NativeQueryEditorTopBar = (props: NativeQueryEditorTopBarProps) => {enableParameterRequiredBehavior/>)}- <Flex ml="auto" gap="lg" mr="lg" align="center" h="55px" pl="md">+ <Flex ml="auto" gap="lg" mr="lg" align="center" h="3rem" pl="md">+ {children}{isNativeEditorOpen && hasEditingSidebar && !readOnly && (<NativeQueryEditorActionButtonsfeatures={sidebarFeatures}diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsxindex 97b0f1e229d..27ff145ba9a 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx@@ -1,3 +1,4 @@+import type { ReactNode } from "react";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -25,6 +26,7 @@ type QueryEditorProps = {onChangeUiState: (newUiState: QueryEditorUiState) => void;onAcceptProposed?: () => void;onRejectProposed?: () => void;+ topBarInnerContent?: ReactNode;};export function QueryEditor({@@ -36,6 +38,7 @@ export function QueryEditor({onChangeUiState,onAcceptProposed,onRejectProposed,+ topBarInnerContent,}: QueryEditorProps) {const {question,@@ -109,6 +112,7 @@ export function QueryEditor({onChangeNativeEditorSelection={setSelectionRange}onAcceptProposed={onAcceptProposed}onRejectProposed={onRejectProposed}+ topBarInnerContent={topBarInnerContent}/><QueryEditorVisualizationquestion={question}diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsxindex a17b4826802..b402ad8db5c 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx@@ -1,4 +1,4 @@-import { useMemo, useState } from "react";+import { type ReactNode, useMemo, useState } from "react";import { ResizableBox, type ResizableBoxProps } from "react-resizable";import { useWindowSize } from "react-use";@@ -26,6 +26,7 @@ import S from "./QueryEditorBody.module.css";const EDITOR_HEIGHT = 550;const NATIVE_HEADER_HEIGHT = 55;const HEADER_HEIGHT = 65 + 50;+const PREVIEW_MAX_INITIAL_HEIGHT = 192;const NATIVE_EDITOR_SIDEBAR_FEATURES = {dataReference: true,@@ -67,6 +68,7 @@ type QueryEditorBodyProps = {onOpenModal: (type: QueryModalType) => void;onAcceptProposed?: () => void;onRejectProposed?: () => void;+ topBarInnerContent?: ReactNode;};export function QueryEditorBody({@@ -95,10 +97,11 @@ export function QueryEditorBody({onOpenModal,onAcceptProposed,onRejectProposed,+ topBarInnerContent,}: QueryEditorBodyProps) {const [isResizing, setIsResizing] = useState(false);const reportTimezone = useSetting("report-timezone-long");- const editorHeight = useInitialEditorHeight(isNative);+ const editorHeight = useInitialEditorHeight(isNative, readOnly);const dataPickerOptions = useMemo(() => ({ shouldDisableItem, shouldDisableDatabase, shouldShowLibrary }),@@ -134,7 +137,7 @@ export function QueryEditorBody({resizableBoxProps={resizableBoxProps}placeholder="SELECT * FROM TABLE_NAME"hasTopBar- hasRunButton+ hasRunButton={!readOnly}isInitiallyOpenisNativeEditorOpenreadOnly={readOnly}@@ -159,6 +162,7 @@ export function QueryEditorBody({onOpenModal={onOpenModal}onAcceptProposed={onAcceptProposed}onRejectProposed={onRejectProposed}+ topBarInnerContent={topBarInnerContent}/>) : (<ResizableBox@@ -166,7 +170,7 @@ export function QueryEditorBody({className={S.queryResizableBox}height={editorHeight}handle={<ResizeHandle />}- resizeHandles={["s"]}+ resizeHandles={readOnly ? [] : ["s"]}onResizeStart={() => setIsResizing(true)}onResizeStop={() => setIsResizing(false)}>@@ -195,8 +199,21 @@ function getHeaderHeight(isNative: boolean) {return HEADER_HEIGHT;}-function useInitialEditorHeight(isNative: boolean) {+function useInitialEditorHeight(isNative: boolean, readOnly?: boolean) {const { height: windowHeight } = useWindowSize();const headerHeight = getHeaderHeight(isNative);- return Math.min(0.8 * (windowHeight - headerHeight), EDITOR_HEIGHT);+ const availableHeight = windowHeight - headerHeight;++ if (readOnly) {+ // When read-only, we don't need to split the container to show the query visualization on the bottom+ return availableHeight;+ }++ // Let's make the preview initial height be half of the available height at most+ const previewInitialHeight = Math.min(+ availableHeight / 2,+ PREVIEW_MAX_INITIAL_HEIGHT,+ );++ return Math.min(availableHeight - previewInitialHeight, EDITOR_HEIGHT);}diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsxindex a9c457ed8e7..bd3fdeece72 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx@@ -95,7 +95,7 @@ export function NotebookStep({const { title, color, Step, StepHeader } = getStepConfig(step.type);- const canPreview = step.previewQuery != null;+ const canPreview = step.previewQuery != null && !readOnly;const hasPreviewButton = !isPreviewOpen && canPreview;const canRevert = step.revert != null && !readOnly;