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
Use Breadcrumb component in Detail View (#79892)
Oleh K1821975d0cf3
diff --git a/e2e/test/scenarios/detail-view/detail-view.cy.spec.ts b/e2e/test/scenarios/detail-view/detail-view.cy.spec.tsindex 93c198a0618..605ae9e4859 100644--- a/e2e/test/scenarios/detail-view/detail-view.cy.spec.ts+++ b/e2e/test/scenarios/detail-view/detail-view.cy.spec.ts@@ -32,7 +32,11 @@ describe("detail view", () => {H.appBar().within(() => {cy.findByRole("link", { name: /Sample Database/ }).should("be.visible")- .and("have.attr", "href", `/browse/databases/${SAMPLE_DB_ID}`);+ .and(+ "have.attr",+ "href",+ `/browse/databases/${SAMPLE_DB_ID}-sample-database`,+ );cy.findByRole("link", { name: "Products" }).should("be.visible").and("have.attr", "href", `/table/${PRODUCTS_ID}-products`);diff --git a/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsx b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsxindex 5d4cbbc2ae2..5ceec5fddf8 100644--- a/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsx+++ b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsx@@ -17,6 +17,7 @@ interface Props {iconClassName?: string;iconColor?: ColorName;iconSize?: number;+ showTooltip?: boolean;to?: string;onClick?: () => void;}@@ -29,6 +30,7 @@ export const Breadcrumb = ({iconClassName,iconColor,iconSize,+ showTooltip = false,to,onClick,}: Props) => {@@ -62,7 +64,7 @@ export const Breadcrumb = ({className={S.text}fw="bold"lh="normal"- showTooltip={false}+ showTooltip={showTooltip}>{children}</Ellipsified>diff --git a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.module.css b/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.module.cssdeleted file mode 100644index 749d3464b2f..00000000000--- a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.module.css+++ /dev/null@@ -1,9 +0,0 @@-.breadcrumb {- overflow: hidden;-}--.link {- &:hover {- color: var(--mb-color-core-brand) !important;- }-}diff --git a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsx b/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsxdeleted file mode 100644index b46fc817cc1..00000000000--- a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsx+++ /dev/null@@ -1,51 +0,0 @@-import cx from "classnames";-import type { ReactNode } from "react";--import { Link } from "metabase/common/components/Link";-import { Ellipsified } from "metabase/ui";-import { Box, type BoxProps, Group, Icon, rem } from "metabase/ui";-import type { IconName } from "metabase-types/api";--import S from "./Breadcrumb.module.css";--interface Props extends BoxProps {- children?: ReactNode;- icon?: IconName;- href?: string;-}--export const Breadcrumb = ({- children,- className,- href,- icon,- ...props-}: Props) => {- if (href) {- return (- <Box- c="text-secondary"- className={cx(S.breadcrumb, S.link, className)}- component={Link}- to={href}- {...props}- >- <Group align="center" gap={rem(10)} wrap="nowrap">- {icon && <Icon flex="0 0 auto" name={icon} />}-- <Ellipsified tooltip={children}>{children}</Ellipsified>- </Group>- </Box>- );- }-- return (- <Box c="text-secondary" className={cx(S.breadcrumb, className)} {...props}>- <Group align="center" gap={rem(10)} wrap="nowrap">- {icon && <Icon flex="0 0 auto" name={icon} />}-- <Ellipsified tooltip={children}>{children}</Ellipsified>- </Group>- </Box>- );-};diff --git a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/index.ts b/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/index.tsdeleted file mode 100644index 3bc34d185a9..00000000000--- a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./Breadcrumb";diff --git a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsxindex 204da25c63a..7986b81a8e0 100644--- a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx@@ -1,28 +1,16 @@-import { useGetCollectionQuery } from "metabase/api";-import * as Urls from "metabase/urls";+import { CollectionBadge } from "metabase/questions/components/CollectionBadge";import type { CollectionId } from "metabase-types/api";-import { Breadcrumb } from "./Breadcrumb";import { Separator } from "./Separator";interface Props {collectionId: CollectionId;}-export const CollectionBreadcrumb = ({ collectionId }: Props) => {- const { data: collection } = useGetCollectionQuery({ id: collectionId });+export const CollectionBreadcrumb = ({ collectionId }: Props) => (+ <>+ <CollectionBadge collectionId={collectionId} />- if (!collection) {- return null;- }-- return (- <>- <Breadcrumb href={Urls.collection(collection)} icon="folder">- {collection.name}- </Breadcrumb>-- <Separator />- </>- );-};+ <Separator />+ </>+);diff --git a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsxindex 25733768656..586f8c5b4a0 100644--- a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx@@ -5,12 +5,13 @@ import {useGetCardQuery,useGetCollectionQuery,} from "metabase/api";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";+import { CollectionBadge } from "metabase/questions/components/CollectionBadge";import { Group, type GroupProps } from "metabase/ui";import * as Urls from "metabase/urls";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { Table } from "metabase-types/api";-import { Breadcrumb } from "./Breadcrumb";import { CollectionBreadcrumb } from "./CollectionBreadcrumb";import { Separator } from "./Separator";import { getCollectionList } from "./utils";@@ -46,9 +47,7 @@ export const ModelNav = ({ rowName, table, ...props }: Props) => {{collection && (<>- <Breadcrumb href={Urls.collection(collection)} icon="folder">- {collection.name}- </Breadcrumb>+ <CollectionBadge collectionId={collection.id} /><Separator /></>@@ -56,7 +55,7 @@ export const ModelNav = ({ rowName, table, ...props }: Props) => {{card && (<>- <Breadcrumb href={Urls.card(card)} icon="model">+ <Breadcrumb icon="model" to={Urls.card(card)} showTooltip>{card.name}</Breadcrumb>@@ -64,7 +63,7 @@ export const ModelNav = ({ rowName, table, ...props }: Props) => {</>)}- {rowName && <Breadcrumb>{rowName}</Breadcrumb>}+ {rowName && <Breadcrumb showTooltip>{rowName}</Breadcrumb>}</Group>);};diff --git a/frontend/src/metabase/detail-view/components/Nav/Separator.tsx b/frontend/src/metabase/detail-view/components/Nav/Separator.tsxindex 838fdab81a5..d24b221a06d 100644--- a/frontend/src/metabase/detail-view/components/Nav/Separator.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/Separator.tsx@@ -1,7 +1,13 @@-import { Text } from "metabase/ui";+import { Box } from "metabase/ui";export const Separator = () => (- <Text c="text-secondary" flex="0 0 auto" fw="bold">+ <Box+ c="text-disabled"+ flex="0 0 auto"+ fw="bold"+ fz="0.8em"+ style={{ userSelect: "none" }}+ >/- </Text>+ </Box>);diff --git a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsxindex cddc7902989..f83fb81a8d2 100644--- a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx@@ -1,11 +1,11 @@import type { ReactNode } from "react";import { skipToken, useListDatabaseSchemasQuery } from "metabase/api";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";import { Group, type GroupProps } from "metabase/ui";import * as Urls from "metabase/urls";import { type Table, isConcreteTableId } from "metabase-types/api";-import { Breadcrumb } from "./Breadcrumb";import { Separator } from "./Separator";interface Props extends GroupProps {@@ -25,7 +25,11 @@ export const TableNav = ({ rowName, table, ...props }: Props) => {return (<Group align="center" gap="sm" miw={0} wrap="nowrap" {...props}>- <Breadcrumb href={`/browse/databases/${table.db_id}`} icon="database">+ <Breadcrumb+ icon="database"+ to={Urls.browseDatabase(table.db)}+ showTooltip+ >{table.db.name}</Breadcrumb>@@ -34,7 +38,11 @@ export const TableNav = ({ rowName, table, ...props }: Props) => {<Separator /><Breadcrumb- href={`/browse/databases/${table.db_id}/schema/${encodeURIComponent(table.schema)}`}+ to={Urls.browseSchemaBySlug(+ Urls.databaseSlug(table.db),+ table.schema,+ )}+ showTooltip>{table.schema}</Breadcrumb>@@ -44,11 +52,12 @@ export const TableNav = ({ rowName, table, ...props }: Props) => {<Separator /><Breadcrumb- href={+ to={isConcreteTableId(table.id)? Urls.table({ id: table.id, name: table.display_name }): Urls.tableRowsQuery(table.db_id, table.id)}+ showTooltip>{table.display_name}</Breadcrumb>@@ -57,7 +66,7 @@ export const TableNav = ({ rowName, table, ...props }: Props) => {<><Separator />- <Breadcrumb>{rowName}</Breadcrumb>+ <Breadcrumb showTooltip>{rowName}</Breadcrumb></>)}</Group>diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsxindex 0d3b012c6af..b2bf3524611 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx@@ -2,7 +2,6 @@ import type { ReactNode } from "react";import { t } from "ttag";import { Nav as DetailViewNav } from "metabase/detail-view/components";-import { DETAIL_VIEW_PADDING_LEFT } from "metabase/detail-view/constants";import { MetabotAppBarButton } from "metabase/metabot/components/MetabotAppBarButton";import { useUserMetabotPermissions } from "metabase/metabot/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";@@ -96,7 +95,6 @@ export const AppBarLarge = ({>{detailView ? (<DetailViewNav- ml={DETAIL_VIEW_PADDING_LEFT - 125}rowName={detailView.rowName}table={detailView.table}/>diff --git a/frontend/src/metabase/urls/browse.ts b/frontend/src/metabase/urls/browse.tsindex ef64a1a357b..c58283402a1 100644--- a/frontend/src/metabase/urls/browse.ts+++ b/frontend/src/metabase/urls/browse.ts@@ -7,7 +7,7 @@ import type { Database } from "metabase-types/api";import { appendSlug } from "./utils";-export function browseDatabase(+export function databaseSlug(database: Pick<DatabaseV1 | Database, "id"> &Partial<Pick<DatabaseV1 | Database, "name">>,) {@@ -16,7 +16,14 @@ export function browseDatabase(? "Saved Questions": database.name;- return appendSlug(`/browse/databases/${database.id}`, slugg(name ?? ""));+ return appendSlug(database.id, slugg(name ?? ""));+}++export function browseDatabase(+ database: Pick<DatabaseV1 | Database, "id"> &+ Partial<Pick<DatabaseV1 | Database, "name">>,+) {+ return `/browse/databases/${databaseSlug(database)}`;}export function browseSchema(table: {