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
GDGT-2504 Replace deprecated Badge component (#75114)
Kamil Mielnikb324b2bbc8c3
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsxindex 5dd2b16ee23..2f2304537bb 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";import { getShortStrategyLabel } from "metabase/admin/performance/utils";-import { MaybeLink } from "metabase/common/components/Badge/Badge.styled";import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";import { Link } from "metabase/common/components/Link";+import { MaybeLink } from "metabase/common/components/MaybeLink/MaybeLink.styled";import { useGetIcon } from "metabase/hooks/use-icon";import { Box, Button, Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsxindex 69e6a085734..dfaeb6933cd 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx@@ -6,7 +6,7 @@ import type {SdkBreadcrumbItem,SdkBreadcrumbItemType,} from "embedding-sdk-bundle/types/breadcrumb";-import { Badge } from "metabase/common/components/Badge";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";import { useTranslateContent } from "metabase/i18n/hooks";import { Flex } from "metabase/ui";import type { IconName } from "metabase-types/api";@@ -38,17 +38,15 @@ export const SdkBreadcrumbs = ({<Flex align="center" data-testid="sdk-breadcrumbs">{breadcrumbs.map((breadcrumb, index) => (<Fragment key={breadcrumb.id}>- <Badge+ <Breadcrumbicon={getBreadcrumbIcon(breadcrumb.type)}- inactiveColor="text-tertiary"- isSingleLineonClick={() => {navigateTo(breadcrumb);onBreadcrumbClick?.(breadcrumb);}}>{tc(breadcrumb.name)}- </Badge>+ </Breadcrumb>{index < breadcrumbs.length - 1 && (<div className={S.BreadcrumbsPathSeparator}>/</div>diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex f97a39790f8..3897c0a727e 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -9,7 +9,7 @@ import {import { getMetabotVisible } from "metabase/metabot/state";import { AppBar as AppBarView } from "metabase/nav/components/AppBar";import type { AppBarProps } from "metabase/nav/components/AppBar/AppBar";-import QuestionLineage from "metabase/nav/components/QuestionLineage";+import { QuestionLineage } from "metabase/nav/components/QuestionLineage";import { CollectionBreadcrumbs } from "metabase/nav/containers/CollectionBreadcrumbs";import { isQuestionPath } from "metabase/nav/containers/MainNavbar/getSelectedItems";import { zoomInRow } from "metabase/query_builder/actions";diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxindex ed5b58aba0a..18a31579ed7 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx@@ -3,8 +3,8 @@ import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { RawMaybeLink } from "metabase/common/components/Badge/Badge.styled";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";+import { RawMaybeLink } from "metabase/common/components/MaybeLink/MaybeLink.styled";import { Box, type BoxProps } from "metabase/ui";export const ItemLink = styled(RawMaybeLink)<{ to?: string }>`diff --git a/frontend/src/metabase/common/components/Badge/Badge.tsx b/frontend/src/metabase/common/components/Badge/Badge.tsxdeleted file mode 100644index b24a782bbff..00000000000--- a/frontend/src/metabase/common/components/Badge/Badge.tsx+++ /dev/null@@ -1,69 +0,0 @@-import cx from "classnames";-import type { PropsWithChildren } from "react";--import CS from "metabase/css/core/index.css";-import type { IconProps } from "metabase/ui";-import type { IconName } from "metabase-types/api";--import { BadgeIcon, BadgeText, MaybeLink } from "./Badge.styled";--const DEFAULT_ICON_SIZE = 16;--function getIconProps(iconProp: IconName | IconProps) {- const props: IconProps =- typeof iconProp === "string" ? { name: iconProp } : iconProp;- if (!props.size) {- props.size = DEFAULT_ICON_SIZE;- }- return props;-}--type BadgeProps = PropsWithChildren<{- to?: string;- onClick?: () => void;- icon?: IconName | IconProps;- inactiveColor?: string; // Color values may already be resolved by parent components- activeColor?: string; // Color values may already be resolved by parent components- isSingleLine?: boolean;- className?: string;- classNames?: {- root?: string;- icon?: string;- };-}>;--export const Badge = ({- className,- to,- icon,- inactiveColor = "text-secondary",- activeColor = "brand",- isSingleLine = false,- onClick,- children,- classNames = {},- ...props-}: BadgeProps) => (- <MaybeLink- inactiveColor={inactiveColor}- activeColor={activeColor}- isSingleLine={isSingleLine}- to={to}- onClick={onClick}- className={cx(classNames.root, className)}- {...props}- >- {icon && (- <BadgeIcon- {...getIconProps(icon)}- className={classNames.icon}- hasMargin={!!children}- />- )}- {children && (- <BadgeText className={CS.textWrap} isSingleLine={isSingleLine}>- {children}- </BadgeText>- )}- </MaybeLink>-);diff --git a/frontend/src/metabase/common/components/Badge/index.tsx b/frontend/src/metabase/common/components/Badge/index.tsxdeleted file mode 100644index 5c7042709a7..00000000000--- a/frontend/src/metabase/common/components/Badge/index.tsx+++ /dev/null@@ -1 +0,0 @@-export { Badge } from "./Badge";diff --git a/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.module.css b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.module.cssnew file mode 100644index 00000000000..2622f4aca60--- /dev/null+++ b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.module.css@@ -0,0 +1,25 @@+.breadcrumb {+ min-width: 0;+ font-size: 0.875em;+}++.content {+ --color: var(--mb-color-text-tertiary);+ --active-color: var(--mb-color-brand);+}++.icon,+.text {+ color: var(--color);+}++.clickable {+ cursor: pointer;++ &:hover {+ .icon,+ .text {+ color: var(--active-color);+ }+ }+}diff --git a/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsx b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsxnew file mode 100644index 00000000000..7b7bdf22e98--- /dev/null+++ b/frontend/src/metabase/common/components/Breadcrumb/Breadcrumb.tsx@@ -0,0 +1,83 @@+import cx from "classnames";+import type { ReactNode } from "react";++import { Link } from "metabase/common/components/Link";+import { Ellipsified, Group, Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors";+import { color as getColor } from "metabase/ui/utils/colors";+import type { IconName } from "metabase-types/api";++import S from "./Breadcrumb.module.css";++interface Props {+ children: ReactNode;+ className?: string;+ color?: ColorName;+ icon?: IconName;+ iconColor?: ColorName;+ iconSize?: number;+ to?: string;+ onClick?: () => void;+}++export const Breadcrumb = ({+ children,+ className,+ color,+ icon,+ iconColor,+ iconSize,+ to,+ onClick,+}: Props) => {+ const isLink = typeof to === "string" && to.length > 0;++ const content = (+ <Group+ align="center"+ className={cx(S.content, {+ [S.clickable]: isLink || onClick,+ })}+ gap="xs"+ style={{+ "--color": color ? getColor(color) : undefined,+ "--active-color": iconColor ? getColor(iconColor) : undefined,+ }}+ wrap="nowrap"+ >+ {icon && (+ <Icon+ c={iconColor}+ className={S.icon}+ flex="0 0 auto"+ name={icon}+ size={iconSize}+ />+ )}++ <Ellipsified+ c={undefined} // to avoid inline style with would have higher specificity than CSS in Breadcrumb.module.css+ className={S.text}+ fw="bold"+ lh="normal"+ showTooltip={false}+ >+ {children}+ </Ellipsified>+ </Group>+ );++ if (isLink) {+ return (+ <Link className={cx(S.breadcrumb, className)} to={to} onClick={onClick}>+ {content}+ </Link>+ );+ }++ return (+ <span className={cx(S.breadcrumb, className)} onClick={onClick}>+ {content}+ </span>+ );+};diff --git a/frontend/src/metabase/common/components/Breadcrumb/index.ts b/frontend/src/metabase/common/components/Breadcrumb/index.tsnew file mode 100644index 00000000000..eadaed4d9d1--- /dev/null+++ b/frontend/src/metabase/common/components/Breadcrumb/index.ts@@ -0,0 +1 @@+export { Breadcrumb } from "./Breadcrumb";diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsxindex 37cd262833f..b639209d687 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx@@ -12,12 +12,11 @@ import {import { EntityItem } from "metabase/common/components/EntityItem";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";import { Link } from "metabase/common/components/Link";+import { RawMaybeLink } from "metabase/common/components/MaybeLink/MaybeLink.styled";import AdminS from "metabase/css/admin.module.css";import type { IconProps, TextProps } from "metabase/ui";import { FixedSizeIcon, Text } from "metabase/ui";-import { RawMaybeLink } from "../Badge/Badge.styled";-import type { ResponsiveProps } from "./utils";import { getContainerQuery } from "./utils";diff --git a/frontend/src/metabase/common/components/Badge/Badge.styled.tsx b/frontend/src/metabase/common/components/MaybeLink/MaybeLink.styled.tsxsimilarity index 68%rename from frontend/src/metabase/common/components/Badge/Badge.styled.tsxrename to frontend/src/metabase/common/components/MaybeLink/MaybeLink.styled.tsxindex 40f4cd15b6b..7b90671e0c3 100644--- a/frontend/src/metabase/common/components/Badge/Badge.styled.tsx+++ b/frontend/src/metabase/common/components/MaybeLink/MaybeLink.styled.tsx@@ -6,8 +6,6 @@ import type { HTMLAttributes } from "react";import type { LinkProps } from "metabase/common/components/Link";import { Link } from "metabase/common/components/Link";-import { doNotForwardProps } from "metabase/common/utils/doNotForwardProps";-import { Icon } from "metabase/ui";import { maybeColor } from "metabase/ui/utils/colors";interface RawMaybeLinkProps {@@ -32,6 +30,9 @@ const hoverStyle = (props: RawMaybeLinkProps) => css`${props.activeColor ? `color: ${maybeColor(props.activeColor)};` : ""}`;+/**+ * @deprecated styled components are deprecated+ */export const MaybeLink = styled(RawMaybeLink)`display: flex;align-items: center;@@ -45,17 +46,3 @@ export const MaybeLink = styled(RawMaybeLink)`${(props) => (props.to || props.onClick) && hoverStyle(props)}}`;--export const BadgeIcon = styled(- Icon,- doNotForwardProps("hasMargin", "targetOffsetX"),-)<{ hasMargin: boolean }>`- margin-right: ${(props) => (props.hasMargin ? "5px" : 0)};- flex-shrink: 0;-`;--export const BadgeText = styled.span<{ isSingleLine: boolean }>`- overflow: ${(props) => (props.isSingleLine ? "hidden" : "")};- text-overflow: ${(props) => (props.isSingleLine ? "ellipsis" : "")};- white-space: ${(props) => (props.isSingleLine ? "nowrap" : "")};-`;diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.tsxindex 887125a6851..9d7969792e6 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/DefaultParametersSection.tsx@@ -1,10 +1,9 @@import cx from "classnames";import { t } from "ttag";-import { Badge } from "metabase/common/components/Badge";import CS from "metabase/css/core/index.css";import { formatDateValue } from "metabase/parameters/utils/date-formatting";-import { Icon, Title } from "metabase/ui";+import { Ellipsified, Icon, Title } from "metabase/ui";import { conjunct } from "metabase/utils/formatting";import { isNotNull } from "metabase/utils/types";import type { Parameter, ParameterValueOrArray } from "metabase-types/api";@@ -76,14 +75,9 @@ function DefaultParametersSection({>{t`If a dashboard filter has a default value, it'll be applied when your subscription is sent.`}</div>{formattedParameterValues.map((param, index) => {return (- <div- className={cx(CS.pt1, CS.flex, CS.alignCenter, CS.flexWrap)}- key={index}- >- <Badge inactiveColor="text-primary" isSingleLine={true}>- {param.name}: {param.value}- </Badge>- </div>+ <Ellipsified fz="sm" key={index} lh="normal" pt="sm">+ {param.name}: {param.value}+ </Ellipsified>);})}</div>diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsxindex fce818a9662..9da5603586a 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx@@ -1,7 +1,7 @@import { Fragment } from "react";import { t } from "ttag";-import { Badge } from "metabase/common/components/Badge";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";import { useToggle } from "metabase/common/hooks/use-toggle";import { useTranslateContent } from "metabase/i18n/hooks";import { CollectionBadge } from "metabase/questions/components/CollectionBadge";@@ -58,7 +58,6 @@ export const CollectionBreadcrumbs = ({<><CollectionBadgecollectionId={parts[0].id}- isSingleLineonClick={onClick ? () => onClick(collection) : undefined}/>{separator}@@ -75,7 +74,6 @@ export const CollectionBreadcrumbs = ({<Fragment key={collection.id}><CollectionBadgecollectionId={collection.id}- isSingleLineonClick={onClick ? () => onClick(collection) : undefined}/>{separator}@@ -89,21 +87,16 @@ export const CollectionBreadcrumbs = ({{content}<CollectionBadgecollectionId={collection.id}- isSingleLineonClick={onClick ? () => onClick(collection) : undefined}/></Flex>{dashboard && (<>{separator}- <Badge- icon={{ name: "dashboard" }}- inactiveColor="text-tertiary"- isSingleLine- to={Urls.dashboard(dashboard)}- >++ <Breadcrumb icon="dashboard" to={Urls.dashboard(dashboard)}>{tc(dashboard.name)}- </Badge>+ </Breadcrumb></>)}</>diff --git a/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx b/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsxindex aeb33b48760..28de6707002 100644--- a/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx+++ b/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx@@ -1,20 +1,17 @@import { t } from "ttag";-import { Badge } from "metabase/common/components/Badge";import { Link } from "metabase/common/components/Link/Link";import CS from "metabase/css/core/index.css";+import { Ellipsified } from "metabase/ui";import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";-import type { IconName } from "metabase-types/api";export interface QuestionLineageProps {- icon?: IconName;question?: Question;originalQuestion?: Question;}-const QuestionLineage = ({- icon,+export const QuestionLineage = ({question,originalQuestion,}: QuestionLineageProps): JSX.Element | null => {@@ -23,14 +20,18 @@ const QuestionLineage = ({}return (- <Badge icon={icon} isSingleLine>+ <Ellipsified+ c="text-secondary"+ fw="bold"+ lh="normal"+ miw={0}+ fz="0.875em"+ showTooltip={false}+ >{t`Started from`}{" "}<Link className={CS.link} to={Urls.question(originalQuestion)}>{originalQuestion.displayName()}</Link>- </Badge>+ </Ellipsified>);};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default QuestionLineage;diff --git a/frontend/src/metabase/nav/components/QuestionLineage/index.ts b/frontend/src/metabase/nav/components/QuestionLineage/index.tsindex 81f0cf0ec50..0245a81410e 100644--- a/frontend/src/metabase/nav/components/QuestionLineage/index.ts+++ b/frontend/src/metabase/nav/components/QuestionLineage/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./QuestionLineage";+export * from "./QuestionLineage";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.cssindex 35060d4730f..18e9d63f8ea 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css@@ -2,7 +2,7 @@max-width: 100%;&.headVariant {- .HeaderBadge {+ .HeaderBreadcrumb {font-size: 1.25rem;}}@@ -16,12 +16,3 @@padding-right: 0.5em;user-select: none;}--.HeaderBadge {- /* specificity */- .HeaderBadgeIcon {- width: 1em;- height: 1em;- margin-right: 0.5em;- }-}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsxindex e11ba231ef2..c48b0e368ff 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx@@ -6,7 +6,7 @@ import {isValidElement,} from "react";-import { Badge } from "metabase/common/components/Badge";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";import { Box, Flex } from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";@@ -14,14 +14,8 @@ import type { DataSourcePart } from "../QuestionDataSource/utils";import HeaderBreadcrumbsS from "./HeaderBreadcrumbs.module.css";-const HeaderBadge = (props: ComponentProps<typeof Badge>) => (- <Badge- classNames={{- root: HeaderBreadcrumbsS.HeaderBadge,- icon: HeaderBreadcrumbsS.HeaderBadgeIcon,- }}- {...props}- />+const HeaderBreadcrumb = (props: ComponentProps<typeof Breadcrumb>) => (+ <Breadcrumb className={HeaderBreadcrumbsS.HeaderBreadcrumb} {...props} />);function getBadgeInactiveColor({@@ -70,13 +64,13 @@ export function HeadBreadcrumbs({{isDataSourceReactElement(part) ? (part) : (- <HeaderBadge+ <HeaderBreadcrumbto={part.href}+ color={badgeInactiveColor}icon={part.icon}- inactiveColor={badgeInactiveColor}>{part.name}- </HeaderBadge>+ </HeaderBreadcrumb>)}{!isLast &&(isDividerReactElement(divider) ? (@@ -109,4 +103,4 @@ function isDividerReactElement(return isValidElement(divider);}-HeadBreadcrumbs.Badge = HeaderBadge;+HeadBreadcrumbs.Breadcrumb = HeaderBreadcrumb;diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBreadcrumb/HeaderCollectionBreadcrumb.tsxsimilarity index 62%rename from frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsxrename to frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBreadcrumb/HeaderCollectionBreadcrumb.tsxindex a4bcaa44781..32aa50a0dd5 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBreadcrumb/HeaderCollectionBreadcrumb.tsx@@ -5,12 +5,16 @@ import type Question from "metabase-lib/v1/Question";import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";-export function HeaderCollectionBadge({ question }: { question: Question }) {+export function HeaderCollectionBreadcrumb({+ question,+}: {+ question: Question;+}) {const { collection } = question.card();const icon = question.type();return (- <HeadBreadcrumbs.Badge to={Urls.collection(collection)} icon={icon}>+ <HeadBreadcrumbs.Breadcrumb to={Urls.collection(collection)} icon={icon}>{collection?.name || t`Our analytics`}- </HeadBreadcrumbs.Badge>+ </HeadBreadcrumbs.Breadcrumb>);}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsxindex e869e6bf653..1b9f9fa7036 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx@@ -34,14 +34,14 @@ export function SourceModelBreadcrumbs({<HeadBreadcrumbs{...props}parts={[- <HeadBreadcrumbs.Badge+ <HeadBreadcrumbs.Breadcrumbkey="collection"to={Urls.collection(collection)}icon={getIcon({ model: "card", type: question.type() }).name}- inactiveColor="text-tertiary"+ color="text-tertiary">{collection?.name || t`Our analytics`}- </HeadBreadcrumbs.Badge>,+ </HeadBreadcrumbs.Breadcrumb>,question.isArchived() ? (<Tooltipkey="name"@@ -51,23 +51,22 @@ export function SourceModelBreadcrumbs({>{/* We use span here for ref forwarding */}<span>- <HeadBreadcrumbs.Badge- inactiveColor="text-tertiary"- icon={{ name: "warning", c: "danger" }}+ <HeadBreadcrumbs.Breadcrumb+ icon="warning"+ iconColor="danger"to={Urls.card(question.card())}>{question.displayName()}- </HeadBreadcrumbs.Badge>+ </HeadBreadcrumbs.Breadcrumb></span></Tooltip>) : (- <HeadBreadcrumbs.Badge+ <HeadBreadcrumbs.Breadcrumbkey="name"to={Urls.card(question.card())}- inactiveColor="text-tertiary">{question.displayName()}- </HeadBreadcrumbs.Badge>+ </HeadBreadcrumbs.Breadcrumb>),]}/>diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsxindex de796ba59a4..952badb72d4 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx@@ -59,22 +59,21 @@ export function SourceTableBreadcrumbs({variant={variant}divider={divider}parts={[- <HeadBreadcrumbs.Badge+ <HeadBreadcrumbs.Breadcrumbkey="collection"to={Urls.collection(collection)}icon="repository"- inactiveColor="text-tertiary">{collection.name}- </HeadBreadcrumbs.Badge>,- <HeadBreadcrumbs.Badge+ </HeadBreadcrumbs.Breadcrumb>,+ <HeadBreadcrumbs.Breadcrumbkey="name"to={hasTableLink? Urls.queryBuilderTable(table.id, table.db_id): undefined}- inactiveColor={isSubhead ? "text-tertiary" : "text-primary"}+ color={isSubhead ? "text-tertiary" : "text-primary"}><span>{table.display_name}@@ -90,7 +89,7 @@ export function SourceTableBreadcrumbs({</span>)}</span>- </HeadBreadcrumbs.Badge>,+ </HeadBreadcrumbs.Breadcrumb>,]}/>);diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsxindex b3452f4cbbe..0a4058ea982 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx@@ -150,10 +150,10 @@ function QuestionTableBadges({isLast && !subHead ? "text-primary" : "text-tertiary";const parts = tables.map((table) => (- <HeadBreadcrumbs.Badge+ <HeadBreadcrumbs.Breadcrumbkey={table.id}to={hasLink ? getTableURL(table) : ""}- inactiveColor={badgeInactiveColor}+ color={badgeInactiveColor}><span>{table.displayName()}@@ -169,7 +169,7 @@ function QuestionTableBadges({</span>)}</span>- </HeadBreadcrumbs.Badge>+ </HeadBreadcrumbs.Breadcrumb>));return (diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.tsxindex a4b7fff299d..4e00da3caa2 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.tsx@@ -10,7 +10,7 @@ import type Question from "metabase-lib/v1/Question";import { ViewSubHeading } from "../../../ViewSection";import ViewTitleHeaderS from "../../ViewTitleHeader.module.css";import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";-import { HeaderCollectionBadge } from "../HeaderCollectionBadge/HeaderCollectionBadge";+import { HeaderCollectionBreadcrumb } from "../HeaderCollectionBreadcrumb/HeaderCollectionBreadcrumb";import { QuestionDataSource } from "../QuestionDataSource";import SavedQuestionLeftSideS from "./SavedQuestionLeftSide.module.css";@@ -81,7 +81,7 @@ export function SavedQuestionLeftSide({parts={[...(isAdditionalInfoVisible && isModelOrMetric? [- <HeaderCollectionBadge+ <HeaderCollectionBreadcrumbkey="collection"question={question}/>,diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/index.ts b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/index.tsindex 8fee631c691..7cbb6cb1b73 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/index.ts+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/index.ts@@ -9,7 +9,7 @@ export * from "./ExploreResultsLink";export * from "./FilterHeaderButton";export * from "./QuestionSummarizeWidget";export * from "./AdHocQuestionLeftSide";-export * from "./HeaderCollectionBadge/HeaderCollectionBadge";+export * from "./HeaderCollectionBreadcrumb/HeaderCollectionBreadcrumb";export * from "./SavedQuestionLeftSide";export * from "./ViewTitleHeaderRightSide";export * from "./QueryBuilderBackButton";diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsxindex 582a7a36377..ac1da2655fa 100644--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx@@ -1,5 +1,5 @@import { useGetCollectionQuery } from "metabase/api";-import { Badge } from "metabase/common/components/Badge";+import { Breadcrumb } from "metabase/common/components/Breadcrumb";import { useGetIcon } from "metabase/hooks/use-icon";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_COLLECTIONS } from "metabase/plugins";@@ -20,16 +20,12 @@ const IRREGULAR_ICON_PROPS = {};type CollectionBadgeInnerProps = {- className?: string;collection: CollectionType;- isSingleLine?: boolean;onClick?: () => void;};const CollectionBadgeInner = ({- className,collection,- isSingleLine,onClick,}: CollectionBadgeInnerProps) => {const tc = useTranslateContent();@@ -45,33 +41,28 @@ const CollectionBadgeInner = ({...(isRegular ? { size: 16 } : IRREGULAR_ICON_PROPS),};- const clickActionProps = onClick- ? { onClick }- : { to: modelToUrl({ model: "collection", ...collection }) };return (- <Badge- className={className}- icon={icon}- activeColor={icon.color}- inactiveColor="text-tertiary"- isSingleLine={isSingleLine}- {...clickActionProps}+ <Breadcrumb+ icon={icon.name}+ iconColor={icon.color}+ to={+ onClick ? undefined : modelToUrl({ model: "collection", ...collection })+ }+ onClick={onClick}>{tc(getName(collection))}- </Badge>+ </Breadcrumb>);};type CollectionBadgeProps = {- className?: string;collectionId?: CollectionId;- isSingleLine?: boolean;onClick?: () => void;};export const CollectionBadge = ({collectionId,- ...rest+ onClick,}: CollectionBadgeProps) => {const { data: collection } = useGetCollectionQuery({id: collectionId || "root",@@ -79,5 +70,5 @@ export const CollectionBadge = ({if (!collection) {return null;}- return <CollectionBadgeInner collection={collection} {...rest} />;+ return <CollectionBadgeInner collection={collection} onClick={onClick} />;};