Skip to content

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

feat: use new detail view in metadata preview (#63968)

Uladzimir Havenchyk95452f41d34d
diff --git a/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
index 43340ae9b49..dd01b9b0fdd 100644
--- a/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
+++ b/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
@@ -1036,7 +1036,7 @@ describe("scenarios > admin > datamodel", () => {
column: "New tax",
values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
});
- verifyObjectDetailPreview({ index: 4, row: ["New tax", "2.07"] });
+ verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });
cy.log("verify viz");
H.openOrdersTable();
@@ -1429,7 +1429,7 @@ describe("scenarios > admin > datamodel", () => {
column: "New tax",
values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
});
- verifyObjectDetailPreview({ index: 4, row: ["New tax", "2.07"] });
+ verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });
cy.log("verify viz");
H.openOrdersTable();
@@ -1571,7 +1571,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["14", "123", "105", "94", "132"],
});
verifyObjectDetailPreview({
- index: 2,
+ rowNumber: 2,
row: ["Remapped Product ID", "14"],
});
@@ -1669,7 +1669,7 @@ describe("scenarios > admin > datamodel", () => {
],
});
verifyObjectDetailPreview({
- index: 4,
+ rowNumber: 4,
row: ["Rating", "December 31, 1969, 4:00 PM"],
});
@@ -1718,7 +1718,7 @@ describe("scenarios > admin > datamodel", () => {
],
});
verifyObjectDetailPreview({
- index: 4,
+ rowNumber: 4,
row: ["Rating", "December 31, 1969, 4:00 PM"],
});
@@ -1989,8 +1989,8 @@ describe("scenarios > admin > datamodel", () => {
values: ["2.07", "6.10", "2.90", "6.01", "7.03"],
});
verifyObjectDetailPreview({
- index: 4,
- row: ["Tax ($)", "$2.07"],
+ rowNumber: 4,
+ row: ["Tax ($)", "2.07"],
});
cy.log("change currency");
@@ -2009,8 +2009,8 @@ describe("scenarios > admin > datamodel", () => {
values: ["2.07", "6.10", "2.90", "6.01", "7.03"],
});
verifyObjectDetailPreview({
- index: 4,
- row: ["Tax (CA$)", "CA$2.07"],
+ rowNumber: 4,
+ row: ["Tax (CA$)", "2.07"],
});
cy.log("verify viz");
@@ -2175,7 +2175,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
});
verifyObjectDetailPreview({
- index: 4,
+ rowNumber: 4,
row: ["Tax", "2.07"],
});
@@ -2293,7 +2293,7 @@ describe("scenarios > admin > datamodel", () => {
.should("be.visible");
cy.get("@dataset.all").should("have.length", 0);
verifyObjectDetailPreview({
- index: 4,
+ rowNumber: 4,
row: ["Tax", "2.07"],
});
@@ -2509,7 +2509,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["14", "123", "105", "94", "132"],
});
verifyObjectDetailPreview({
- index: 2,
+ rowNumber: 2,
row: ["Product ID", "14"],
});
@@ -2529,7 +2529,7 @@ describe("scenarios > admin > datamodel", () => {
cy.log("verify preview");
verifyObjectDetailPreview({
- index: 2,
+ rowNumber: 2,
row: ["Product ID", "Awesome Concrete Shoes"],
});
verifyTablePreview({
@@ -2670,7 +2670,7 @@ describe("scenarios > admin > datamodel", () => {
cy.log("verify preview");
FieldSection.getPreviewButton().click();
verifyObjectDetailPreview({
- index: 2,
+ rowNumber: 2,
row: ["Product ID", "Awesome Concrete Shoes"],
});
verifyTablePreview({
@@ -2755,7 +2755,7 @@ describe("scenarios > admin > datamodel", () => {
],
});
verifyObjectDetailPreview({
- index: 3,
+ rowNumber: 3,
row: ["Rating", "Perfecto"],
});
@@ -2846,6 +2846,10 @@ describe("scenarios > admin > datamodel", () => {
'You can only use custom mapping for numerical fields with filtering set to "A list of all values"',
);
+ cy.log("close popover by clicking on element inside panel");
+ FieldSection.get().findByText("Field settings").click();
+
+ cy.log("open popover");
FieldSection.getFilteringInput().click();
H.popover().findByText("A list of all values").click();
cy.wait("@updateField");
@@ -2898,7 +2902,7 @@ describe("scenarios > admin > datamodel", () => {
],
});
verifyObjectDetailPreview({
- index: 1,
+ rowNumber: 1,
row: ["User ID", "2023-10-07T01:34:35.462-07:00"],
});
@@ -2952,7 +2956,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["10", "10"],
});
verifyObjectDetailPreview({
- index: 1,
+ rowNumber: 1,
row: ["Json → A", "10"],
});
@@ -3107,7 +3111,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["200%", "300%", "200%", "600%", "500%"],
});
verifyObjectDetailPreview({
- index: 8,
+ rowNumber: 8,
row: ["Quantity", "200%"],
});
});
@@ -3177,7 +3181,7 @@ describe("scenarios > admin > datamodel", () => {
values: ["about 2", "about 3", "about 2", "about 6", "about 5"],
});
verifyObjectDetailPreview({
- index: 8,
+ rowNumber: 8,
row: ["Quantity", "about 2"],
});
@@ -3865,31 +3869,28 @@ function verifyTablePreview({
}
function verifyObjectDetailPreview({
- index,
+ rowNumber,
row,
}: {
- index: number;
+ rowNumber: number;
row: [string, string];
}) {
const [label, value] = row;
- const labelIndex = index * 2;
- const valueIndex = labelIndex + 1;
PreviewSection.getPreviewTypeInput().findByText("Detail").click();
cy.wait("@dataset");
- cy.findAllByTestId("object-details-table-cell").should((elements) => {
- const index = [...elements].findIndex(
- (element) => element.textContent?.trim() === label,
- );
- expect(index).to.eq(labelIndex);
- });
+ cy.findAllByTestId("column-name").then(($els) => {
+ const foundRowIndex = $els
+ .toArray()
+ .findIndex((el) => el.textContent?.trim() === label);
- cy.findAllByTestId("object-details-table-cell").should((elements) => {
- const index = [...elements].findIndex(
- (element) => element.textContent?.trim() === value,
- );
- expect(index).to.eq(valueIndex);
+ expect(rowNumber).to.eq(foundRowIndex);
+
+ cy.findAllByTestId("value")
+ .should("have.length.gte", foundRowIndex)
+ .eq(foundRowIndex)
+ .should("contain", value);
});
}
diff --git a/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx b/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx
index a99c96f998c..465156cf174 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx
@@ -96,7 +96,7 @@ export function DetailViewPage({
w={isMediumBreakpoint ? "100%" : undefined}
>
<Stack gap={rem(64)} h="100%" maw={rem(900)} w="100%">
- {columns.length - headerColumns.length > 0 && (
+ {columns.length > 0 && (
<DetailsGroup
columns={columns}
responsive={isSmallBreakpoint}
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
index 69feeca0247..e1fe96d3043 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
@@ -352,7 +352,7 @@ export function DetailViewSidesheet({
<Group pb={rem(48)} pt="xl" px={rem(56)}>
<Stack gap={rem(64)} h="100%" maw={rem(900)} w="100%">
- {columns.length - headerColumns.length > 0 && (
+ {columns.length > 0 && (
<DetailsGroup
columns={columns}
columnsSettings={columnsSettings}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx b/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx
index 0ec57b67590..75ef4a4bdc9 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx
@@ -1,19 +1,23 @@
-import { memo } from "react";
+import { memo, useMemo } from "react";
import { t } from "ttag";
import { useGetAdhocQueryQuery } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import EmptyState from "metabase/common/components/EmptyState";
-import { Repeat, Skeleton, Stack } from "metabase/ui";
-import Visualization from "metabase/visualizations/components/Visualization";
+import { DetailsGroup, Header } from "metabase/detail-view/components";
+import { getEntityIcon, getHeaderColumns } from "metabase/detail-view/utils";
+import { Box, Repeat, Skeleton, Stack, rem } from "metabase/ui";
+import { extractRemappedColumns } from "metabase/visualizations";
import type {
DatabaseId,
+ DatasetColumn,
DatasetQuery,
Field,
FieldFilter,
FieldId,
FieldReference,
RawSeries,
+ RowValues,
TableId,
} from "metabase-types/api";
import { createMockCard } from "metabase-types/api/mocks";
@@ -42,7 +46,14 @@ const ObjectDetailPreviewBase = ({
});
const data = rawSeries?.[0]?.data;
- const zoomedRow = data?.rows[0];
+ const columns: DatasetColumn[] = useMemo(
+ () => data?.cols ?? [],
+ [data?.cols],
+ );
+ const row: RowValues | undefined = data?.rows[0];
+
+ const headerColumns = useMemo(() => getHeaderColumns(columns), [columns]);
+ const icon = getEntityIcon(field.table?.entity_type);
if (isFetching) {
return (
@@ -58,7 +69,7 @@ const ObjectDetailPreviewBase = ({
return <Error message={error} />;
}
- if (!data || !zoomedRow) {
+ if (!data || !row || columns.length === 0) {
return (
<Stack h="100%" justify="center" p="md">
<EmptyState title={t`No data to show`} />
@@ -66,7 +77,28 @@ const ObjectDetailPreviewBase = ({
);
}
- return <Visualization rawSeries={rawSeries} />;
+ return (
+ <Stack gap={0} p="lg">
+ {headerColumns.length > 0 && (
+ <Box pb="md" pt="xs">
+ <Box ml={rem(-8)}>
+ <Header columns={columns} icon={icon} row={row} />
+ </Box>
+ </Box>
+ )}
+
+ {columns.length > 0 && (
+ <Box pt="xl">
+ <DetailsGroup
+ columns={columns}
+ row={row}
+ table={field.table}
+ responsive
+ />
+ </Box>
+ )}
+ </Stack>
+ );
};
function useDataSample({ databaseId, field, fieldId, tableId }: Props) {
@@ -123,7 +155,7 @@ function useDataSample({ databaseId, field, fieldId, tableId }: Props) {
display: "object",
visualization_settings: {},
}),
- data: data.data,
+ data: extractRemappedColumns(data.data),
},
];