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
Uxw 2512 standardize background headings and margins on all pages (#66908)
Nick Fitzpatrick4ba6b26bae8a
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.tsindex 622d32e5e03..6c61dccd67e 100644--- a/e2e/support/helpers/e2e-datamodel-helpers.ts+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts@@ -487,7 +487,7 @@ function getSegmentEditorNameInput() {}function getSegmentEditorDescriptionInput() {- return getSegmentEditor().findByLabelText("Description");+ return getSegmentEditor().findByLabelText("Give it a description");}function getSegmentEditorFilterPlaceholder() {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex fb9cb6b44fa..49dffb35b0c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -214,7 +214,7 @@ function DataStudioNavbarToggle({onNavbarToggle,}: DataStudioNavbarToggleProps) {return (- <Flex justify="space-between">+ <Flex justify="space-between" mb={2}><UnstyledButtonclassName={cx(S.toggle, {[S.hoverButton]: !isNavbarOpened,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsxnew file mode 100644index 00000000000..546301944d6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx@@ -0,0 +1,22 @@+import type React from "react";++import { Stack, type StackProps } from "metabase/ui";++export const PageContainer = ({+ children,+ ...rest+}: React.PropsWithChildren<StackProps>) => {+ return (+ <Stack+ bg="background-light"+ h="100%"+ pb="2rem"+ px="3.5rem"+ gap="xl"+ style={{ overflow: "auto" }}+ {...rest}+ >+ {children}+ </Stack>+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/index.tsnew file mode 100644index 00000000000..a40c7c89aa6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/index.ts@@ -0,0 +1 @@+export * from "./PageContainer";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 5063cba29a4..d11743a8cb1 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@@ -20,7 +20,7 @@ import {import type { PaneHeaderTab } from "./types";-interface PaneHeaderProps extends Omit<StackProps, "title"> {+export interface PaneHeaderProps extends Omit<StackProps, "title"> {title?: ReactNode;icon?: IconName;menu?: ReactNode;@@ -42,9 +42,9 @@ export const PaneHeader = ({...rest}: PaneHeaderProps) => {return (- <Stack px="lg" py="md" gap={0} {...rest}>+ <Stack gap={0} pt="xs" {...rest}>{(breadcrumbs || showMetabotButton) && (- <Flex mb="md" mt="md" h="2rem" w="100%">+ <Flex mb="lg" mt="md" h="2rem" w="100%">{breadcrumbs}{showMetabotButton && (<Box ml="auto">@@ -59,7 +59,7 @@ export const PaneHeader = ({justify="space-between"wrap="nowrap">- <Stack gap="sm" w="100%">+ <Stack gap="md">{title && (<Group align="center" gap="sm" wrap="nowrap">{icon && <FixedSizeIcon name={icon} c="brand" size={20} />}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsxindex e5cc7567fa2..6c9a83e2448 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx@@ -7,12 +7,15 @@ import {useUpdateGlossaryMutation,} from "metabase/api";import { GlossaryTable } from "metabase/reference/glossary/GlossaryTable";-import { Box, Card, Group, Stack, Text } from "metabase/ui";+import { Box, Card } from "metabase/ui";import {trackDataStudioGlossaryTermCreated,trackDataStudioGlossaryTermDeleted,trackDataStudioGlossaryTermUpdated,} from "metabase-enterprise/data-studio/analytics";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import S from "./GlossaryPage.module.css";@@ -23,10 +26,12 @@ export function GlossaryPage() {const [deleteGlossary] = useDeleteGlossaryMutation();return (- <Stack w="100%" h="100%" p="xl" bg="background-light">- <Group align="center" wrap="nowrap" justify="space-between">- <Text fw="bold" fz="1.5rem" component="h1">{t`Glossary`}</Text>- </Group>+ <PageContainer gap={0}>+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs role="heading">{t`Glossary`}</DataStudioBreadcrumbs>+ }+ /><Box w="100%" className={S.contentWrapper}><Card px="lg" pb="sm" withBorder shadow="none"><GlossaryTable@@ -46,6 +51,6 @@ export function GlossaryPage() {/></Card></Box>- </Stack>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsxindex 886c01c5c4e..6e780969acb 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx@@ -102,7 +102,7 @@ function MetricMenu({ card, onOpenModal }: MetricMenuProps) {return (<Menu><Menu.Target>- <ActionIcon>+ <ActionIcon size="sm"><Icon name="ellipsis" /></ActionIcon></Menu.Target>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsxindex 2e5c72ab397..03b2fee0091 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx@@ -3,7 +3,8 @@ import type { ReactNode } from "react";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Center, Flex } from "metabase/ui";+import { Card, Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";import { MetricHeader } from "../../components/MetricHeader";@@ -33,7 +34,7 @@ export function MetricDependenciesPage({}return (- <Flex direction="column" h="100%">+ <PageContainer><MetricHeader card={card} /><PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{@@ -41,8 +42,10 @@ export function MetricDependenciesPage({defaultEntry: { id: card.id, type: "card" },}}>- {children}+ <Card withBorder p={0} flex={1}>+ {children}+ </Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsxindex c26f957581b..95da019e3a2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx@@ -30,12 +30,13 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {if (card.can_write) {return (- <Box mx="-5px">+ <Box><EditableTextinitialValue={card.description ?? ""}placeholder={t`No description`}isMarkdownonChange={handleChange}+ px={0}/></Box>);diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsxindex 12fccb20437..4e4b28b89d8 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx@@ -13,7 +13,7 @@ type MetricOverviewProps = {export function MetricOverview({ card }: MetricOverviewProps) {return (- <Flex className={S.root} p="lg" flex={1} bg="bg-light">+ <Flex className={S.root} flex={1}><Flex direction="column" flex={1} mah={700}><OverviewVisualization card={card} /></Flex>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsxindex b44d7c6cd75..1db0dea4c8c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx@@ -66,7 +66,7 @@ function TableSourcePath({ tableId }: TableSourcePathProps) {name: table.db.name,url: table.db.is_audit? undefined- : Urls.dataModel({ databaseId: table.db_id }),+ : Urls.dataStudioData({ databaseId: table.db_id }),});if (table.schema) {@@ -74,7 +74,7 @@ function TableSourcePath({ tableId }: TableSourcePathProps) {name: table.schema,url: table.db.is_audit? undefined- : Urls.dataModel({+ : Urls.dataStudioData({databaseId: table.db_id,schemaName: table.schema,}),@@ -85,7 +85,7 @@ function TableSourcePath({ tableId }: TableSourcePathProps) {name: table.display_name,url: table.db.is_audit? undefined- : Urls.dataModel({+ : Urls.dataStudioData({databaseId: table.db_id,schemaName: table.schema,tableId: table.id,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsxindex a21bc8f5d9b..4e171f4678f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx@@ -1,6 +1,7 @@import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";-import { Center, Flex } from "metabase/ui";+import { Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";import { MetricHeader } from "../../components/MetricHeader";@@ -28,9 +29,9 @@ export function MetricOverviewPage({ params }: MetricOverviewPageProps) {}return (- <Flex direction="column" h="100%" data-testid="metric-overview-page">+ <PageContainer data-testid="metric-overview-page" gap="xl"><MetricHeader card={card} /><MetricOverview card={card} />- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 6ff5eedfcaa..b43e65c7413 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -12,12 +12,13 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { getMetadata } from "metabase/selectors/metadata";-import { Center, Stack } from "metabase/ui";+import { Card, Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";-import type { Card } from "metabase-types/api";+import type { Card as CardType } from "metabase-types/api";import { PaneHeaderActions } from "../../../common/components/PaneHeader";import { MetricHeader } from "../../components/MetricHeader";@@ -49,7 +50,7 @@ export function MetricQueryPage({ params, route }: MetricQueryPageProps) {}type MetricQueryPageBodyProps = {- card: Card;+ card: CardType;route: Route;};@@ -129,14 +130,7 @@ function MetricQueryPageBody({ card, route }: MetricQueryPageBodyProps) {return (<>- <Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"- data-testid="metric-query-editor"- gap={0}- >+ <PageContainer pos="relative" data-testid="metric-query-editor" gap="xl"><MetricHeadercard={card}actions={@@ -150,14 +144,16 @@ function MetricQueryPageBody({ card, route }: MetricQueryPageBodyProps) {/>}/>- <MetricQueryEditor- query={question.query()}- uiState={uiState}- readOnly={!card.can_write}- onChangeQuery={handleChangeQuery}- onChangeUiState={setUiState}- />- </Stack>+ <Card withBorder flex={1} p={0}>+ <MetricQueryEditor+ query={question.query()}+ uiState={uiState}+ readOnly={!card.can_write}+ onChangeQuery={handleChangeQuery}+ onChangeUiState={setUiState}+ />+ </Card>+ </PageContainer>{isConfirmationShown && checkData != null && (<PLUGIN_DEPENDENCIES.CheckDependenciesModalcheckData={checkData}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsxindex 6b069a253e7..7112f3bcd53 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -1,7 +1,7 @@import { useDisclosure } from "@mantine/hooks";import type { Location } from "history";import { useMemo, useState } from "react";-import type { Route } from "react-router";+import { Link, type Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -11,10 +11,12 @@ import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { getMetadata } from "metabase/selectors/metadata";-import { Stack } from "metabase/ui";+import { Card } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";import * as Lib from "metabase-lib";-import type { Card } from "metabase-types/api";+import type { Card as CardType } from "metabase-types/api";import {PaneHeader,@@ -76,7 +78,7 @@ export function NewMetricPage({ location, route }: NewMetricPageProps) {[name, resultMetadata, initialCollectionId, defaultCollectionId],);- const handleCreate = (card: Card) => {+ const handleCreate = (card: CardType) => {dispatch(push(Urls.dataStudioMetric(card.id)));};@@ -90,14 +92,7 @@ export function NewMetricPage({ location, route }: NewMetricPageProps) {return (<>- <Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"- data-testid="metric-query-editor"- gap={0}- >+ <PageContainer pos="relative" data-testid="metric-query-editor"><PaneHeadertitle={<PaneHeaderInput@@ -118,14 +113,22 @@ export function NewMetricPage({ location, route }: NewMetricPageProps) {onCancel={handleCancel}/>}+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link to={Urls.dataStudioLibrary()}>{t`Library`}</Link>+ {t`New Metric`}+ </DataStudioBreadcrumbs>+ }/>- <MetricQueryEditor- query={query}- uiState={uiState}- onChangeQuery={handleChangeQuery}- onChangeUiState={setUiState}- />- </Stack>+ <Card withBorder p={0} flex={1}>+ <MetricQueryEditor+ query={query}+ uiState={uiState}+ onChangeQuery={handleChangeQuery}+ onChangeUiState={setUiState}+ />+ </Card>+ </PageContainer>{isModalOpened && (<CreateMetricModalquery={query}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsxindex aefa56c50e2..075f262e422 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx@@ -2,7 +2,7 @@ import type { ReactNode } from "react";import { t } from "ttag";import EditableText from "metabase/common/components/EditableText";-import { Group, Stack } from "metabase/ui";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import { SegmentMoreMenu } from "../SegmentMoreMenu";@@ -22,31 +22,23 @@ export function NewSegmentHeader({actions,}: NewSegmentHeaderProps) {return (- <Stack gap="sm">- {breadcrumbs}- <Group- gap="xs"- align="center"- justify="space-between"- w="100%"- px="lg"- mih={40}- >- <Group gap="xs" align="center">- <EditableText- initialValue=""- placeholder={t`New segment`}- maxLength={SEGMENT_NAME_MAX_LENGTH}- p={0}- fw="bold"- fz="h3"- lh="h3"- onContentChange={onNameChange}- />- {previewUrl && <SegmentMoreMenu previewUrl={previewUrl} />}- </Group>- {actions}- </Group>- </Stack>+ <PaneHeader+ data-testid="segment-pane-header"+ title={+ <EditableText+ initialValue=""+ placeholder={t`New segment`}+ maxLength={SEGMENT_NAME_MAX_LENGTH}+ p={0}+ fw="bold"+ fz="h3"+ lh="h3"+ onContentChange={onNameChange}+ />+ }+ menu={previewUrl && <SegmentMoreMenu previewUrl={previewUrl} />}+ actions={actions}+ breadcrumbs={breadcrumbs}+ />);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsxindex 2d689c60236..e1d2400534b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx@@ -1,17 +1,14 @@import { skipToken } from "@reduxjs/toolkit/query";-import { Fragment } from "react";import { Link } from "react-router";import { t } from "ttag";import { useListDatabaseSchemasQuery } from "metabase/api";import { Ellipsified } from "metabase/common/components/Ellipsified";import * as Urls from "metabase/lib/urls";-import { getCollectionList } from "metabase/nav/components/CollectionBreadcrumbs/utils";-import { Flex, Group, Text } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";import type { Segment, Table } from "metabase-types/api";-import S from "./SegmentBreadcrumbs.module.css";-type SegmentBreadcrumbsProps = {table: Table;segment?: Segment;@@ -21,39 +18,30 @@ export function PublishedTableSegmentBreadcrumbs({table,segment,}: SegmentBreadcrumbsProps) {- const collection = table.collection;- const ancestors = collection ? getCollectionList({ collection }) : [];+ const { path, isLoadingPath } = useCollectionPath({+ collectionId: table.collection_id,+ });return (- <Group c="text-secondary" gap="sm" wrap="nowrap" px="lg" pt="md">- {ancestors.map((ancestor, index) => (- <Fragment key={ancestor.id}>- {index > 0 && <Separator />}- <BreadcrumbLink to={Urls.dataStudioCollection(ancestor.id)}>- <Ellipsified>{ancestor.name}</Ellipsified>- </BreadcrumbLink>- </Fragment>+ <DataStudioBreadcrumbs loading={isLoadingPath}>+ {path?.map((collection, i) => (+ <Link+ key={collection.id}+ to={Urls.dataStudioLibrary({+ expandedIds: path.slice(1, i + 1).map((c) => c.id),+ })}+ >+ {collection.name}+ </Link>))}-- {collection && (- <>- {ancestors.length > 0 && <Separator />}- <BreadcrumbLink to={Urls.dataStudioCollection(collection.id)}>- <Ellipsified>{collection.name}</Ellipsified>- </BreadcrumbLink>- </>- )}-- <Separator />- <BreadcrumbLink to={Urls.dataStudioTableSegments(table.id)}>- <Ellipsified>{table.display_name}</Ellipsified>- </BreadcrumbLink>-- <Separator />- <BreadcrumbText>- <Ellipsified>{segment?.name ?? t`New segment`}</Ellipsified>- </BreadcrumbText>- </Group>+ <Link+ key={`table-${table.id}`}+ to={Urls.dataStudioTableSegments(table.id)}+ >+ {table.display_name}+ </Link>+ <span>{segment?.name ?? t`New segment`}</span>+ </DataStudioBreadcrumbs>);}@@ -61,36 +49,31 @@ export function DataModelSegmentBreadcrumbs({table,segment,}: SegmentBreadcrumbsProps) {- const { data: schemas } = useListDatabaseSchemasQuery(+ const { data: schemas, isLoading } = useListDatabaseSchemasQuery(table.db_id ? { id: table.db_id } : skipToken,);const showSchema = schemas && schemas.length > 1 && table.schema;return (- <Group c="text-secondary" gap="sm" wrap="nowrap" px="lg" pt="md">+ <DataStudioBreadcrumbs loading={isLoading}>{table.db && (- <BreadcrumbLink to={Urls.dataStudioData({ databaseId: table.db_id })}>+ <Link to={Urls.dataStudioData({ databaseId: table.db_id })}><Ellipsified>{table.db.name}</Ellipsified>- </BreadcrumbLink>+ </Link>)}{showSchema && (- <>- <Separator />- <BreadcrumbLink- to={Urls.dataStudioData({- databaseId: table.db_id,- schemaName: table.schema,- })}- >- <Ellipsified>{table.schema}</Ellipsified>- </BreadcrumbLink>- </>+ <Link+ to={Urls.dataStudioData({+ databaseId: table.db_id,+ schemaName: table.schema,+ })}+ >+ <Ellipsified>{table.schema}</Ellipsified>+ </Link>)}-- <Separator />- <BreadcrumbLink+ <Linkto={Urls.dataStudioData({databaseId: table.db_id,schemaName: table.schema,@@ -99,40 +82,8 @@ export function DataModelSegmentBreadcrumbs({})}><Ellipsified>{table.display_name}</Ellipsified>- </BreadcrumbLink>-- <Separator />- <BreadcrumbText>- <Ellipsified>{segment?.name ?? t`New segment`}</Ellipsified>- </BreadcrumbText>- </Group>+ </Link>+ {segment?.name ?? t`New segment`}+ </DataStudioBreadcrumbs>);}--function BreadcrumbLink({- to,- children,-}: {- to: string;- children: React.ReactNode;-}) {- return (- <Link to={to} className={S.link}>- <Flex align="center" gap="xs" wrap="nowrap">- {children}- </Flex>- </Link>- );-}--function BreadcrumbText({ children }: { children: React.ReactNode }) {- return (- <Flex align="center" gap="xs" wrap="nowrap">- {children}- </Flex>- );-}--function Separator() {- return <Text span>/</Text>;-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsxindex fc471a6c81c..48550b4464b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx@@ -1,10 +1,12 @@import { Route } from "react-router";import {+ setupCollectionByIdEndpoint,setupSchemaEndpoints,setupTablesEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { ROOT_COLLECTION } from "metabase/entities/collections";import { checkNotNull } from "metabase/lib/types";import type { Segment, Table } from "metabase-types/api";import {@@ -28,7 +30,10 @@ const SINGLE_SCHEMA_DB = createMockDatabase({const TEST_COLLECTION = createMockCollection({id: 1,name: "Data",- effective_ancestors: [],+ effective_ancestors: [+ createMockCollection(ROOT_COLLECTION),+ createMockCollection({ id: 2, name: "Library", type: "library" }),+ ],});const TEST_TABLE = createMockTable({@@ -55,6 +60,7 @@ describe("PublishedTableSegmentBreadcrumbs", () => {table?: Table;segment?: Segment;} = {}) {+ setupCollectionByIdEndpoint({ collections: [TEST_COLLECTION] });renderWithProviders(<Routepath="/"@@ -76,7 +82,7 @@ describe("PublishedTableSegmentBreadcrumbs", () => {const collectionLink = screen.getByText("Data").closest("a");expect(collectionLink).toHaveAttribute("href",- "/data-studio/library/collections/1",+ "/data-studio/library?expandedId=1",);const tableLink = screen.getByText("Orders").closest("a");@@ -108,6 +114,8 @@ describe("PublishedTableSegmentBreadcrumbs", () => {collection,});+ setupCollectionByIdEndpoint({ collections: [collection] });+setup({ table: tableWithAncestors });await waitFor(() => {@@ -119,14 +127,14 @@ describe("PublishedTableSegmentBreadcrumbs", () => {expect(screen.getByText("Root").closest("a")).toHaveAttribute("href",- "/data-studio/library/collections/3",+ "/data-studio/library",);expect(screen.getByText("Analytics").closest("a")).toHaveAttribute("href",- "/data-studio/library/collections/2",+ "/data-studio/library?expandedId=2",);- const separators = screen.getAllByText("/");+ const separators = screen.getAllByRole("img");expect(separators.length).toBeGreaterThan(0);});@@ -137,6 +145,8 @@ describe("PublishedTableSegmentBreadcrumbs", () => {display_name: "Customer Orders",});+ setupCollectionByIdEndpoint({ collections: [TEST_COLLECTION] });+setup({ table: tableWithDifferentNames, segment: undefined });await waitFor(() => {@@ -215,14 +225,14 @@ describe("DataModelSegmentBreadcrumbs", () => {setup({ segment: undefined });await waitFor(() => {- expect(screen.getByText("Sample Database")).toBeInTheDocument();+ expect(screen.getByText("Sample Database")).toBeVisible();});expect(screen.queryByText("PUBLIC")).not.toBeInTheDocument();expect(screen.getByText("Orders")).toBeInTheDocument();expect(screen.getByText("New segment")).toBeInTheDocument();- const separators = screen.getAllByText("/");+ const separators = screen.getAllByRole("img");expect(separators).toHaveLength(2);});});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.cssindex fa3469e028e..250a3874179 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.module.css@@ -1,3 +1,7 @@.scrollable {overflow: auto;}++.descriptionLabel {+ margin-bottom: 0.75rem;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsxindex e1f1986d29a..00a88f323e8 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { SegmentFilterEditor } from "metabase/querying/segments";-import { Stack, Textarea } from "metabase/ui";+import { Card, Stack, TextInput } from "metabase/ui";import type * as Lib from "metabase-lib";import S from "./SegmentEditor.module.css";@@ -20,15 +20,22 @@ export function SegmentEditor({onDescriptionChange,}: SegmentEditorProps) {return (- <Stack flex={1} gap="lg" px="lg" py="lg" className={S.scrollable}>- {query && <SegmentFilterEditor query={query} onChange={onQueryChange} />}- <Textarea- label={t`Description`}- placeholder={t`Give it a description`}- value={description}- onChange={(e) => onDescriptionChange(e.target.value)}- maw={400}- />- </Stack>+ <Card withBorder p="xl">+ <Stack flex={1} gap="xl" p={0} className={S.scrollable}>+ {query && (+ <SegmentFilterEditor query={query} onChange={onQueryChange} />+ )}+ <TextInput+ label={t`Give it a description`}+ placeholder={t`Only if it really needs it`}+ value={description}+ onChange={(e) => onDescriptionChange(e.target.value)}+ maw={400}+ classNames={{+ label: S.descriptionLabel,+ }}+ />+ </Stack>+ </Card>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsxindex 6ff0bc1508e..a66181ffa93 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx@@ -38,7 +38,6 @@ export function SegmentHeader({}: SegmentHeaderProps) {return (<Stack gap={0}>- {breadcrumbs}<PaneHeaderdata-testid="segment-pane-header"title={@@ -48,6 +47,7 @@ export function SegmentHeader({menu={<SegmentMoreMenu previewUrl={previewUrl} onRemove={onRemove} />}tabs={<SegmentTabs urls={tabUrls} />}actions={actions}+ breadcrumbs={breadcrumbs}/></Stack>);diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex b9f568c1668..86c094427a7 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -9,7 +9,8 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { useDispatch, useSelector } from "metabase/lib/redux";import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";-import { Button, Flex } from "metabase/ui";+import { Button } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import * as Lib from "metabase-lib";import type { DatasetQuery, Segment, Table } from "metabase-types/api";@@ -95,14 +96,7 @@ export function NewSegmentPage({]);return (- <Flex- direction="column"- pos="relative"- w="100%"- h="100%"- bg="bg-white"- data-testid="new-segment-page"- >+ <PageContainer data-testid="new-segment-page" gap="xl"><NewSegmentHeaderpreviewUrl={previewUrl}onNameChange={setName}@@ -127,6 +121,6 @@ export function NewSegmentPage({onDescriptionChange={setDescription}/><LeaveRouteConfirmModal route={route} isEnabled={isDirty && !isSaving} />- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsxindex dc0eb3baa94..c69539ab724 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx@@ -108,7 +108,7 @@ describe("NewSegmentPage", () => {expect(screen.getByTestId("new-segment-page")).toBeInTheDocument();expect(screen.getByPlaceholderText("New segment")).toHaveValue("");- expect(screen.getByLabelText("Description")).toHaveValue("");+ expect(screen.getByLabelText("Give it a description")).toHaveValue("");expect(screen.queryByRole("button", { name: "Save" }),).not.toBeInTheDocument();@@ -137,7 +137,7 @@ describe("NewSegmentPage", () => {setup();await userEvent.type(- screen.getByLabelText("Description"),+ screen.getByLabelText("Give it a description"),"Test description",);diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsxindex 2a29ae35fc6..108f234b9ec 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx@@ -1,7 +1,8 @@import type { ReactNode } from "react";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Flex } from "metabase/ui";+import { Card } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { Segment } from "metabase-types/api";import { SegmentHeader } from "../../components/SegmentHeader";@@ -24,7 +25,7 @@ export function SegmentDependenciesPage({children,}: SegmentDependenciesPageProps) {return (- <Flex direction="column" h="100%" data-testid="segment-dependencies-page">+ <PageContainer data-testid="segment-dependencies-page"><SegmentHeadersegment={segment}tabUrls={tabUrls}@@ -38,8 +39,10 @@ export function SegmentDependenciesPage({defaultEntry: { id: segment.id, type: "segment" },}}>- {children}+ <Card withBorder p={0} flex={1}>+ {children}+ </Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex 02d41e46963..713ce7b404d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -8,7 +8,8 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { useSelector } from "metabase/lib/redux";import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";-import { Button, Flex, Group } from "metabase/ui";+import { Button, Group } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import * as Lib from "metabase-lib";import type { Segment } from "metabase-types/api";@@ -95,14 +96,7 @@ export function SegmentDetailPage({}, [savedSegment]);return (- <Flex- direction="column"- pos="relative"- w="100%"- h="100%"- bg="bg-white"- data-testid="segment-detail-page"- >+ <PageContainer data-testid="segment-detail-page"><SegmentHeadersegment={segment}tabUrls={tabUrls}@@ -136,6 +130,6 @@ export function SegmentDetailPage({route={route}isEnabled={isDirty && !isSaving}/>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsxindex e13f1efa3f7..97648880a8b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx@@ -121,7 +121,7 @@ describe("SegmentDetailPage", () => {setup();expect(screen.getByDisplayValue("High Value Orders")).toBeInTheDocument();- expect(screen.getByLabelText("Description")).toHaveValue(+ expect(screen.getByLabelText("Give it a description")).toHaveValue("Orders with total > 100",);expect(screen.getByText("Definition")).toBeInTheDocument();@@ -143,7 +143,7 @@ describe("SegmentDetailPage", () => {it("shows Save/Cancel buttons when description is modified", async () => {setup();- const descriptionInput = screen.getByLabelText("Description");+ const descriptionInput = screen.getByLabelText("Give it a description");await userEvent.clear(descriptionInput);await userEvent.type(descriptionInput, "New description");@@ -154,7 +154,7 @@ describe("SegmentDetailPage", () => {it("resets form when Cancel is clicked after modifying description", async () => {setup();- const descriptionInput = screen.getByLabelText("Description");+ const descriptionInput = screen.getByLabelText("Give it a description");await userEvent.clear(descriptionInput);await userEvent.type(descriptionInput, "Modified description");expect(descriptionInput).toHaveValue("Modified description");@@ -177,7 +177,7 @@ describe("SegmentDetailPage", () => {setup();- const descriptionInput = screen.getByLabelText("Description");+ const descriptionInput = screen.getByLabelText("Give it a description");await userEvent.clear(descriptionInput);await userEvent.type(descriptionInput, "Updated description");diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsxindex 29a80eebb03..0746e094792 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx@@ -1,6 +1,7 @@import type { ReactNode } from "react";-import { Flex, Stack } from "metabase/ui";+import { Stack } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { Segment } from "metabase-types/api";import { SegmentHeader } from "../../components/SegmentHeader";@@ -24,11 +25,7 @@ export function SegmentRevisionHistoryPage({onRemove,}: SegmentRevisionHistoryPageProps) {return (- <Flex- direction="column"- h="100%"- data-testid="segment-revision-history-page"- >+ <PageContainer data-testid="segment-revision-history-page"><SegmentHeadersegment={segment}tabUrls={tabUrls}@@ -39,6 +36,6 @@ export function SegmentRevisionHistoryPage({<Stack flex={1} className={S.scrollable}><SegmentRevisionHistory segment={segment} /></Stack>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsxindex e9b7a9c5a92..f9a0106341f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx@@ -1,4 +1,5 @@import type { ReactNode } from "react";+import { Link } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -8,11 +9,14 @@ import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";import type { NativeQuerySnippet } from "metabase-types/api";import {PaneHeader,PaneHeaderInput,+ type PaneHeaderProps,type PaneHeaderTab,PaneHeaderTabs,} from "../../../common/components/PaneHeader";@@ -25,13 +29,21 @@ type SnippetHeaderProps = {actions?: ReactNode;};-export function SnippetHeader({ snippet, actions }: SnippetHeaderProps) {+export function SnippetHeader({+ snippet,+ actions,+ ...rest+}: SnippetHeaderProps & PaneHeaderProps) {const dispatch = useDispatch();const handleDelete = () => {dispatch(push(Urls.dataStudioLibrary()));};+ const { path, isLoadingPath } = useCollectionPath({+ collectionId: snippet.collection_id,+ });+return (<PaneHeadertitle={<SnippetNameInput snippet={snippet} />}@@ -39,6 +51,25 @@ export function SnippetHeader({ snippet, actions }: SnippetHeaderProps) {tabs={<SnippetTabs snippet={snippet} />}actions={actions}data-testid="snippet-header"+ {...rest}+ breadcrumbs={+ <DataStudioBreadcrumbs loading={isLoadingPath}>+ <Link key="snippet-root-collection" to={Urls.dataStudioLibrary()}>+ {t`SQL snippets`}+ </Link>+ {path?.map((collection, i) => (+ <Link+ key={collection.id}+ to={Urls.dataStudioLibrary({+ expandedIds: path.slice(1, i + 1).map((c) => c.id),+ })}+ >+ {collection.name}+ </Link>+ ))}+ <span>{snippet.name}</span>+ </DataStudioBreadcrumbs>+ }/>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsxindex b2d0e32ac06..46353c3bd80 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx@@ -68,7 +68,7 @@ function SnippetMenu({ onOpenModal }: SnippetMenuProps) {return (<Menu><Menu.Target>- <ActionIcon>+ <ActionIcon size="sm"><Icon name="ellipsis" /></ActionIcon></Menu.Target>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.cssindex 3f1ce99957b..a0a44e25ddc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css@@ -4,7 +4,7 @@.editor {height: 100%;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-bg-white);}.sidebar {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsxindex a4cfcc910a4..4ec26bf5d39 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx@@ -15,7 +15,8 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";import * as Urls from "metabase/lib/urls";-import { Box, Center, Flex, Stack } from "metabase/ui";+import { Card, Center, Flex, Stack } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { PaneHeaderActions } from "../../../common/components/PaneHeader";import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";@@ -97,14 +98,7 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {return (<>- <Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"- gap={0}- data-testid="edit-snippet-page"- >+ <PageContainer pos="relative" data-testid="edit-snippet-page"><SnippetHeadersnippet={snippet}actions={@@ -117,8 +111,16 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {/>}/>- <Flex flex={1} w="100%">- <Box flex={1} className={S.editorContainer}>+ <Flex flex={1} w="100%" gap="sm">+ <Card+ withBorder+ p={0}+ w="100%"+ flex={1}+ style={{+ overflow: "hidden",+ }}+ ><CodeMirrorvalue={content}onChange={setContent}@@ -133,8 +135,8 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {highlightActiveLine: true,}}/>- </Box>- <Stack w={320} gap="lg" p="md" bg="bg-white" className={S.sidebar}>+ </Card>+ <Stack p="md" gap="lg" flex="0 0 20rem"><SnippetDescriptionSection snippet={snippet} /><EntityCreationInfocreatedAt={snippet.created_at}@@ -142,7 +144,7 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {/></Stack></Flex>- </Stack>+ </PageContainer><LeaveRouteConfirmModalkey={snippetId}route={route}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.cssindex 3f1ce99957b..034969908b0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css@@ -1,13 +1,4 @@-.editorContainer {- overflow: hidden;-}-.editor {height: 100%;- background-color: var(--mb-color-bg-light);-}--.sidebar {- flex-shrink: 0;- border-left: 1px solid var(--mb-color-border);+ background-color: var(--mb-color-bg-white);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsxindex fa0c0ac42ec..21768ba460b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx@@ -9,11 +9,14 @@ import { getErrorMessage } from "metabase/api/utils";import { CodeMirror } from "metabase/common/components/CodeMirror";import EditableText from "metabase/common/components/EditableText";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";+import Link from "metabase/common/components/Link";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";-import { Box, Flex, Stack } from "metabase/ui";+import { Card, Flex, Stack } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { RegularCollectionId } from "metabase-types/api";import {@@ -82,14 +85,7 @@ export function NewSnippetPage({ route }: NewSnippetPageProps) {return (<>- <Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"- gap={0}- data-testid="new-snippet-page"- >+ <PageContainer pos="relative" data-testid="new-snippet-page"><PaneHeadertitle={<PaneHeaderInput@@ -109,9 +105,23 @@ export function NewSnippetPage({ route }: NewSnippetPageProps) {onCancel={handleCancel}/>}+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link to={Urls.dataStudioLibrary()}>{t`SQL snippets`}</Link>+ {t`New Snippet`}+ </DataStudioBreadcrumbs>+ }/>- <Flex flex={1} w="100%">- <Box flex={1} className={S.editorContainer}>+ <Flex flex={1} w="100%" gap="sm">+ <Card+ withBorder+ p={0}+ w="100%"+ flex={1}+ style={{+ overflow: "hidden",+ }}+ ><CodeMirrorvalue={content}onChange={setContent}@@ -126,19 +136,17 @@ export function NewSnippetPage({ route }: NewSnippetPageProps) {highlightActiveLine: true,}}/>- </Box>- <Stack w={320} gap="lg" p="md" bg="bg-white" className={S.sidebar}>- <Box mx="-5px">- <EditableText- initialValue={description}- placeholder={t`No description`}- isMarkdown- onChange={setDescription}- />- </Box>+ </Card>+ <Stack p="md" flex="0 0 20rem">+ <EditableText+ initialValue={description}+ placeholder={t`No description`}+ isMarkdown+ onChange={setDescription}+ /></Stack></Flex>- </Stack>+ </PageContainer><LeaveRouteConfirmModal route={route} isEnabled={!isSaving} /><PLUGIN_SNIPPET_FOLDERS.CollectionPickerModalisOpen={isCollectionPickerOpen}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsxindex 9c951e5d4aa..46d1d465b3d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx@@ -4,7 +4,8 @@ import { skipToken, useGetSnippetQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Center, Flex } from "metabase/ui";+import { Card, Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { SnippetHeader } from "../../components/SnippetHeader";@@ -38,7 +39,7 @@ export function SnippetDependenciesPage({}return (- <Flex direction="column" h="100%">+ <PageContainer><SnippetHeader snippet={snippet} /><PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{@@ -46,8 +47,10 @@ export function SnippetDependenciesPage({defaultEntry: { id: snippet.id, type: "snippet" },}}>- {children}+ <Card p={0} withBorder flex={1}>+ {children}+ </Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsxindex 4055f6190e0..effbe3aefff 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx@@ -28,7 +28,7 @@ export function TableMoreMenu({ table }: TableMoreMenuProps) {<><Menu><Menu.Target>- <ActionIcon>+ <ActionIcon size="sm"><Icon name="ellipsis" /></ActionIcon></Menu.Target>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsxindex 3619b6aaed0..328198470d3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx@@ -3,7 +3,8 @@ import type { ReactNode } from "react";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Center, Flex } from "metabase/ui";+import { Card, Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";import { TableHeader } from "../../components/TableHeader";@@ -33,7 +34,7 @@ export function TableDependenciesPage({}return (- <Flex direction="column" h="100%" data-testid="table-dependencies-page">+ <PageContainer data-testid="table-dependencies-page"><TableHeader table={table} /><PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{@@ -41,8 +42,10 @@ export function TableDependenciesPage({defaultEntry: { id: table.id, type: "table" },}}>- {children}+ <Card p={0} withBorder flex={1}>+ {children}+ </Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsxindex 6382c96d901..52244615342 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx@@ -13,6 +13,7 @@ import {TableSection,} from "metabase/metadata/components";import { Box, Center, Flex, Stack } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";import { trackMetadataChange } from "../../analytics";@@ -53,9 +54,9 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {}return (- <Flex direction="column" h="100%" data-testid="table-fields-page">+ <PageContainer data-testid="table-fields-page" gap="md"><TableHeader table={table} />- <Flex className={S.body} flex={1} bg="accent-gray-light">+ <Flex className={S.body} flex={1}><Stack className={S.column} flex="8 1 0" miw={320} maw={640} mih={0}><TableSection/**@@ -69,6 +70,8 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {Urls.dataStudioTableFields(tableId, fieldId)}onSyncOptionsClick={openSyncModal}+ px={0}+ pr="lg"/></Stack>{field != null && (@@ -121,6 +124,6 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {onClose={closeFieldValuesModal}/>)}- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsxindex 14f7489b0e9..bcd2acad697 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx@@ -28,7 +28,7 @@ export function DescriptionSection({ table }: DescriptionSectionProps) {};return (- <Box mx="-5px" data-testid="table-description-section">+ <Box data-testid="table-description-section"><EditableTextinitialValue={table.description ?? ""}placeholder={t`No description`}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.module.cssdeleted file mode 100644index 0c93fdb0ca8..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.module.css+++ /dev/null@@ -1,7 +0,0 @@-.root {- overflow: auto;-}--.sidebar {- flex-shrink: 0;-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsxindex 2a27d921abe..343a32bc990 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx@@ -10,7 +10,6 @@ import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { Table } from "metabase-types/api";import { DescriptionSection } from "./DescriptionSection";-import S from "./TableOverview.module.css";type TableOverviewProps = {table: Table;@@ -19,13 +18,12 @@ type TableOverviewProps = {export function TableOverview({ table }: TableOverviewProps) {const metadata = useSelector(getMetadata);const card = useMemo(() => getCard(table, metadata), [table, metadata]);-return (- <Flex className={S.root} p="lg" flex={1} bg="bg-light">+ <Flex flex={1} gap="lg"><Flex direction="column" flex={1} mah={700}>{card && <OverviewVisualization card={card} />}</Flex>- <Stack w={300} ml="lg" gap="lg" className={S.sidebar}>+ <Stack flex="0 0 300px"><DescriptionSection table={table} /></Stack></Flex>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsxindex d58e3ce19d4..aa54a0666a4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverviewPage.tsx@@ -1,6 +1,7 @@import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";-import { Center, Flex } from "metabase/ui";+import { Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";import { TableHeader } from "../../components/TableHeader";@@ -28,9 +29,9 @@ export function TableOverviewPage({ params }: TableOverviewPageProps) {}return (- <Flex direction="column" h="100%" data-testid="table-overview-page">+ <PageContainer data-testid="table-overview-page"><TableHeader table={table} /><TableOverview table={table} />- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsxindex 524c7621064..d018bf0bb0d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx@@ -17,7 +17,7 @@ export function TableSegments({ table }: TableSegmentsProps) {const segments = table.segments ?? [];return (- <Flex direction="column" p="lg" bg="bg-light" flex={1}>+ <Flex direction="column" flex={1}><EntityListitems={segments}title={t`Segments`}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsxindex 22c2be6b04e..c719e4df25d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx@@ -1,6 +1,7 @@import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";-import { Center, Flex } from "metabase/ui";+import { Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";import { TableHeader } from "../../components/TableHeader";@@ -28,9 +29,9 @@ export function TableSegmentsPage({ params }: TableSegmentsPageProps) {}return (- <Flex direction="column" h="100%" data-testid="table-segments-page">+ <PageContainer data-testid="table-segments-page"><TableHeader table={table} /><TableSegments table={table} />- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsxindex 40b02e46504..5d3a4211c58 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx@@ -1,7 +1,6 @@import type { Location } from "history";import { useContext } from "react";-import CS from "metabase/css/core/index.css";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Stack } from "metabase/ui";@@ -29,7 +28,7 @@ export function DependencyGraphPage({ location }: DependencyGraphPageProps) {defaultEntry == null || (entry != null && !isSameNode(entry, defaultEntry));return (- <Stack h="100%" className={CS.borderTop}>+ <Stack h="100%"><DependencyGraphentry={entry ?? defaultEntry}getGraphUrl={(entry) => Urls.dependencyGraph({ entry, baseUrl })}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 67e59f1d060..0fe0be51d83 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@@ -7,11 +7,12 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { isResourceNotFoundError } from "metabase/lib/errors";import type * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";-import { Box, Flex } from "metabase/ui";+import { Box, Card } from "metabase/ui";import {useGetPythonLibraryQuery,useUpdatePythonLibraryMutation,} from "metabase-enterprise/api/python-transform-library";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { PythonEditor } from "../../components/PythonEditor";@@ -89,21 +90,24 @@ export function PythonLibraryEditorPage({return (<>- <Flex h="100%" w="100%" gap={0} direction="column">+ <PageContainer><PythonLibraryEditorHeaderonSave={handleSave}onRevert={handleRevert}isDirty={isDirty}isSaving={isSaving}/>- <PythonEditor- value={source}- onChange={setSource}- withPandasCompletions- className={S.editor}- data-testid="python-editor"- />- </Flex>++ <Card withBorder p={0}>+ <PythonEditor+ value={source}+ onChange={setSource}+ withPandasCompletions+ className={S.editor}+ data-testid="python-editor"+ />+ </Card>+ </PageContainer><LeaveRouteConfirmModal route={route} isEnabled={isDirty} /></>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsxindex f7ca56b0d09..5eba4d1b2ba 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx@@ -1,5 +1,11 @@import type { ReactNode } from "react";+import { Link } from "react-router";+import { t } from "ttag";+import * as Urls from "metabase/lib/urls";+import { Stack } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import {PaneHeader,PaneHeaderInput,@@ -7,7 +13,6 @@ import {import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";import { NAME_MAX_LENGTH } from "../../constants";-import { ColumnLayout, ColumnLayoutBody } from "../ColumnLayout";import { DependenciesSection } from "./DependenciesSection";import { ScheduleSection } from "./ScheduleSection";@@ -35,7 +40,7 @@ export function JobEditor({onTagListChange,}: JobEditorProps) {return (- <ColumnLayout data-testid="transforms-job-editor">+ <PageContainer data-testid="transforms-job-editor" gap="2.5rem"><PaneHeadertitle={<PaneHeaderInput@@ -44,15 +49,24 @@ export function JobEditor({onChange={onNameChange}/>}+ py={0}+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link key="transform-job-list" to={Urls.transformJobList()}>+ {t`Jobs`}+ </Link>+ {job.name}+ </DataStudioBreadcrumbs>+ }menu={menu}actions={actions}data-testid="jobs-header"/>- <ColumnLayoutBody>+ <Stack gap="3.5rem"><ScheduleSection job={job} onScheduleChange={onScheduleChange} /><TagSection job={job} onTagsChange={onTagListChange} />{job.id != null && <DependenciesSection jobId={job.id} />}- </ColumnLayoutBody>- </ColumnLayout>+ </Stack>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsxindex c942f004ff5..8904e3ddad6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx@@ -28,8 +28,6 @@ export function TransformHeader({}: TransformHeaderProps) {return (<PaneHeader- px={0}- pt={0}title={<TransformNameInput transform={transform} />}icon="transform"menu={hasMenu && <TransformMoreMenu transform={transform} />}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsxindex 684a4224f41..35afe1ce389 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx@@ -12,6 +12,7 @@ import * as Urls from "metabase/lib/urls";import { Button, Card, Flex, Icon, Stack, TextInput } from "metabase/ui";import { useListTransformJobsQuery } from "metabase-enterprise/api";import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";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";@@ -74,21 +75,13 @@ export const JobListPage = () => {}return (- <>+ <PageContainer data-testid="transforms-job-list" gap={0}><PaneHeaderbreadcrumbs={<DataStudioBreadcrumbs>{t`Jobs`}</DataStudioBreadcrumbs>}- px="3.5rem"py={0}showMetabotButton/>- <Stack- bg="background-light"- data-testid="transforms-job-list"- h="100%"- pb="2rem"- px="3.5rem"- style={{ overflow: "hidden" }}- >+ <Stack style={{ overflow: "hidden" }}><Flex gap="0.5rem"><TextInputplaceholder={t`Search...`}@@ -123,6 +116,6 @@ export const JobListPage = () => {)}</Flex></Stack>- </>+ </PageContainer>);};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 97e7b87fbd5..0cc2468075d 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -1,6 +1,6 @@import { useDisclosure } from "@mantine/hooks";import { useMemo, useState } from "react";-import type { Route } from "react-router";+import { Link, type Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -16,7 +16,9 @@ import * as Urls from "metabase/lib/urls";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { getMetadata } from "metabase/selectors/metadata";-import { Center, Stack } from "metabase/ui";+import { Box, Center } from "metabase/ui";+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import {PaneHeader,PaneHeaderActions,@@ -117,14 +119,7 @@ function NewTransformPageBody({return (<>- <Stack- pos="relative"- w="100%"- h="100%"- bg="bg-white"- data-testid="transform-query-editor"- gap={0}- >+ <PageContainer pos="relative" data-testid="transform-query-editor"><PaneHeadertitle={<PaneHeaderInput@@ -144,33 +139,52 @@ function NewTransformPageBody({onCancel={handleCancel}/>}+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link key="transform-list" to={Urls.transformList()}>+ {t`Transforms`}+ </Link>+ {t`New transform`}+ </DataStudioBreadcrumbs>+ }/>- {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}- />- )}- </Stack>+ <Box+ w="100%"+ bg="bg-white"+ bdrs="md"+ bd="1px solid var(--mb-color-border)"+ flex={1}+ style={{+ overflow: "hidden",+ }}+ >+ {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}+ />+ )}+ </Box>+ </PageContainer>{isModalOpened && isNotDraftSource(source) && (<CreateTransformModalsource={source}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsxindex 84311102add..a335473b6d0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx@@ -4,13 +4,14 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type * as Urls from "metabase/lib/urls";-import { Box, Center, Stack } from "metabase/ui";+import { Center, Stack } from "metabase/ui";import {useListTransformRunsQuery,useListTransformTagsQuery,useListTransformsQuery,} from "metabase-enterprise/api";import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";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";@@ -28,23 +29,14 @@ export function RunListPage({ location }: RunListPageProps) {const params = getParsedParams(location);return (- <>+ <PageContainer data-testid="transforms-run-list" gap={0}><PaneHeaderbreadcrumbs={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}- px="3.5rem"py={0}showMetabotButton/>- <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>- </>+ <RunListPageBody params={params} />+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsxindex 4b60e28327c..dc58a61893c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx@@ -4,8 +4,9 @@ import { skipToken } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Center, Flex } from "metabase/ui";+import { Card, Center } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import { TransformHeader } from "../../components/TransformHeader";@@ -38,20 +39,18 @@ export function TransformDependenciesPage({}return (- <Flex- direction="column"- h="100%"- data-testid="transforms-dependencies-content"- >- <TransformHeader transform={transform} px="3.5rem" />+ <PageContainer data-testid="transforms-dependencies-content">+ <TransformHeader transform={transform} /><PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{baseUrl: Urls.transformDependencies(transform.id),defaultEntry: { id: transform.id, type: "transform" },}}>- {children}+ <Card flex={1} p={0} withBorder>+ {children}+ </Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </Flex>+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsxindex 755e5c66936..86132eb38b5 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx@@ -11,6 +11,7 @@ import * as Urls from "metabase/lib/urls";import { Card, Flex, Group, Icon, Stack, TextInput } from "metabase/ui";import { useListTransformsQuery } from "metabase-enterprise/api";import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";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";@@ -88,57 +89,52 @@ export const TransformListPage = () => {return (<>- <PaneHeader- breadcrumbs={- <DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>- }- px="3.5rem"- showMetabotButton- py={0}- />- <Stack- bg="background-light"- data-testid="transforms-list"- pb="2rem"- px="3.5rem"- style={{ overflow: "hidden" }}- >- <Flex gap="md">- <TextInput- placeholder={t`Search...`}- leftSection={<Icon name="search" />}- bdrs="md"- flex="1"- value={searchQuery}- onChange={(e) => setSearchQuery(e.target.value)}- />- <CreateTransformMenu />- </Flex>-- <Card withBorder p={0}>- {isLoading ? (- <ListLoadingState />- ) : filteredTransforms.length === 0 ? (- <ListEmptyState- label={- debouncedSearchQuery- ? t`No transforms found`- : t`No transforms yet`- }- />- ) : (- <Table- data={filteredTransforms.map((t) => ({- ...t,- out_table: t.target.name,- last_modified: new Date(t.updated_at).toDateString(),- }))}- columns={transformColumnDef}- onSelect={handleSelect}+ <PageContainer data-testid="transforms-list" gap={0}>+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>+ }+ showMetabotButton+ py={0}+ />+ <Stack style={{ overflow: "hidden" }}>+ <Flex gap="md">+ <TextInput+ placeholder={t`Search...`}+ leftSection={<Icon name="search" />}+ bdrs="md"+ flex="1"+ value={searchQuery}+ onChange={(e) => setSearchQuery(e.target.value)}/>- )}- </Card>- </Stack>+ <CreateTransformMenu />+ </Flex>++ <Card withBorder p={0}>+ {isLoading ? (+ <ListLoadingState />+ ) : filteredTransforms.length === 0 ? (+ <ListEmptyState+ label={+ debouncedSearchQuery+ ? t`No transforms found`+ : t`No transforms yet`+ }+ />+ ) : (+ <Table+ data={filteredTransforms.map((t) => ({+ ...t,+ out_table: t.target.name,+ last_modified: new Date(t.updated_at).toDateString(),+ }))}+ columns={transformColumnDef}+ onSelect={handleSelect}+ />+ )}+ </Card>+ </Stack>+ </PageContainer></>);};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.cssdeleted file mode 100644index 16c3bc3888f..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.module.css+++ /dev/null@@ -1,7 +0,0 @@-.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 39874cfe902..9f4361536fe 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -15,11 +15,12 @@ import {PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";-import { Box, Flex, Stack } from "metabase/ui";+import { Box } from "metabase/ui";import {useGetTransformQuery,useUpdateTransformMutation,} from "metabase-enterprise/api";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { Database, Transform } from "metabase-types/api";import { TransformEditor } from "../../components/TransformEditor";@@ -29,7 +30,6 @@ import { useSourceState } from "../../hooks/use-source-state";import { isNotDraftSource } from "../../utils";import { TransformPaneHeaderActions } from "./TransformPaneHeaderActions";-import S from "./TransformQueryPage.module.css";type TransformQueryPageParams = {transformId: string;@@ -159,17 +159,7 @@ function TransformQueryPageBody({return (<>- <Stack- align="stretch"- data-testid="transform-query-editor"- gap={0}- h="100%"- mx="auto"- pb="sm"- pos="relative"- px="3.5rem"- w="100%"- >+ <PageContainer data-testid="transform-query-editor"><TransformHeadertransform={transform}actions={@@ -185,40 +175,46 @@ function TransformQueryPageBody({}hasMenu={!isEditMode && !isDirty}isEditMode={isEditMode}- pb="lg"/>- <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>+ <Box+ w="100%"+ bg="bg-white"+ bdrs="md"+ bd="1px solid var(--mb-color-border)"+ flex={1}+ style={{+ overflow: "hidden",+ }}+ >+ {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>+ </PageContainer>{isConfirmationShown && checkData != null && (<PLUGIN_DEPENDENCIES.CheckDependenciesModalcheckData={checkData}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsxindex 45e583c1d2b..21a04c891f8 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 { Box, Center } from "metabase/ui";+import { Center } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { Transform } from "metabase-types/api";-import { ColumnLayout } from "../../components/ColumnLayout";import { TransformHeader } from "../../components/TransformHeader";import { POLLING_INTERVAL } from "../../constants";import {@@ -50,12 +50,10 @@ export function TransformRunPage({ params }: TransformRunPageProps) {}return (- <ColumnLayout data-testid="transforms-run-content" px="3.5rem">+ <PageContainer data-testid="transforms-run-content"><TransformHeader transform={transform} />- <Box pt="3rem">- <RunSection transform={transform} />- </Box>- </ColumnLayout>+ <RunSection transform={transform} />+ </PageContainer>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsxindex 39fba6dc67a..f5ea465c4ff 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 { Box, Center } from "metabase/ui";+import { Center } from "metabase/ui";import { useGetTransformQuery } from "metabase-enterprise/api";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";import type { Transform } from "metabase-types/api";-import { ColumnLayout } from "../../components/ColumnLayout";import { TransformHeader } from "../../components/TransformHeader";import { POLLING_INTERVAL } from "../../constants";import {@@ -50,12 +50,10 @@ export function TransformTargetPage({ params }: TransformTargetPageProps) {}return (- <ColumnLayout px="3.5rem" data-testid="transforms-target-content">+ <PageContainer data-testid="transforms-target-content"><TransformHeader transform={transform} />- <Box pt="3rem">- <TargetSection transform={transform} />- </Box>- </ColumnLayout>+ <TargetSection transform={transform} />+ </PageContainer>);}diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsxindex 33f15a116f7..1daa4b584e6 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx@@ -16,6 +16,7 @@ import {Icon,Loader,Stack,+ type StackProps,Text,Tooltip,} from "metabase/ui";@@ -36,7 +37,7 @@ type TableSectionBaseProps = {withName?: boolean;getFieldHref: (fieldId: FieldId) => string;onSyncOptionsClick: () => void;-};+} & StackProps;const TableSectionBase = ({table,@@ -44,6 +45,7 @@ const TableSectionBase = ({withName,getFieldHref,onSyncOptionsClick,+ ...props}: TableSectionBaseProps) => {const [updateTable] = useUpdateTableMutation();const [updateTableSorting, { isLoading: isUpdatingSorting }] =@@ -148,16 +150,15 @@ const TableSectionBase = ({};return (- <Stack data-testid="table-section" gap={0} pb="lg">+ <Stack data-testid="table-section" gap={0} pb="lg" px="lg" {...props}><Stack- bg="accent-gray-light"className={S.header}gap="lg"pb={12}pos="sticky"pt="lg"- px="lg"top={0}+ bg="bg-light">{withName && (<NameDescriptionInput@@ -250,7 +251,7 @@ const TableSectionBase = ({</Group></Stack>- <Stack gap="lg" px="lg">+ <Stack gap="lg"><Stack gap={12}>{!hasFields && <EmptyState message={t`This table has no fields`} />}diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsxindex c9ec9950b1f..3c6c1196f26 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx@@ -96,7 +96,7 @@ export const DataModelV1 = ({ children, location, params }: Props) => {}return (- <Flex bg="accent-gray-light" data-testid="data-model" h="100%">+ <Flex bg="bg-light" data-testid="data-model" h="100%"><Stackbg="bg-white"className={S.column}diff --git a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx b/frontend/src/metabase/query_builder/components/QueryVisualization.jsxindex eb43ce8239f..b3be9ea2165 100644--- a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx+++ b/frontend/src/metabase/query_builder/components/QueryVisualization.jsx@@ -96,10 +96,7 @@ export default function QueryVisualization(props) {onUpdateWarnings={setWarnings}/>) : !isRunning && !isDirtyStateShown ? (- <VisualizationEmptyState- className={CS.spread}- isCompact={isNativeEditorOpen}- >+ <VisualizationEmptyState className={CS.spread}>{t`Here's where your results will appear`}</VisualizationEmptyState>) : null}@@ -108,17 +105,11 @@ export default function QueryVisualization(props) {);}-const VisualizationEmptyState = ({ isCompact, children }) => {+const VisualizationEmptyState = ({ children }) => {const keyboardShortcut = getRunQueryShortcut();return (- <Flex- w="100%"- h="100%"- align={isCompact ? "flex-start" : "center"}- justify="center"- mt={isCompact ? "3rem" : "auto"}- >+ <Flex w="100%" h="100%" align="center" justify="center"><Stack maw="25rem" gap={0} ta="center" align="center"><Box maw="3rem" mb="0.75rem"><img src={EmptyCodeResult} alt="Code prompt icon" />