Skip to content

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

Uxw 2511 field metadata edit and field detail panels cant be closed (#67034)

Nick Fitzpatrickc857b7564650
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index 25fc8f8d15b..1638a7e1266 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -78,6 +78,8 @@ export const DataStudio = {
DataStudio.Tables.header().findByText("Dependencies"),
visitOverviewPage: (tableId: TableId) =>
cy.visit(`/data-studio/library/tables/${tableId}`),
+ visitFieldsPage: (tableId: TableId) =>
+ cy.visit(`/data-studio/library/tables/${tableId}/fields`),
visitSegmentsPage: (tableId: TableId) =>
cy.visit(`/data-studio/library/tables/${tableId}/segments`),
visitSegmentPage: (tableId: TableId, segmentId: SegmentId) =>
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.ts
index 6c61dccd67e..1d678f87be6 100644
--- a/e2e/support/helpers/e2e-datamodel-helpers.ts
+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts
@@ -39,6 +39,7 @@ export const DataModel = {
getSortableFields: getTableSectionSortableFields,
getVisibilityTypeInput: getTableSectionVisibilityTypeInput,
clickField: clickTableSectionField,
+ getCloseButton: getTableSectionCloseButton,
},
FieldSection: {
get: getFieldSection,
@@ -63,6 +64,7 @@ export const DataModel = {
getMultiplyByNumberInput: getFieldMultiplyByNumberInput,
getPrefixInput: getFieldPrefixInput,
getSuffixInput: getFieldSuffixInput,
+ getCloseButton: getFieldSectionCloseButton,
},
PreviewSection: {
get: getPreviewSection,
@@ -273,6 +275,10 @@ function getTableSection() {
return cy.findByTestId("table-section");
}
+function getTableSectionHeader() {
+ return cy.findByTestId("table-section-header");
+}
+
function getTableNameInput() {
return getTableSection().findByPlaceholderText("Give this table a name");
}
@@ -334,12 +340,20 @@ function clickTableSectionField(name: string) {
return getTableSectionField(name).findByRole("img").scrollIntoView().click();
}
+function getTableSectionCloseButton() {
+ return getTableSectionHeader().findByRole("link", { name: /close/ });
+}
+
/** field section helpers */
function getFieldSection() {
return cy.findByTestId("field-section");
}
+function getFieldSectioHeader() {
+ return cy.findByTestId("field-section-header");
+}
+
function getFieldNameInput() {
return getFieldSection().findByPlaceholderText("Give this field a name");
}
@@ -428,6 +442,10 @@ function getFieldSuffixInput() {
return getFieldSection().findByTestId("suffix");
}
+function getFieldSectionCloseButton() {
+ return getFieldSectioHeader().findByRole("link", { name: /close/ });
+}
+
/** preview section helpers */
function getPreviewSection() {
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
index 2f47d429f63..fb632d9cbef 100644
--- a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
@@ -206,7 +206,10 @@ describe("bulk table operations", () => {
cy.log("publish and check publish state column");
- TablePicker.getTable("Accounts").find('input[type="checkbox"]').check();
+ TablePicker.getTable("Accounts")
+ .find('input[type="checkbox"]')
+ .scrollIntoView()
+ .check();
TablePicker.getTable("Animals").find('input[type="checkbox"]').check();
cy.findByRole("button", { name: /Publish/ }).click();
H.modal().findByText("Publish these tables").click();
diff --git a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
index 79eac3e5e16..7282b557fc1 100644
--- a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
@@ -3537,6 +3537,37 @@ describe("scenarios > data studio > datamodel", () => {
});
});
+ it("should allow you to close table and field details", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getPreviewButton().click({ scrollBehavior: "center" });
+
+ PreviewSection.get().should("exist");
+
+ FieldSection.getCloseButton().click();
+
+ PreviewSection.get().should("not.exist");
+ FieldSection.get().should("not.exist");
+ TableSection.get().should("exist");
+
+ TableSection.getCloseButton().click();
+ TableSection.get().should("not.exist");
+
+ cy.log(
+ "ensure that preview opened state was cleared and does not re-appear",
+ );
+ TablePicker.getTable("Orders").click();
+ TableSection.clickField("Subtotal");
+ PreviewSection.get().should("not.exist");
+ FieldSection.get().should("exist");
+ TableSection.get().should("exist");
+ });
+
describe("Error handling", { tags: "@external" }, () => {
beforeEach(() => {
H.restore("postgres-writable");
diff --git a/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
index 3f4eab7f817..b721b940dac 100644
--- a/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
@@ -86,10 +86,12 @@ describe("scenarios > data studio > library > tables", () => {
});
describe("fields", () => {
- it("should be able to rename fields", () => {
+ beforeEach(() => {
H.createLibrary();
H.publishTables({ table_ids: [ORDERS_ID] });
+ });
+ it("should be able to rename fields", () => {
H.DataStudio.Tables.visitOverviewPage(ORDERS_ID);
H.tableHeaderColumn("Total").should("be.visible");
@@ -104,6 +106,23 @@ describe("scenarios > data studio > library > tables", () => {
H.DataStudio.Tables.overviewTab().click();
H.tableHeaderColumn("Total changed").should("be.visible");
});
+
+ it("should allow you to close field details and preview panels", () => {
+ H.DataStudio.Tables.visitFieldsPage(ORDERS_ID);
+ H.DataModel.TableSection.clickField("Total");
+ H.DataModel.FieldSection.getPreviewButton().click({
+ scrollBehavior: "center",
+ });
+
+ H.DataModel.FieldSection.getCloseButton().click();
+
+ H.DataModel.PreviewSection.get().should("not.exist");
+ H.DataModel.FieldSection.get().should("not.exist");
+
+ H.DataModel.TableSection.clickField("Discount");
+ H.DataModel.PreviewSection.get().should("not.exist");
+ H.DataModel.FieldSection.get().should("exist");
+ });
});
describe("dependencies", () => {
diff --git a/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
index d92d45139fc..eb76a857c74 100644
--- a/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
@@ -598,7 +598,7 @@ describe("scenarios > visualizations > table > dashboards context", () => {
H.editDashboard();
// Ensure resizing change page size
- H.resizeDashboardCard({ card: cy.get("@tableDashcard"), x: 600, y: 600 });
+ H.resizeDashboardCard({ card: cy.get("@tableDashcard"), x: 600, y: 700 });
H.saveDashboard();
cy.get("@tableDashcard")
.findByText(rowsRegex)
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.tsx
index 546301944d6..0dc1187a565 100644
--- 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.tsx
@@ -1,11 +1,11 @@
-import type React from "react";
+import React from "react";
import { Stack, type StackProps } from "metabase/ui";
-export const PageContainer = ({
- children,
- ...rest
-}: React.PropsWithChildren<StackProps>) => {
+export const PageContainer = React.forwardRef(function PageContainerInner(
+ { children, ...rest }: React.PropsWithChildren<StackProps>,
+ ref: React.Ref<HTMLDivElement>,
+) {
return (
<Stack
bg="background-light"
@@ -14,9 +14,10 @@ export const PageContainer = ({
px="3.5rem"
gap="xl"
style={{ overflow: "auto" }}
+ ref={ref}
{...rest}
>
{children}
</Stack>
);
-};
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css
index eaea45accbe..f3b68fe7741 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css
@@ -61,6 +61,10 @@
opacity: 1;
}
}
+
+ &:last-child {
+ border-bottom: none;
+ }
}
.icon {
@@ -89,8 +93,7 @@
}
.checkboxColumn {
- flex-shrink: 0;
- width: rem(40px);
+ flex: 0 0 rem(40px);
display: flex;
align-items: center;
justify-content: flex-start;
@@ -121,6 +124,9 @@
user-select: none;
overflow-wrap: anywhere;
white-space: nowrap;
+ overflow-x: hidden;
+ text-overflow: ellipsis;
+ flex: 1 1 0;
}
.content {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx
index 04cc8c16b85..90e7dedd246 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx
@@ -538,7 +538,14 @@ const ResultsItem = ({
/>
</Box>
- <Flex align="center" py="xs" w="100%" pl={indent} gap="sm">
+ <Flex
+ align="center"
+ py="xs"
+ pl={indent}
+ gap="sm"
+ flex={1}
+ style={{ overflow: "hidden" }}
+ >
<Flex align="flex-start" gap="xs" className={S.content}>
<Flex align="center" gap="xs">
<Box
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
index bcf05d4fd35..63395404b8f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
@@ -7,6 +7,7 @@ import {
Badge,
Box,
Button,
+ Card,
Group,
Icon,
Input,
@@ -70,7 +71,7 @@ export function TablePicker({
className={className}
style={{ overflow: "hidden" }}
>
- <Group gap="sm" p="lg" pb={0}>
+ <Group gap="sm" p={0}>
<Input
flex="1"
leftSection={<Icon name="search" />}
@@ -135,7 +136,7 @@ export function TablePicker({
</Popover>
</Group>
- <Box mih={0} flex="1 1 auto">
+ <Card mih={0} flex="1 1 auto" withBorder px={0} pb={0}>
{deferredQuery === "" && filtersCount === 0 ? (
<Tree
path={path}
@@ -145,7 +146,7 @@ export function TablePicker({
) : (
<SearchNew query={deferredQuery} params={params} filters={filters} />
)}
- </Box>
+ </Card>
</Stack>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
index 816484d741b..1aef2a285d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -198,7 +198,7 @@ const TableSectionBase = ({
return (
<Stack data-testid="table-section" gap="md" pb="xl">
- <Box className={S.header} px="lg" mt="lg">
+ <Box className={S.header}>
<NameDescriptionInput
description={table.description ?? ""}
descriptionPlaceholder={t`Give this table a description`}
@@ -211,147 +211,134 @@ const TableSectionBase = ({
/>
</Box>
- <Box px="lg">
- <Group justify="stretch" gap="sm">
+ <Group justify="stretch" gap="sm">
+ <Button
+ flex="1"
+ p="sm"
+ leftSection={
+ <Icon name={table.is_published ? "unpublish" : "publish"} />
+ }
+ onClick={handlePublishToggle}
+ >
+ {table.is_published ? t`Unpublish` : t`Publish`}
+ </Button>
+ <Button
+ flex="1"
+ leftSection={<Icon name="settings" />}
+ onClick={onSyncOptionsClick}
+ >
+ {t`Sync settings`}
+ </Button>
+ <Tooltip label={t`Dependency graph`}>
<Button
- flex="1"
+ component={ForwardRefLink}
+ to={dependencyGraph({
+ entry: { id: Number(table.id), type: "table" },
+ })}
p="sm"
- leftSection={
- <Icon name={table.is_published ? "unpublish" : "publish"} />
- }
- onClick={handlePublishToggle}
- >
- {table.is_published ? t`Unpublish` : t`Publish`}
- </Button>
- <Button
- flex="1"
- leftSection={<Icon name="settings" />}
- onClick={onSyncOptionsClick}
- >
- {t`Sync settings`}
- </Button>
- <Tooltip label={t`Dependency graph`}>
- <Button
- component={ForwardRefLink}
- to={dependencyGraph({
- entry: { id: Number(table.id), type: "table" },
- })}
- p="sm"
- leftSection={<Icon name="network" />}
- style={{
- flexGrow: 0,
- width: 40,
- }}
- aria-label={t`Dependency graph`}
- />
- </Tooltip>
- <Box style={{ flexGrow: 0, width: 40 }}>
- <TableLink table={table} />
- </Box>
- </Group>
- </Box>
-
- <Box px="lg">
- <TableAttributesEditSingle table={table} />
- </Box>
+ leftSection={<Icon name="network" />}
+ style={{
+ flexGrow: 0,
+ width: 40,
+ }}
+ aria-label={t`Dependency graph`}
+ />
+ </Tooltip>
+ <Box style={{ flexGrow: 0, width: 40 }}>
+ <TableLink table={table} />
+ </Box>
+ </Group>
+
+ <TableAttributesEditSingle table={table} />
+
+ <TableSectionGroup title={t`Metadata`}>
+ <TableMetadata table={table} />
+ </TableSectionGroup>
+
+ {table.is_published && <TableCollection table={table} />}
+
+ <Tabs value={activeTab} onChange={handleTabChange}>
+ <Tabs.List mb="md">
+ <Tabs.Tab
+ value="field"
+ leftSection={<Icon name="list" />}
+ >{t`Fields`}</Tabs.Tab>
+ <Tabs.Tab
+ value="segments"
+ leftSection={<Icon name="segment2" />}
+ >{t`Segments`}</Tabs.Tab>
+ </Tabs.List>
+
+ <Tabs.Panel value="field">
+ <Stack gap="md">
+ <Group gap="md" justify="flex-start" wrap="nowrap">
+ {isUpdatingSorting && (
+ <Loader data-testid="loading-indicator" size="xs" />
+ )}
- <Box px="lg">
- <TableSectionGroup title={t`Metadata`}>
- <TableMetadata table={table} />
- </TableSectionGroup>
- </Box>
+ {!isSorting && hasFields && (
+ <ResponsiveButton
+ icon="sort_arrows"
+ showLabel
+ onClick={() => setIsSorting(true)}
+ >{t`Sorting`}</ResponsiveButton>
+ )}
- {table.is_published && (
- <Box px="lg">
- <TableCollection table={table} />
- </Box>
- )}
-
- <Box px="lg">
- <Tabs value={activeTab} onChange={handleTabChange}>
- <Tabs.List mb="md">
- <Tabs.Tab
- value="field"
- leftSection={<Icon name="list" />}
- >{t`Fields`}</Tabs.Tab>
- <Tabs.Tab
- value="segments"
- leftSection={<Icon name="segment2" />}
- >{t`Segments`}</Tabs.Tab>
- </Tabs.List>
-
- <Tabs.Panel value="field">
- <Stack gap="md">
- <Group gap="md" justify="flex-start" wrap="nowrap">
- {isUpdatingSorting && (
- <Loader data-testid="loading-indicator" size="xs" />
- )}
-
- {!isSorting && hasFields && (
- <ResponsiveButton
- icon="sort_arrows"
- showLabel
- onClick={() => setIsSorting(true)}
- >{t`Sorting`}</ResponsiveButton>
- )}
-
- {isSorting && (
- <FieldOrderPicker
- value={table.field_order}
- onChange={handleFieldOrderTypeChange}
- />
- )}
-
- {isSorting && (
- <ResponsiveButton
- icon="check"
- showLabel
- onClick={() => setIsSorting(false)}
- >{t`Done`}</ResponsiveButton>
- )}
- </Group>
-
- {!hasFields && (
- <EmptyState message={t`This table has no fields`} />
+ {isSorting && (
+ <FieldOrderPicker
+ value={table.field_order}
+ onChange={handleFieldOrderTypeChange}
+ />
)}
- {hasFields && (
- <>
- <Box
- style={{
- display: isSorting ? "block" : "none",
- }}
- aria-hidden={!isSorting}
- >
- <TableSortableFieldList
- activeFieldId={activeFieldId}
- table={table}
- onChange={handleCustomFieldOrderChange}
- />
- </Box>
-
- <Box
- style={{
- display: isSorting ? "none" : "block",
- }}
- aria-hidden={isSorting}
- >
- <TableFieldList
- table={table}
- activeFieldId={activeFieldId}
- getFieldHref={getFieldHref}
- />
- </Box>
- </>
+ {isSorting && (
+ <ResponsiveButton
+ icon="check"
+ showLabel
+ onClick={() => setIsSorting(false)}
+ >{t`Done`}</ResponsiveButton>
)}
- </Stack>
- </Tabs.Panel>
+ </Group>
+
+ {!hasFields && <EmptyState message={t`This table has no fields`} />}
+
+ {hasFields && (
+ <>
+ <Box
+ style={{
+ display: isSorting ? "block" : "none",
+ }}
+ aria-hidden={!isSorting}
+ >
+ <TableSortableFieldList
+ activeFieldId={activeFieldId}
+ table={table}
+ onChange={handleCustomFieldOrderChange}
+ />
+ </Box>
+
+ <Box
+ style={{
+ display: isSorting ? "none" : "block",
+ }}
+ aria-hidden={isSorting}
+ >
+ <TableFieldList
+ table={table}
+ activeFieldId={activeFieldId}
+ getFieldHref={getFieldHref}
+ />
+ </Box>
+ </>
+ )}
+ </Stack>
+ </Tabs.Panel>
+
+ <Tabs.Panel value="segments">
+ <SegmentList table={table} />
+ </Tabs.Panel>
+ </Tabs>
- <Tabs.Panel value="segments">
- <SegmentList table={table} />
- </Tabs.Panel>
- </Tabs>
- </Box>
<CreateLibraryModal
title={t`First, let's create your Library`}
explanatorySentence={t`This is where published tables will go.`}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
index 665373f8b30..3c200ddd9bd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
@@ -15,3 +15,7 @@
.preview {
box-shadow: 0 10px 30px 0 hsla(0, 0%, 0%, 0.1);
}
+
+.header {
+ z-index: 10;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
index 29befadbc8b..a2dd682fc61 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -7,6 +7,7 @@ import {
useGetTableQueryMetadataQuery,
useListDatabasesQuery,
} from "metabase/api";
+import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import * as Urls from "metabase/lib/urls";
import {
@@ -18,8 +19,20 @@ import {
} from "metabase/metadata/components";
import { getTableMetadataQuery } from "metabase/metadata/pages/shared/utils";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
-import { Box, Flex, Stack, rem } from "metabase/ui";
+import {
+ Box,
+ Button,
+ Flex,
+ Group,
+ Icon,
+ ScrollArea,
+ Stack,
+ rem,
+} from "metabase/ui";
import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer/PageContainer";
+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import { hasLibraryCollection } from "metabase-enterprise/data-studio/common/utils";
import { trackMetadataChange } from "../../analytics";
@@ -55,6 +68,7 @@ function DataModelContent({ params }: Props) {
hasOnlyOneTableSelected,
selectedTables,
hasSelectedMoreThanOneTable,
+ resetSelection,
} = useSelection();
const parsedParams = parseRouteParams(params);
const {
@@ -135,7 +149,7 @@ function DataModelContent({ params }: Props) {
);
const scrollToPanel = useCallback((el: HTMLDivElement | null) => {
- el?.scrollIntoView({ behavior: "smooth" });
+ el?.scrollIntoView({ behavior: "smooth", inline: "end" });
}, []);
if (databasesData?.data?.length === 0) {
@@ -162,14 +176,18 @@ function DataModelContent({ params }: Props) {
h="100%"
style={{ overflow: "auto" }}
>
- <Stack
- className={S.column}
- flex={COLUMN_CONFIG.nav.flex}
- gap={0}
- h="100%"
+ <PageContainer
maw={COLUMN_CONFIG.nav.max}
miw={COLUMN_CONFIG.nav.min}
+ flex={COLUMN_CONFIG.nav.flex}
+ className={S.column}
+ gap={0}
>
+ <PaneHeader
+ breadcrumbs={
+ <DataStudioBreadcrumbs>{t`Data structure`}</DataStudioBreadcrumbs>
+ }
+ />
<RouterTablePicker
databaseId={databaseId}
schemaName={schemaName}
@@ -177,7 +195,7 @@ function DataModelContent({ params }: Props) {
params={params}
setOnUpdateCallback={setOnUpdateCallback}
/>
- </Stack>
+ </PageContainer>
<>
{databaseId != null &&
@@ -218,23 +236,53 @@ function DataModelContent({ params }: Props) {
justify={error ? "center" : undefined}
maw={COLUMN_CONFIG.table.max}
miw={COLUMN_CONFIG.table.min}
+ ref={scrollToPanel}
+ gap={0}
>
- <LoadingAndErrorWrapper error={error} loading={isLoading}>
- {table && (
- <TableSection
- /**
- * Make sure internal component state is reset when changing tables.
- * This is to avoid state mix-up with optimistic updates.
- */
- key={table.id}
- table={table}
- activeFieldId={fieldId}
- activeTab={activeTab}
- hasLibrary={hasLibrary}
- onSyncOptionsClick={openSyncModal}
- />
- )}
- </LoadingAndErrorWrapper>
+ <Group
+ justify="space-between"
+ w="100%"
+ data-testid="table-section-header"
+ py="lg"
+ bg="bg-light"
+ className={S.header}
+ px="lg"
+ >
+ <DataStudioBreadcrumbs>{t`Table details`}</DataStudioBreadcrumbs>
+ <Button
+ component={ForwardRefLink}
+ to={Urls.dataStudioData({
+ databaseId: table?.db_id,
+ schemaName: table?.schema,
+ })}
+ leftSection={<Icon name="close" c="text-medium" />}
+ variant="subtle"
+ p="sm"
+ size="compact-sm"
+ onClick={() => {
+ closePreview();
+ resetSelection();
+ }}
+ />
+ </Group>
+ <ScrollArea flex={1} px="lg" type="hover">
+ <LoadingAndErrorWrapper error={error} loading={isLoading}>
+ {table && (
+ <TableSection
+ /**
+ * Make sure internal component state is reset when changing tables.
+ * This is to avoid state mix-up with optimistic updates.
+ */
+ key={table.id}
+ table={table}
+ activeFieldId={fieldId}
+ activeTab={activeTab}
+ hasLibrary={hasLibrary}
+ onSyncOptionsClick={openSyncModal}
+ />
+ )}
+ </LoadingAndErrorWrapper>
+ </ScrollArea>
</Stack>
)}
@@ -249,33 +297,58 @@ function DataModelContent({ params }: Props) {
maw={COLUMN_CONFIG.field.max}
miw={COLUMN_CONFIG.field.min}
ref={scrollToPanel}
+ gap={0}
>
- <LoadingAndErrorWrapper error={error} loading={isLoading}>
- {field && table && databaseId != null && (
- <Box flex="1" h="100%" maw={COLUMN_CONFIG.field.max}>
- <FieldSection
- /**
- * Make sure internal component state is reset when changing fields.
- * This is to avoid state mix-up with optimistic updates.
- */
- key={getRawTableFieldId(field)}
- field={field}
- parent={parentField}
- table={table}
- getFieldHref={(fieldId) =>
- Urls.dataStudioData({ ...parsedParams, fieldId })
- }
- onTrackMetadataChange={trackMetadataChange}
- onFieldValuesClick={openFieldValuesModal}
- onPreviewClick={togglePreview}
- />
- </Box>
- )}
- </LoadingAndErrorWrapper>
+ <Group
+ justify="space-between"
+ w="100%"
+ data-testid="field-section-header"
+ p="lg"
+ bg="bg-light"
+ className={S.header}
+ >
+ <DataStudioBreadcrumbs>{t`Field details`}</DataStudioBreadcrumbs>
+ <Button
+ component={ForwardRefLink}
+ to={Urls.dataStudioData({
+ databaseId: table?.db_id,
+ schemaName: table?.schema,
+ tableId: table?.id,
+ })}
+ leftSection={<Icon name="close" c="text-medium" />}
+ variant="subtle"
+ size="compact-sm"
+ onClick={closePreview}
+ />
+ </Group>
+ <ScrollArea flex={1} px="lg" type="hover">
+ <LoadingAndErrorWrapper error={error} loading={isLoading}>
+ {field && table && databaseId != null && (
+ <>
+ <FieldSection
+ /**
+ * Make sure internal component state is reset when changing fields.
+ * This is to avoid state mix-up with optimistic updates.
+ */
+ key={getRawTableFieldId(field)}
+ field={field}
+ parent={parentField}
+ table={table}
+ getFieldHref={(fieldId) =>
+ Urls.dataStudioData({ ...parsedParams, fieldId })
+ }
+ onTrackMetadataChange={trackMetadataChange}
+ onFieldValuesClick={openFieldValuesModal}
+ onPreviewClick={togglePreview}
+ />
+ </>
+ )}
+ </LoadingAndErrorWrapper>
- {!isLoading && !error && !field && (
- <LoadingAndErrorWrapper error={t`Not found.`} />
- )}
+ {!isLoading && !error && !field && (
+ <LoadingAndErrorWrapper error={t`Not found.`} />
+ )}
+ </ScrollArea>
</Stack>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
index dd93ff6a484..b4e0a92cd5c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
@@ -3,7 +3,7 @@ import type { Column, ColumnSizeConfig } from "./types";
export const COLUMN_CONFIG: Record<Column, ColumnSizeConfig> = {
nav: {
flex: "6 1 0",
- min: 600,
+ min: 800,
max: "100%",
},
table: {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx
index 84d0779c8d5..01a5bc6f658 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableHeader.tsx
@@ -4,7 +4,10 @@ import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/co
import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
import type { Table } from "metabase-types/api";
-import { PaneHeader } from "../../../common/components/PaneHeader";
+import {
+ PaneHeader,
+ type PaneHeaderProps,
+} from "../../../common/components/PaneHeader";
import { TableMoreMenu } from "./TableMoreMenu";
import { TableNameInput } from "./TableNameInput";
@@ -12,9 +15,9 @@ import { TableTabs } from "./TableTabs";
type TableHeaderProps = {
table: Table;
-};
+} & PaneHeaderProps;
-export function TableHeader({ table }: TableHeaderProps) {
+export function TableHeader({ table, ...rest }: TableHeaderProps) {
const { path, isLoadingPath } = useCollectionPath({
collectionId: table.collection_id,
});
@@ -40,6 +43,7 @@ export function TableHeader({ table }: TableHeaderProps) {
<span>{table.display_name}</span>
</DataStudioBreadcrumbs>
}
+ {...rest}
/>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css
index cf41c9d7ba4..029d1be6cbb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.module.css
@@ -10,3 +10,7 @@
.preview {
box-shadow: 0 10px 30px 0 hsla(0, 0%, 0%, 0.1);
}
+
+.header {
+ z-index: 10;
+}
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.tsx
index 52244615342..c95a012aed9 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
@@ -1,6 +1,8 @@
import { useDisclosure } from "@mantine/hooks";
import { useState } from "react";
+import { t } from "ttag";
+import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import * as Urls from "metabase/lib/urls";
import {
@@ -12,8 +14,17 @@ import {
SyncOptionsModal,
TableSection,
} from "metabase/metadata/components";
-import { Box, Center, Flex, Stack } from "metabase/ui";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
+import {
+ Box,
+ Button,
+ Center,
+ Flex,
+ Group,
+ Icon,
+ Stack,
+ Text,
+} from "metabase/ui";
+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer/PageContainer";
import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";
import { trackMetadataChange } from "../../analytics";
@@ -54,9 +65,13 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {
}
return (
- <PageContainer data-testid="table-fields-page" gap="md">
- <TableHeader table={table} />
- <Flex className={S.body} flex={1}>
+ <PageContainer data-testid="table-fields-page" gap="md" px={0} pb={0}>
+ <TableHeader table={table} px="3.5rem" />
+ <Flex
+ className={S.body}
+ flex={1}
+ style={{ borderTop: "1px solid var(--mb-color-border)" }}
+ >
<Stack className={S.column} flex="8 1 0" miw={320} maw={640} mih={0}>
<TableSection
/**
@@ -70,12 +85,42 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {
Urls.dataStudioTableFields(tableId, fieldId)
}
onSyncOptionsClick={openSyncModal}
- px={0}
+ pl="3.5rem"
pr="lg"
/>
</Stack>
{field != null && (
- <Stack className={S.column} flex="9 1 0" miw={320} maw={680} mih={0}>
+ <Stack
+ className={S.column}
+ flex="9 1 0"
+ miw={320}
+ maw={680}
+ mih={0}
+ px="lg"
+ gap="0"
+ pos="relative"
+ >
+ <Group
+ justify="space-between"
+ pt="lg"
+ pb="md"
+ data-testid="field-section-header"
+ pos="sticky"
+ top={0}
+ className={S.header}
+ bg="bg-light"
+ >
+ <Text fw="bold">{t`Field Details`}</Text>
+ <Button
+ component={ForwardRefLink}
+ to={Urls.dataStudioTableFields(table.id)}
+ onClick={closePreview}
+ leftSection={<Icon name="close" c="text-medium" />}
+ variant="subtle"
+ size="compact-sm"
+ p="sm"
+ />
+ </Group>
<FieldSection
/**
* Make sure internal component state is reset when changing tables.
diff --git a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
index 1752ed92cd3..e11635ec88d 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
+++ b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
@@ -5,7 +5,7 @@ import { useUpdateFieldMutation } from "metabase/api";
import { getColumnIcon } from "metabase/common/utils/columns";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
-import { Group, Stack, Text } from "metabase/ui";
+import { Group, Stack, type StackProps, Text } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { MetadataEditEventDetail } from "metabase-types/analytics";
import type { Field, FieldId, Table } from "metabase-types/api";
@@ -37,7 +37,8 @@ const FieldSectionBase = ({
onFieldValuesClick,
onPreviewClick,
onTrackMetadataChange,
-}: FieldSectionBaseProps) => {
+ ...stackProps
+}: FieldSectionBaseProps & StackProps) => {
const id = getRawTableFieldId(field);
const [updateField] = useUpdateFieldMutation();
const { sendErrorToast, sendSuccessToast, sendUndoToast } =
@@ -89,8 +90,8 @@ const FieldSectionBase = ({
};
return (
- <Stack data-testid="field-section" gap={0} pb="lg">
- <Stack gap="md" pb="md" pt="lg" px="lg">
+ <Stack data-testid="field-section" gap={0} pb="lg" {...stackProps}>
+ <Stack gap="md" pb="md">
<NameDescriptionInput
description={field.description ?? ""}
descriptionPlaceholder={t`Give this field a description`}
@@ -139,7 +140,7 @@ const FieldSectionBase = ({
</Group>
</Stack>
- <Stack gap="xl" px="lg">
+ <Stack gap="xl">
<DataSection
field={field}
onTrackMetadataChange={onTrackMetadataChange}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
index 3c6c1196f26..3df637ee6de 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
@@ -178,7 +178,7 @@ export const DataModelV1 = ({ children, location, params }: Props) => {
>
<LoadingAndErrorWrapper error={error} loading={isLoading}>
{field && table && (
- <Box flex="1" h="100%" maw={COLUMN_CONFIG.field.max}>
+ <Box flex="1" h="100%" maw={COLUMN_CONFIG.field.max} p="lg">
<FieldSection
/**
* Make sure internal component state is reset when changing fields.
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg
index 7f4baba1ede..fa48a7f03d3 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5303 6.53033C11.8232 6.23744 11.8232 5.76256 11.5303 5.46967C11.2374 5.17678 10.7626 5.17678 10.4697 5.46967L7 8.93934L5.53033 7.46967C5.23744 7.17678 4.76256 7.17678 4.46967 7.46967C4.17678 7.76256 4.17678 8.23744 4.46967 8.53033L6.46967 10.5303C6.76256 10.8232 7.23744 10.8232 7.53033 10.5303L11.5303 6.53033Z" fill="#071722" fill-opacity="0.51"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.25C4.27208 1.25 1.25 4.27208 1.25 8C1.25 11.7279 4.27208 14.75 8 14.75C11.7279 14.75 14.75 11.7279 14.75 8C14.75 4.27208 11.7279 1.25 8 1.25ZM2.75 8C2.75 5.10051 5.10051 2.75 8 2.75C10.8995 2.75 13.25 5.10051 13.25 8C13.25 10.8995 10.8995 13.25 8 13.25C5.10051 13.25 2.75 10.8995 2.75 8Z" fill="#071722" fill-opacity="0.51"/>
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.5303 6.53033C11.8232 6.23744 11.8232 5.76256 11.5303 5.46967C11.2374 5.17678 10.7626 5.17678 10.4697 5.46967L7 8.93934L5.53033 7.46967C5.23744 7.17678 4.76256 7.17678 4.46967 7.46967C4.17678 7.76256 4.17678 8.23744 4.46967 8.53033L6.46967 10.5303C6.76256 10.8232 7.23744 10.8232 7.53033 10.5303L11.5303 6.53033Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.25C4.27208 1.25 1.25 4.27208 1.25 8C1.25 11.7279 4.27208 14.75 8 14.75C11.7279 14.75 14.75 11.7279 14.75 8C14.75 4.27208 11.7279 1.25 8 1.25ZM2.75 8C2.75 5.10051 5.10051 2.75 8 2.75C10.8995 2.75 13.25 5.10051 13.25 8C13.25 10.8995 10.8995 13.25 8 13.25C5.10051 13.25 2.75 10.8995 2.75 8Z" />
</svg>