Skip to content

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

Metrics Viewer design improvements (#72252)

Kevin Kelleherfd2a3e07052d
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx
index 147e4473866..fb7fbcb6b99 100644
--- a/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx
@@ -69,8 +69,8 @@ export function DimensionPillBar({
return (
<Flex
- bg="background-secondary"
- p="sm"
+ bg="background-primary"
+ p="xs"
bdrs="xl"
w="100%"
align="center"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx
index 30b064e5e19..95c64ae16c9 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx
@@ -54,6 +54,8 @@ export function BucketButton({
<Popover opened={isOpen} onChange={setIsOpen}>
<Popover.Target>
<Button
+ w={184}
+ justify="space-between"
fw="bold"
py="xs"
px="sm"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
index 485432546e1..b2ca2902e35 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
@@ -85,6 +85,8 @@ export function DimensionFilterButton({
<Popover opened={isOpen} onChange={setIsOpen}>
<Popover.Target>
<Button
+ w={184}
+ justify="space-between"
fw="bold"
py="xs"
px="sm"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css
index 0f3c3f35753..3ed5ad630fe 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css
@@ -1,7 +1,3 @@
-.container {
- box-shadow: var(--mantine-shadow-sm);
-}
-
.divider {
align-self: stretch;
}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
index f4dba5f90cf..dc244f83b11 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
@@ -83,8 +83,8 @@ export function MetricControls({
return (
<Flex
+ maw="100%"
h="3rem"
- className={S.container}
display="inline-flex"
bg="background-primary"
bd="1px solid var(--mb-color-border)"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
index 31055f77d8d..617034922d1 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
@@ -6,6 +6,10 @@
transition: border-color 150ms ease;
}
+.container:hover {
+ border: 1px solid var(--mb-color-brand);
+}
+
.container:focus-within {
border-color: var(--mb-color-brand);
}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
index 841032339a1..6f444a4781c 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
@@ -103,7 +103,10 @@ export function MetricSearchPanel({
size="xs"
p="sm"
leftSection={
- <Icon name={hasFilters ? "filter_plus" : "filter"} />
+ <Icon
+ name={hasFilters ? "filter_plus" : "filter"}
+ size={16}
+ />
}
className={hasFilters ? S.filterButtonWithCount : undefined}
>
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx
index 01d4774e4c3..514791b31f5 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx
@@ -91,7 +91,7 @@ export function AddDimensionPopover({
aria-label={t`Add dimension tab`}
onClick={() => setIsOpen(true)}
>
- <Icon name="add" />
+ <Icon name="add" c="icon-primary" />
</ActionIcon>
</Popover.Target>
<Popover.Dropdown p={0} className={S.dropdown}>
diff --git a/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx
index badb6caa4ab..4734056c25f 100644
--- a/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx
+++ b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx
@@ -93,8 +93,8 @@ export function MetricsViewerPage(props: MetricsViewerPageProps) {
);
return (
- <Stack h="100%" gap={0} className={S.root}>
- <Box px="xl" pt="md" flex="0 0 auto">
+ <Stack px="3rem" h="100%" gap={0} className={S.root}>
+ <Box pt="md" flex="0 0 auto">
<MetricSearchPanel
definitions={definitions}
formulaEntities={formulaEntities}
@@ -110,7 +110,7 @@ export function MetricsViewerPage(props: MetricsViewerPageProps) {
<Flex flex="1 1 auto" mih={0}>
<Stack gap={0} flex={1} mih={0} miw={0}>
{hasDefinitions && (
- <Box px="lg" pt="sm" flex="0 0 auto" className={S.tabsBar}>
+ <Box pt="sm" flex="0 0 auto" className={S.tabsBar}>
<MetricsViewerTabs
tabs={tabs}
activeTabId={activeTabId}
@@ -124,10 +124,9 @@ export function MetricsViewerPage(props: MetricsViewerPageProps) {
/>
</Box>
)}
- <Flex flex="1 1 auto" mih={0}>
+ <Flex flex="1 1 auto" mih={0} pt="lg">
<Flex
direction="column"
- px="lg"
pt="md"
pb="lg"
flex={1}
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
index 5494eecd1b3..3cd1bf340d0 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
@@ -25,6 +25,7 @@ export interface AppBarProps {
isAppSwitcherVisible?: boolean;
isCollectionPathVisible?: boolean;
isQuestionLineageVisible?: boolean;
+ isMetricsViewer?: boolean;
onToggleNavbar: () => void;
onCloseNavbar: () => void;
}
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
index 54f204ce47d..98ecd673627 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
@@ -35,6 +35,7 @@ export interface AppBarLargeProps {
isAppSwitcherVisible?: boolean;
isCollectionPathVisible?: boolean;
isQuestionLineageVisible?: boolean;
+ isMetricsViewer?: boolean;
onToggleNavbar: () => void;
}
@@ -53,6 +54,7 @@ const AppBarLarge = ({
isAppSwitcherVisible,
isCollectionPathVisible,
isQuestionLineageVisible,
+ isMetricsViewer,
onToggleNavbar,
}: AppBarLargeProps): JSX.Element => {
const isNavBarVisible = isNavBarOpen && isNavBarEnabled;
@@ -67,7 +69,8 @@ const AppBarLarge = ({
isNavBarVisible ||
isMetabotVisible ||
isDocumentSidebarOpen ||
- isCommentSidebarOpen
+ isCommentSidebarOpen ||
+ isMetricsViewer
}
>
<Flex align="center" miw="5rem" flex="1 1 auto">
diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
index 62c8b58c3ed..42f6f59ddbd 100644
--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
@@ -15,6 +15,7 @@ import {
getIsAppSwitcherVisible,
getIsCollectionPathVisible,
getIsLogoVisible,
+ getIsMetricsViewer,
getIsNavBarEnabled,
getIsNavbarOpen,
getIsNewButtonVisible,
@@ -43,6 +44,7 @@ const mapStateToProps = (state: State, props: RouterProps) => ({
isCollectionPathVisible: getIsCollectionPathVisible(state, props),
isQuestionLineageVisible: getIsQuestionLineageVisible(state, props),
detailView: getDetailViewState(state),
+ isMetricsViewer: getIsMetricsViewer(state, props),
});
const mapDispatchToProps = {
diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.ts
index fe51071ef47..32ce98134f4 100644
--- a/frontend/src/metabase/selectors/app.ts
+++ b/frontend/src/metabase/selectors/app.ts
@@ -63,6 +63,10 @@ export const getIsDataStudioApp = createSelector([getRouterPath], (path) => {
return path.startsWith("/data-studio");
});
+export const getIsMetricsViewer = createSelector([getRouterPath], (path) => {
+ return path.startsWith("/explore");
+});
+
export const getIsCollectionPathVisible = createSelector(
[
getQuestion,