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
Migrate AdminNavbar from Emotion to Mantine (#73386)
Andrei Chernykhb65fbd4c7c24
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterMobileNavItem.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterMobileNavItem.tsxindex 1655cd81585..9eee73e131c 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterMobileNavItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterMobileNavItem.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { useListSecurityAdvisoriesQuery } from "metabase/api";-import { AdminNavLink } from "metabase/nav/components/AdminNavbar/AdminNavItem.styled";+import { AdminNavLink } from "metabase/nav/components/AdminNavbar/AdminNavLink";import { Box, Flex } from "metabase/ui";import { isAffected } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterNavItem.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterNavItem.tsxindex 63be7835296..92628b6f9ea 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterNavItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterNavItem/SecurityCenterNavItem.tsx@@ -4,7 +4,7 @@ import { useListSecurityAdvisoriesQuery } from "metabase/api";import {AdminNavLink,AdminNavListItem,-} from "metabase/nav/components/AdminNavbar/AdminNavItem.styled";+} from "metabase/nav/components/AdminNavbar/AdminNavLink";import { Box, Flex } from "metabase/ui";import { isAffected } from "../../utils";diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsxdeleted file mode 100644index 667688558af..00000000000--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx+++ /dev/null@@ -1,52 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Link } from "metabase/common/components/Link";-import { doNotForwardProps } from "metabase/common/utils/doNotForwardProps";-import { breakpointMaxLarge } from "metabase/styled-components/theme";-import { darken } from "metabase/ui/colors";--interface AdminNavLinkProps {- to: string;- isSelected?: boolean;- isInMobileNav?: boolean;-}--export const AdminNavLink = styled(- Link,- doNotForwardProps("isSelected", "isInMobileNav"),-)<AdminNavLinkProps>`- white-space: nowrap;- ${(props) => (props.isInMobileNav ? "" : "overflow: hidden;")}- text-overflow: ellipsis;- padding: 0.5rem 1rem;- ${breakpointMaxLarge} {- padding-inline: 0.85rem;- }-- transition: all 200ms;- border-radius: 4px;- color: ${(props) =>- props.isSelected- ? "var(--mb-color-text-primary-inverse)"- : "color-mix(in srgb, var(--mb-color-text-primary-inverse), transparent 35%)"};- background-color: ${(props) =>- props.isSelected ? darken("admin-navbar") : "transparent"};-- &:hover {- color: var(--mb-color-text-primary-inverse);- background-color: ${() => darken("admin-navbar")};- }-`;--export const AdminNavListItem = styled(- "li",- doNotForwardProps("path", "currentPath"),-)<{ path: string; currentPath: string }>`- display: inline-flex;- flex-shrink: 1;- white-space: nowrap;- justify-content: center;- min-width: ${(props) =>- props.currentPath.startsWith(props.path) ? "fit-content" : "0px"};-`;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.tsxindex a75731e8d0f..b7e90415683 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.tsx@@ -1,4 +1,4 @@-import { AdminNavLink, AdminNavListItem } from "./AdminNavItem.styled";+import { AdminNavLink, AdminNavListItem } from "./AdminNavLink";interface AdminNavItemProps {name: string;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavLink.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavLink.tsxnew file mode 100644index 00000000000..95370259c5e--- /dev/null+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavLink.tsx@@ -0,0 +1,53 @@+import type { ReactNode } from "react";++import { Link } from "metabase/common/components/Link";+import { Box, Flex } from "metabase/ui";++import S from "./AdminNavbar.module.css";++interface AdminNavLinkProps {+ to: string;+ isSelected?: boolean;+ isInMobileNav?: boolean;+ children?: ReactNode;+}++export const AdminNavLink = ({+ to,+ isSelected,+ isInMobileNav,+ children,+}: AdminNavLinkProps) => (+ <Box+ component={Link}+ to={to}+ className={S.AdminNavLink}+ data-selected={isSelected || undefined}+ bg={isSelected ? "admin-navbar-inverse" : undefined}+ style={{ overflow: isInMobileNav ? "visible" : "hidden" }}+ >+ {children}+ </Box>+);++interface AdminNavListItemProps {+ path: string;+ currentPath: string;+ children?: ReactNode;+}++export const AdminNavListItem = ({+ path,+ currentPath,+ children,+}: AdminNavListItemProps) => (+ <Flex+ component="li"+ display="inline-flex"+ justify="center"+ miw={currentPath.startsWith(path) ? "fit-content" : 0}+ style={{ whiteSpace: "nowrap" }}+ >+ {children}+ </Flex>+);diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.cssindex 7af66880531..5e5f4a8e205 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css@@ -1,3 +1,38 @@-.MobileHamburgerIcon {+.AdminNavbarRoot {+ /* Override --mb-color-text-primary-inverse so descendants reading this token+ (and the CSS module classes below) get a readable color on the dark navbar+ bg in both light and dark themes. We override the value rather than picking+ a different token because the navbar bg (admin-navbar) is purple in both+ themes, but text-primary-inverse flips to a dark color in dark mode. */+ --mb-color-text-primary-inverse: var(--mantine-color-white);++ /* Drive navbar text color directly so we don't depend on Mantine's c= prop,+ which resolves to a separate auto-derived `-text` variable. */color: var(--mb-color-text-primary-inverse);++ /* Anchor descendants (logo Link, nav links) inherit this color — overriding+ the user-agent / global link color. :where() keeps specificity at 0 so+ more specific class rules (e.g. .AdminNavLink) still win. */+ & :where(a) {+ color: inherit;+ }+}++.AdminNavLink {+ white-space: nowrap;+ text-overflow: ellipsis;+ padding: 0.5rem 1rem;+ transition: all 200ms;+ border-radius: 4px;+ /* Color inherits from .AdminNavbarRoot — i.e. white in both themes via the+ --mb-color-text-primary-inverse override. Selection is signified by the+ hover/selected background pill, not by text color. */++ @media screen and (--breakpoint-max-lg) {+ padding-inline: 0.85rem;+ }++ &:hover {+ background-color: var(--mb-color-admin-navbar-inverse);+ }}diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsxdeleted file mode 100644index ab9eaba3c94..00000000000--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx+++ /dev/null@@ -1,100 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Link } from "metabase/common/components/Link";-import {- breakpointMaxLarge,- breakpointMaxMedium,-} from "metabase/styled-components/theme";-import { color } from "metabase/ui/utils/colors";--import { ADMIN_NAVBAR_HEIGHT } from "../../constants";--export const AdminNavbarRoot = styled.nav`- --mb-color-text-primary-inverse: var(--mantine-color-white);-- padding: 0.5rem 1rem;- background: ${() => color("admin-navbar")};- color: var(--mb-color-text-primary-inverse);- font-size: 0.85rem;- height: ${ADMIN_NAVBAR_HEIGHT};- display: flex;- align-items: center;- justify-content: space-between;- z-index: 4;- flex-shrink: 0;-`;--export const AdminNavbarItems = styled.ul`- display: flex;- flex-grow: 0;- min-width: 0;- gap: 4px;-`;--export const MobileHide = styled.div`- display: flex;- align-items: center;- min-width: 0;- flex-grow: 1;- padding-inline-start: 2rem;- ${breakpointMaxMedium} {- display: none;- }-`;--export const AdminMobileNavbar = styled.div`- ${breakpointMaxMedium} {- display: flex;- align-items: center;- gap: 0.5rem;- }-- display: none;-`;--export const AdminMobileNavBarItems = styled.ul`- display: flex;- position: fixed;- flex-direction: column;- text-align: right;- padding: 1rem;- gap: 2rem;- border-radius: 0 0 0 0.5rem;- top: ${ADMIN_NAVBAR_HEIGHT};- right: 0;- background: ${() => color("admin-navbar")};- max-height: calc(100vh - ${ADMIN_NAVBAR_HEIGHT});- overflow-y: auto;-`;--export const AdminButtons = styled.div`- margin-inline-start: auto;- display: flex;- gap: 0.5rem;-`;--export const AdminLogoContainer = styled.div`- display: flex;- min-width: 32px;- max-width: 20rem;- overflow: hidden;- height: 32px;- align-items: center;- justify-content: center;-`;--export const AdminLogoText = styled.div`- margin-left: 1rem;- font-weight: 700;-- ${breakpointMaxLarge} {- display: none;- }-`;--export const AdminLogoLink = styled(Link)`- cursor: pointer;- display: flex;- justify-content: center;-`;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsxindex def9c1581b9..e17922fc6b4 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx@@ -3,6 +3,7 @@ import { useState } from "react";import { push } from "react-router-redux";import { t } from "ttag";+import { Link } from "metabase/common/components/Link";import { LogoIcon } from "metabase/common/components/LogoIcon";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";@@ -10,25 +11,15 @@ import { useDispatch, useSelector } from "metabase/redux";import type { AdminPath } from "metabase/redux/store";import { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";-import { Button, Icon } from "metabase/ui";+import { Box, Button, Flex, Group, Icon } from "metabase/ui";+import { ADMIN_NAVBAR_HEIGHT } from "../../constants";import { AppSwitcher } from "../AppSwitcher";import StoreLink from "../StoreLink";import { AdminNavItem } from "./AdminNavItem";-import { AdminNavLink } from "./AdminNavItem.styled";-import AdminNavCS from "./AdminNavbar.module.css";-import {- AdminButtons,- AdminLogoContainer,- AdminLogoLink,- AdminLogoText,- AdminMobileNavBarItems,- AdminMobileNavbar,- AdminNavbarItems,- AdminNavbarRoot,- MobileHide,-} from "./AdminNavbar.styled";+import { AdminNavLink } from "./AdminNavLink";+import S from "./AdminNavbar.module.css";interface AdminNavbarProps {path: string;@@ -64,21 +55,47 @@ export const AdminNavbar = ({);return (- <AdminNavbarRoot+ <Flex+ component="nav"+ className={S.AdminNavbarRoot}data-element-id="navbar-root"data-testid="admin-navbar"aria-label={t`Navigation bar`}+ align="center"+ justify="space-between"+ h={ADMIN_NAVBAR_HEIGHT}+ bg="admin-navbar"+ fz="0.85rem"+ px="1rem"+ py="0.5rem"+ style={{ zIndex: 4, flexShrink: 0 }}>- <AdminLogoLink to="/admin">- <AdminLogoContainer>- <LogoIcon dark />- {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Metabase settings */}- <AdminLogoText>{t`Metabase Admin`}</AdminLogoText>- </AdminLogoContainer>- </AdminLogoLink>+ <Flex+ component={Link}+ to="/admin"+ align="center"+ justify="center"+ miw={32}+ maw="20rem"+ h={32}+ style={{ overflow: "hidden" }}+ >+ <LogoIcon dark />+ <Box+ visibleFrom="lg"+ fw={700}+ ml="1rem"+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- Metabase settings+ >{t`Metabase Admin`}</Box>+ </Flex>- <MobileHide>- <AdminNavbarItems data-testid="admin-navbar-items">+ <Flex visibleFrom="md" align="center" miw={0} flex="1 1 auto" ps="2rem">+ <Flex+ component="ul"+ data-testid="admin-navbar-items"+ gap="0.25rem"+ miw={0}+ >{adminPaths.map(({ name, key, path }) => (<AdminNavItemname={name}@@ -94,15 +111,15 @@ export const AdminNavbar = ({currentPath={currentPath}/>)}- </AdminNavbarItems>+ </Flex>{!isPaidPlan && isAdmin && <StoreLink />}- </MobileHide>- <AdminButtons>+ </Flex>+ <Group gap="0.5rem" ms="auto"><MobileNavbar adminPaths={adminPaths} currentPath={currentPath} /><AppSwitcher />- </AdminButtons>- </AdminNavbarRoot>+ </Group>+ </Flex>);};@@ -117,22 +134,33 @@ const MobileNavbar = ({ adminPaths, currentPath }: AdminMobileNavbarProps) => {const ref = useClickOutside(() => setMobileNavOpen(false));return (- <AdminMobileNavbar ref={ref}>+ <Group ref={ref} hiddenFrom="md" gap="0.5rem" align="center"><ButtononClick={() => setMobileNavOpen((prev) => !prev)}variant="subtle"p="0.25rem"leftSection={- <Icon- name="burger"- size={32}- className={AdminNavCS.MobileHamburgerIcon}- />+ <Icon name="burger" size={32} color="text-primary-inverse" />}/>{mobileNavOpen && (- <AdminMobileNavBarItems aria-label={t`Navigation links`}>+ <Flex+ component="ul"+ aria-label={t`Navigation links`}+ direction="column"+ ta="right"+ p="md"+ gap="sm"+ miw="12rem"+ pos="fixed"+ top={ADMIN_NAVBAR_HEIGHT}+ right={0}+ bg="admin-navbar"+ mah={`calc(100vh - ${ADMIN_NAVBAR_HEIGHT})`}+ bdrs="0 0 0 0.5rem"+ style={{ overflowY: "auto" }}+ >{adminPaths.map(({ name, key, path }) => (<AdminNavLinkto={path}@@ -150,8 +178,8 @@ const MobileNavbar = ({ adminPaths, currentPath }: AdminMobileNavbarProps) => {currentPath={currentPath}/>)}- </AdminMobileNavBarItems>+ </Flex>)}- </AdminMobileNavbar>+ </Group>);};