Skip to content

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

Data Model UX (#66847)

Nick Fitzpatrick61146a7e98b4
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.ts
index 6e4f68b42f5..622d32e5e03 100644
--- a/e2e/support/helpers/e2e-datamodel-helpers.ts
+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts
@@ -21,6 +21,7 @@ export const DataModel = {
getTables: getTablePickerTables,
getTable: getTablePickerTable,
getSearchInput: getTablePickerSearchInput,
+ getFilterForm: getTablePickerFilter,
},
TableSection: {
get: getTableSection,
@@ -258,6 +259,10 @@ function getTablePickerSearchInput() {
return cy.findByPlaceholderText("Search tables");
}
+function getTablePickerFilter() {
+ return cy.findByTestId("table-picker-filter");
+}
+
function getTablePickerTables() {
return cy.findAllByTestId("tree-item").filter('[data-type="table"]');
}
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 e044f77638b..79eac3e5e16 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
@@ -97,10 +97,7 @@ describe("scenarios > data studio > datamodel", () => {
TablePicker.getDatabases().should("have.length", 1);
TablePicker.getTables().should("have.length", 8);
- H.DataModel.get()
- .findByText("Not found.")
- .scrollIntoView()
- .should("be.visible");
+ H.DataModel.get().findByText("Not found.").should("be.visible");
cy.location("pathname").should(
"eq",
`/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/field/12345`,
@@ -584,6 +581,12 @@ describe("scenarios > data studio > datamodel", () => {
H.DataModel.visitDataStudio();
+ openFilterPopover();
+
+ cy.log("Filter popover should close on click outside");
+ H.DataModel.TablePicker.getSearchInput().click();
+ H.DataModel.TablePicker.getFilterForm().should("not.exist");
+
openFilterPopover();
selectFilterOption("Visibility type", "Gold");
applyFilters();
@@ -930,8 +933,9 @@ describe("scenarios > data studio > datamodel", () => {
TableSection.clickField("ID");
- // Navbar expansion causes these panels to be off screen
+ // Sometimes in CI this doesn't happen
FieldSection.get().scrollIntoView();
+
FieldSection.getDataType()
.should("be.visible")
.and("have.text", "BIGINT");
@@ -1934,8 +1938,6 @@ describe("scenarios > data studio > datamodel", () => {
verifyAndCloseToast("Semantic type of Quantity updated");
cy.log("verify preview");
- // Navbar expansion causes these panels to be off screen
- FieldSection.get().scrollIntoView();
FieldSection.getPreviewButton().click();
cy.wait("@dataset");
PreviewSection.get()
@@ -1967,10 +1969,8 @@ describe("scenarios > data studio > datamodel", () => {
cy.reload();
cy.wait(["@metadata", "@metadata"]);
- // Navbar expansion causes these panels to be off screen
- FieldSection.get().scrollIntoView();
-
FieldSection.getSemanticTypeFkTarget()
+ .scrollIntoView() //This should not be necessary, but CI consistently fails to scroll into view on mount
.should("be.visible")
.and("have.value", "Products → ID");
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
index 5eef5be6b89..1952e67ff30 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
@@ -34,6 +34,7 @@ export function FilterPopover({ filters, onSubmit }: Props) {
event.preventDefault();
onSubmit(form);
}}
+ data-testid="table-picker-filter"
>
<Stack gap="xl" p="lg">
<LayerInput
@@ -42,6 +43,11 @@ export function FilterPopover({ filters, onSubmit }: Props) {
onChange={(dataLayer) => {
setForm((form) => ({ ...form, dataLayer }));
}}
+ comboboxProps={{
+ withinPortal: false,
+ floatingStrategy: "fixed",
+ }}
+ autoFocus
/>
<UserInput
@@ -55,6 +61,10 @@ export function FilterPopover({ filters, onSubmit }: Props) {
onUserIdChange={(ownerUserId) => {
setForm((form) => ({ ...form, ownerEmail: null, ownerUserId }));
}}
+ comboboxProps={{
+ withinPortal: false,
+ floatingStrategy: "fixed",
+ }}
/>
<DataSourceInput
@@ -64,6 +74,10 @@ export function FilterPopover({ filters, onSubmit }: Props) {
onChange={(dataSource) => {
setForm((form) => ({ ...form, dataSource }));
}}
+ comboboxProps={{
+ withinPortal: false,
+ floatingStrategy: "fixed",
+ }}
/>
<Checkbox
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 d5837ab22d8..bcf05d4fd35 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
@@ -92,9 +92,14 @@ export function TablePicker({
onChange={(event) => setQuery(event.target.value)}
/>
- <Popover width={rem(340)} position="bottom-start" opened={isOpen}>
+ <Popover
+ width={rem(340)}
+ position="bottom-start"
+ opened={isOpen}
+ onChange={toggle}
+ >
<Popover.Target>
- <Tooltip label={t`Filter`}>
+ <Tooltip label={t`Filter`} disabled={isOpen}>
<Button
aria-label={t`Filter`}
leftSection={
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 7f68b4838b9..816484d741b 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} bg="accent-gray-light" px="lg" mt="lg">
+ <Box className={S.header} px="lg" mt="lg">
<NameDescriptionInput
description={table.description ?? ""}
descriptionPlaceholder={t`Give this table a description`}
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 3782ac4e455..29befadbc8b 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
@@ -1,5 +1,5 @@
import { useDisclosure, useWindowEvent } from "@mantine/hooks";
-import { type ReactNode, useMemo, useState } from "react";
+import { type ReactNode, useCallback, useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -134,6 +134,10 @@ function DataModelContent({ params }: Props) {
},
);
+ const scrollToPanel = useCallback((el: HTMLDivElement | null) => {
+ el?.scrollIntoView({ behavior: "smooth" });
+ }, []);
+
if (databasesData?.data?.length === 0) {
return <NoDatabasesEmptyState />;
}
@@ -236,7 +240,6 @@ function DataModelContent({ params }: Props) {
{showFieldDetails && (
<Stack
- bg="white"
className={S.column}
flex={COLUMN_CONFIG.field.flex}
h="100%"
@@ -245,6 +248,7 @@ function DataModelContent({ params }: Props) {
}
maw={COLUMN_CONFIG.field.max}
miw={COLUMN_CONFIG.field.min}
+ ref={scrollToPanel}
>
<LoadingAndErrorWrapper error={error} loading={isLoading}>
{field && table && databaseId != null && (
@@ -277,12 +281,12 @@ function DataModelContent({ params }: Props) {
{showFieldPreview && databaseId != null && fieldId != null && (
<Box
- bg="accent-gray-light"
flex={COLUMN_CONFIG.preview.flex}
h="100%"
p="lg"
maw={COLUMN_CONFIG.preview.max}
miw={COLUMN_CONFIG.preview.min}
+ ref={scrollToPanel}
>
<PreviewSection
className={S.preview}
diff --git a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
index d9e810d419b..1752ed92cd3 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
+++ b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx
@@ -89,7 +89,7 @@ const FieldSectionBase = ({
};
return (
- <Stack data-testid="field-section" gap={0} pb="lg" bg="bg-white">
+ <Stack data-testid="field-section" gap={0} pb="lg">
<Stack gap="md" pb="md" pt="lg" px="lg">
<NameDescriptionInput
description={field.description ?? ""}