Skip to content

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

DSN-73 Verified badge icon should be correct size and nearer text in model and saved question titles (#63871)

Kamil Mielnikdb79c64d3d27
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
index c233e4dadbc..9432412ac72 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
@@ -38,6 +38,7 @@ export function CollectionInstanceAnalyticsIcon({
return (
<Icon
{...iconProps}
+ flex="0 0 auto"
name={collectionType.icon}
tooltip={t`This is a read-only Usage Analytics ${collectionIconTooltipNameMap[entity]}.`}
data-testid="instance-analytics-collection-marker"
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.styled.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.styled.tsx
deleted file mode 100644
index 3078367e70e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.styled.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import styled from "@emotion/styled";
-
-export const TooltipTime = styled.time`
- color: var(--mb-color-text-medium);
- font-size: 0.875em;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
index c61b54af756..fd6ccc5d3bf 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
@@ -1,12 +1,10 @@
import { color } from "metabase/lib/colors";
import { getRelativeTime } from "metabase/lib/time-dayjs";
-import { Icon, Tooltip } from "metabase/ui";
+import { Icon, Text, Tooltip } from "metabase/ui";
import type { ModerationReview, User } from "metabase-types/api";
import { getIconForReview, getModeratorDisplayText } from "../../service";
-import { TooltipTime } from "./ModerationReviewIcon.styled";
-
export interface ModerationReviewIconProps {
review: ModerationReview;
currentUser: User;
@@ -22,15 +20,21 @@ const ModerationReviewIcon = ({
const tooltip = moderator && (
<div>
<div>{getModeratorDisplayText(moderator, currentUser)}</div>
- <TooltipTime dateTime={review.created_at}>
+ <Text
+ c="text-medium"
+ component="time"
+ dateTime={review.created_at}
+ fz="var(--mantine-font-size-xs)"
+ lh={1}
+ >
{getRelativeTime(review.created_at)}
- </TooltipTime>
+ </Text>
</div>
);
return (
<Tooltip label={tooltip} disabled={!tooltip}>
- <Icon name={iconName} color={color(iconColor)} />
+ <Icon color={color(iconColor)} flex="0 0 auto" name={iconName} />
</Tooltip>
);
};
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css
index 0b0e27c0ece..444cab99a42 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css
@@ -126,7 +126,7 @@
font-size: 1.25rem;
font-weight: 700;
line-height: 1.5rem;
- width: 100%;
+ max-width: 100%;
overflow-wrap: break-word;
}
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
index e657966a103..85c1198ab54 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
@@ -145,16 +145,26 @@ export function DashboardHeaderView({
[S.showSubHeader]: showSubHeader,
})}
>
- <Flex className={S.HeaderCaptionContainer}>
+ <Flex className={S.HeaderCaptionContainer} gap={2}>
<Dashboard.Title className={S.HeaderCaption} />
- <PLUGIN_MODERATION.EntityModerationIcon
- dashboard={dashboard}
- />
- <PLUGIN_COLLECTION_COMPONENTS.CollectionInstanceAnalyticsIcon
- color="brand"
- collection={collection}
- entity="dashboard"
- />
+
+ <Flex
+ align="center"
+ flex="0 0 auto"
+ gap="sm"
+ pos="relative"
+ // intentionally misaligned: https://github.com/metabase/metabase/pull/63871#pullrequestreview-3259596723
+ top={2}
+ >
+ <PLUGIN_MODERATION.EntityModerationIcon
+ dashboard={dashboard}
+ />
+ <PLUGIN_COLLECTION_COMPONENTS.CollectionInstanceAnalyticsIcon
+ color="brand"
+ collection={collection}
+ entity="dashboard"
+ />
+ </Flex>
</Flex>
<Flex className={S.HeaderBadges}>
{isLastEditInfoVisible && (
diff --git a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.tsx b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.tsx
index 1f60362c49d..6559625f1e6 100644
--- a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.tsx
+++ b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.tsx
@@ -20,7 +20,7 @@ function SavedQuestionHeaderButton({
return (
<Flex
align="center"
- gap="0.25rem"
+ gap={2}
className={SavedQuestionHeaderButtonS.HeaderTitleContainer}
>
<EditableText
@@ -33,7 +33,17 @@ function SavedQuestionHeaderButton({
data-testid="saved-question-header-title"
/>
- <CollectionIcon collection={question.collection()} question={question} />
+ <Flex
+ flex="0 0 auto"
+ pos="relative"
+ // intentionally misaligned: https://github.com/metabase/metabase/pull/63871#pullrequestreview-3259596723
+ top={2}
+ >
+ <CollectionIcon
+ collection={question.collection()}
+ question={question}
+ />
+ </Flex>
</Flex>
);
}