Skip to content

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

Migrate the permissions editor and page layout off Emotion (#84103)

Andrei Chernykhfb239dd8810a
diff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.styled.tsx b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.styled.tsx
deleted file mode 100644
index a234671379a..00000000000
--- a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.styled.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-export const FilterableTreeRoot = styled.div`
- display: flex;
- flex-direction: column;
- overflow: hidden;
-`;
-
-export const FilterableTreeContainer = styled.div`
- overflow: auto;
-`;
-
-export const FilterInputContainer = styled.div`
- padding: 0.75rem 1.5rem;
-`;
-
-export const ItemGroupsDivider = styled.hr`
- margin: 1rem 1.5rem;
- border: 0;
- border-top: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const EmptyStateContainer = styled.div`
- margin-top: 6.25rem;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
index 09f757776eb..628fa10ba91 100644
--- a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
+++ b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
@@ -5,18 +5,20 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { Tree } from "metabase/common/components/tree";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { Icon, Input, TextInput, type TextInputProps } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import {
+ Box,
+ Divider,
+ Flex,
+ Icon,
+ Input,
+ TextInput,
+ type TextInputProps,
+} from "metabase/ui";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type { IconName } from "metabase-types/api";
import { AdminTreeNode } from "./AdminTreeNode";
-import {
- EmptyStateContainer,
- FilterInputContainer,
- FilterableTreeContainer,
- FilterableTreeRoot,
- ItemGroupsDivider,
-} from "./FilterableTree.styled";
import { searchItems } from "./utils";
interface FilterableTreeProps {
@@ -54,25 +56,25 @@ export const FilterableTree = ({
setFilter(e.target.value);
return (
- <FilterableTreeRoot>
- <FilterInputContainer>
- <TextInput
- placeholder={placeholder}
- value={filter}
- leftSection={<Icon name="search" />}
- rightSectionPointerEvents="all"
- rightSection={
- filter.length > 0 ? (
- <Input.ClearButton
- c="text-secondary"
- onClick={() => setFilter("")}
- />
- ) : null
- }
- onChange={handleFilterChange}
- />
- </FilterInputContainer>
- <FilterableTreeContainer>
+ <Flex className={CS.overflowHidden} direction="column">
+ <TextInput
+ py="md"
+ px="xl"
+ placeholder={placeholder}
+ value={filter}
+ leftSection={<Icon name="search" />}
+ rightSectionPointerEvents="all"
+ rightSection={
+ filter.length > 0 ? (
+ <Input.ClearButton
+ c="text-secondary"
+ onClick={() => setFilter("")}
+ />
+ ) : null
+ }
+ onChange={handleFilterChange}
+ />
+ <Box className={CS.overflowAuto}>
{filteredList && (
<Tree
data={filteredList}
@@ -80,12 +82,12 @@ export const FilterableTree = ({
onSelect={onSelect}
TreeNode={AdminTreeNode}
emptyState={
- <EmptyStateContainer>
+ <Box mt="6.25rem">
<EmptyState
message={emptyState?.text ?? t`Nothing here`}
icon={emptyState?.icon ?? "folder"}
/>
- </EmptyStateContainer>
+ </Box>
}
/>
)}
@@ -100,11 +102,11 @@ export const FilterableTree = ({
onSelect={onSelect}
TreeNode={AdminTreeNode}
/>
- {!isLastGroup && <ItemGroupsDivider />}
+ {!isLastGroup && <Divider my="lg" mx="xl" />}
</Fragment>
);
})}
- </FilterableTreeContainer>
- </FilterableTreeRoot>
+ </Box>
+ </Flex>
);
};
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx
deleted file mode 100644
index 714520d04fd..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import type { ColorName } from "metabase/ui/colors/types";
-import { color } from "metabase/ui/utils/colors";
-
-interface PermissionIconContainerProps {
- color: ColorName;
-}
-
-export const PermissionIconContainer = styled.div<PermissionIconContainerProps>`
- width: 22px;
- height: 22px;
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 0.25rem;
- margin-right: 0.375rem;
- color: var(--mb-color-text-primary-inverse);
- background-color: ${(props) => color(props.color)};
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx
index 68025c55f6e..216714254c7 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx
@@ -1,11 +1,9 @@
import type { ReactNode } from "react";
-import { Flex, Icon, Text, Title } from "metabase/ui";
+import { Center, Flex, Icon, Text, Title } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import type { IconName } from "metabase-types/api";
-import { PermissionIconContainer } from "./PermissionHelpDescription.styled";
-
interface PermissionHelpDescriptionProps {
name: ReactNode;
description?: ReactNode;
@@ -22,9 +20,16 @@ export const PermissionHelpDescription = ({
return (
<div>
<Flex align="center" mb={4}>
- <PermissionIconContainer color={iconColor}>
+ <Center
+ w="1.375rem"
+ h="1.375rem"
+ bdrs="xxs"
+ mr="xs"
+ c="text-primary-inverse"
+ bg={iconColor}
+ >
<Icon name={icon} />
- </PermissionIconContainer>
+ </Center>
<Title order={6} mt={0}>
{name}
</Title>
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.module.css
new file mode 100644
index 00000000000..b138b23a865
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.module.css
@@ -0,0 +1,8 @@
+.link {
+ color: var(--mb-color-core-filter);
+ transition: color 200ms;
+
+ &:hover {
+ color: var(--mb-color-accent7-light);
+ }
+}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx
deleted file mode 100644
index 74a95e94cbe..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { lighten } from "metabase/ui/colors";
-
-export const BreadcrumbsSeparator = styled.div`
- display: inline-block;
- color: var(--mb-color-background_page-tertiary-inverse);
- position: relative;
- margin: 0 6px;
- top: 2px;
-`;
-
-export const BreadcrumbsLink = styled.a`
- cursor: pointer;
- color: var(--mb-color-core-filter);
- transition: color 200ms;
-
- &:hover {
- color: ${() => lighten("accent7", 0.2)};
- }
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
index 1b69c2502e3..ab328124fdc 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
@@ -1,13 +1,10 @@
import { Fragment } from "react";
-import { Icon, Text } from "metabase/ui";
+import { Box, Icon, Text } from "metabase/ui";
import type { PermissionEditorBreadcrumb } from "../../types";
-import {
- BreadcrumbsLink,
- BreadcrumbsSeparator,
-} from "./PermissionsEditorBreadcrumbs.styled";
+import S from "./PermissionsEditorBreadcrumbs.module.css";
export interface PermissionsEditorBreadcrumbsProps {
items: PermissionEditorBreadcrumb[];
@@ -36,17 +33,23 @@ export const PermissionsEditorBreadcrumbs = ({
</>
) : (
<Fragment>
- <>
- <BreadcrumbsLink
- onClick={() => onBreadcrumbsItemSelect(item)}
- >
- {item.text}
- </BreadcrumbsLink>
- {subtext ? <> {subtext}</> : null}
- </>
- <BreadcrumbsSeparator>
+ <Box
+ component="a"
+ className={S.link}
+ onClick={() => onBreadcrumbsItemSelect(item)}
+ >
+ {item.text}
+ </Box>
+ {subtext ? <> {subtext}</> : null}
+ <Box
+ display="inline-block"
+ c="background_page-tertiary-inverse"
+ pos="relative"
+ mx="xs"
+ top={2}
+ >
<Icon name="chevronright" />
- </BreadcrumbsSeparator>
+ </Box>
</Fragment>
)}
</Fragment>
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.styled.tsx
deleted file mode 100644
index 444a6d3bf9b..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.styled.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-export const PermissionEditorContentRoot = styled.div`
- display: flex;
- flex-direction: column;
- padding-left: 2rem;
- height: 100%;
-`;
-
-export const EditorFilterContainer = styled.div`
- margin: 1rem 0 0.5rem 0;
- width: 17.5rem;
-`;
-
-export const EditorEmptyStateContainer = styled.div`
- margin-top: 7.5rem;
-`;
-
-export const PermissionTableWrapper = styled.div`
- flex: 1;
- min-height: 0;
- overflow: auto;
- padding-bottom: 2rem;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
index 7cafc460749..e7b3f0b01d4 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
@@ -4,7 +4,8 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { Subhead } from "metabase/common/components/type/Subhead";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { Icon, Input, Text, TextInput } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, Flex, Icon, Input, Text, TextInput } from "metabase/ui";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type {
@@ -17,12 +18,6 @@ import {
} from "../PermissionsTable";
import { PermissionsEditorBreadcrumbs } from "./PermissionsEditorBreadcrumbs";
-import {
- EditorEmptyStateContainer,
- EditorFilterContainer,
- PermissionEditorContentRoot,
- PermissionTableWrapper,
-} from "./PermissionsEditorContent.styled";
export type PermissionsEditorContentProps = PermissionEditorType &
Pick<PermissionsTableProps, "onChange" | "onSelect" | "onAction"> & {
@@ -69,7 +64,7 @@ export function PermissionsEditorContent({
setFilter(e.target.value);
return (
- <PermissionEditorContentRoot data-testid="permissions-editor">
+ <Flex direction="column" pl="xxl" h="100%" data-testid="permissions-editor">
<PreHeaderContent />
<Subhead data-testid="permissions-editor-breadcrumbs">
{title}{" "}
@@ -85,25 +80,26 @@ export function PermissionsEditorContent({
<PostHeaderContent />
- <EditorFilterContainer>
- <TextInput
- placeholder={filterPlaceholder}
- onChange={handleFilterChange}
- value={filter}
- leftSection={<Icon name="search" />}
- rightSectionPointerEvents="all"
- rightSection={
- filter.length > 0 ? (
- <Input.ClearButton
- c="text-secondary"
- onClick={() => setFilter("")}
- />
- ) : null
- }
- />
- </EditorFilterContainer>
+ <TextInput
+ mt="lg"
+ mb="sm"
+ w="17.5rem"
+ placeholder={filterPlaceholder}
+ onChange={handleFilterChange}
+ value={filter}
+ leftSection={<Icon name="search" />}
+ rightSectionPointerEvents="all"
+ rightSection={
+ filter.length > 0 ? (
+ <Input.ClearButton
+ c="text-secondary"
+ onClick={() => setFilter("")}
+ />
+ ) : null
+ }
+ />
- <PermissionTableWrapper ref={setScrollElement}>
+ <Box ref={setScrollElement} className={CS.overflowAuto} flex={1} pb="xxl">
<PermissionsTable
entities={filteredEntities || entities}
columns={columns}
@@ -112,12 +108,12 @@ export function PermissionsEditorContent({
onAction={onAction}
scrollElement={scrollElement}
emptyState={
- <EditorEmptyStateContainer>
+ <Box mt="7.5rem">
<EmptyState message={t`Nothing here`} icon="folder" />
- </EditorEmptyStateContainer>
+ </Box>
}
/>
- </PermissionTableWrapper>
- </PermissionEditorContentRoot>
+ </Box>
+ </Flex>
);
}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.module.css
index 284cc495ef8..61c5446cea3 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.module.css
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.module.css
@@ -1,13 +1,8 @@
-/*
- * Right-aligns the toolbar with the hub's app switcher, which sits
- * `CONTENT_PADDING_X` (nav/components/AreaLayout/AreaContent.tsx) from the
- * edge; 0.75rem of that is the button's own padding.
- *
- * `:not([data-css-specificity-hack])` rather than a bare class: this needs to
- * beat `ToolbarButtonsContainer`'s own emotion-generated padding
- * (PermissionsPageLayout.styled.tsx), which is also single-class specificity,
- * so source order alone can't be trusted to pick a winner.
- */
-.hubToolbarButtons:not([data-css-specificity-hack="📐"]) {
- padding-right: 2.75rem;
+.closeButton {
+ color: var(--mb-color-text-disabled);
+ transition: color 200ms;
+
+ &:hover {
+ color: var(--mb-color-text-secondary);
+ }
}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx
deleted file mode 100644
index 948247631be..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-import { forwardRef } from "react";
-
-import { Icon, type IconProps } from "metabase/ui";
-
-export const PermissionPageRoot = styled.div`
- display: flex;
- height: 100%;
- overflow: hidden;
-`;
-
-export const PermissionPageContent = styled.div`
- display: flex;
- flex: 1;
- flex-direction: column;
- height: 100%;
- overflow: hidden;
-`;
-
-export const PermissionPageSidebar = styled.aside`
- position: relative;
- display: flex;
- flex-direction: column;
- height: 100%;
- overflow: auto;
- border-left: 1px solid var(--mb-color-border-neutral);
- max-width: 320px;
-`;
-
-export const TabsContainer = styled.div`
- display: flex;
- justify-content: space-between;
- align-items: center;
- border-bottom: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const FullHeightContainer = styled.div`
- display: flex;
- height: 100%;
- overflow: hidden;
-`;
-
-export const CloseSidebarButton = styled(
- forwardRef<SVGSVGElement, IconProps>(function CloseSidebarButton(props, ref) {
- return <Icon {...props} name={props.name ?? "close"} ref={ref} />;
- }),
-)`
- top: 1.75rem;
- right: 1.5rem;
- color: var(--mb-color-text-disabled);
- position: absolute;
- cursor: pointer;
- transition: color 200ms;
-
- &:hover {
- color: var(--mb-color-text-secondary);
- }
-`;
-
-export const ToolbarButtonsContainer = styled.div`
- display: flex;
- flex-direction: row;
- padding: 0 1rem;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
index 5a99c3d66ba..91bd107ba84 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
@@ -1,27 +1,26 @@
+import cx from "classnames";
import type { ReactNode } from "react";
import { useCallback, useState } from "react";
-import { t } from "ttag";
+import { c, t } from "ttag";
-import {
- CloseSidebarButton,
- FullHeightContainer,
- PermissionPageContent,
- PermissionPageRoot,
- PermissionPageSidebar,
- TabsContainer,
- ToolbarButtonsContainer,
-} from "metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled";
import { getIsHelpReferenceOpen } from "metabase/admin/permissions/selectors/help-reference";
import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";
import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";
+import CS from "metabase/css/core/index.css";
+import { CONTENT_PADDING_X } from "metabase/nav/components/AreaLayout";
import { useDispatch, useSelector } from "metabase/redux";
import { useNavigate } from "metabase/router";
import { useUserSetting } from "metabase/settings";
-import { Button as NewButton, Modal as NewModal, Text } from "metabase/ui";
-import type { IconName } from "metabase-types/api";
+import {
+ Flex,
+ Icon,
+ Button as NewButton,
+ Modal as NewModal,
+ Text,
+} from "metabase/ui";
import {
clearSaveError as clearPermissionsSaveError,
@@ -57,14 +56,6 @@ type PermissionsPageLayoutProps = {
canShowSplitPermsModal?: boolean;
};
-const CloseSidebarButtonWithDefault = ({
- name = "close",
- ...props
-}: {
- name?: IconName;
- [key: string]: unknown;
-}) => <CloseSidebarButton aria-label={t`Close`} name={name} {...props} />;
-
export function PermissionsPageLayout({
children,
tab,
@@ -110,8 +101,8 @@ export function PermissionsPageLayout({
};
return (
- <PermissionPageRoot>
- <PermissionPageContent>
+ <Flex className={CS.overflowHidden} h="100%">
+ <Flex className={CS.overflowHidden} direction="column" flex={1}>
{isDirty && (
<PermissionsEditBar
diff={diff}
@@ -134,11 +125,18 @@ export function PermissionsPageLayout({
closeButtonText={null}
/>
- <TabsContainer>
+ <Flex
+ className={CS.borderBottom}
+ justify="space-between"
+ align="center"
+ >
<PermissionsTabs tab={tab} onChangeTab={navigateToTab} />
- <ToolbarButtonsContainer
- className={
- isEmbeddingHubPermissions() ? S.hubToolbarButtons : undefined
+ <Flex
+ pl="lg"
+ pr={
+ isEmbeddingHubPermissions()
+ ? `calc(${CONTENT_PADDING_X} - 0.75rem)`
+ : "lg"
}
>
{helpContent && !isHelpReferenceOpen && (
@@ -148,17 +146,34 @@ export function PermissionsPageLayout({
onClick={handleToggleHelpReference}
/>
)}
- </ToolbarButtonsContainer>
- </TabsContainer>
+ </Flex>
+ </Flex>
- <FullHeightContainer>{children}</FullHeightContainer>
- </PermissionPageContent>
+ <Flex className={CS.overflowHidden} h="100%">
+ {children}
+ </Flex>
+ </Flex>
{isHelpReferenceOpen && (
- <PermissionPageSidebar aria-label={t`Permissions help reference`}>
- <CloseSidebarButtonWithDefault onClick={handleToggleHelpReference} />
+ <Flex
+ component="aside"
+ className={cx(CS.borderLeft, CS.overflowAuto)}
+ direction="column"
+ pos="relative"
+ maw="20rem"
+ aria-label={t`Permissions help reference`}
+ >
+ <Icon
+ className={cx(S.closeButton, CS.cursorPointer)}
+ name="close"
+ pos="absolute"
+ top="1.75rem"
+ right="1.5rem"
+ aria-label={c("A verb, not a noun").t`Close`}
+ onClick={handleToggleHelpReference}
+ />
{helpContent}
- </PermissionPageSidebar>
+ </Flex>
)}
<NewModal
title="Someone just changed permissions"
@@ -180,6 +195,6 @@ export function PermissionsPageLayout({
isOpen={showSplitPermsModal}
onClose={handleDimissSplitPermsModal}
/>
- </PermissionPageRoot>
+ </Flex>
);
}
diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css
index d2323b8e925..23939e14c38 100644
--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css
+++ b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css
@@ -1,8 +1,12 @@
.button {
color: var(--mb-color-text-primary);
transition: color 200ms;
+}
+
+.adminButton:hover {
+ color: var(--mb-color-core-filter);
+}
- &:hover {
- color: var(--mb-color-core-filter);
- }
+.hubButton:hover {
+ color: var(--mb-color-brand);
}
diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
index 4d071948f57..e0904bf5dbd 100644
--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
+++ b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
@@ -1,5 +1,6 @@
import cx from "classnames";
+import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";
import CS from "metabase/css/core/index.css";
import { Flex, Icon, Text } from "metabase/ui";
import type { IconName } from "metabase-types/api";
@@ -12,11 +13,16 @@ interface ToolbarButtonProps {
onClick?: () => void;
}
+/** Hovers purple in the admin and blue in the hub, like AdminTreeNode */
export const ToolbarButton = ({ onClick, text, icon }: ToolbarButtonProps) => {
+ const hoverClassName = isEmbeddingHubPermissions()
+ ? S.hubButton
+ : S.adminButton;
+
return (
<Flex
component="button"
- className={cx(S.button, CS.cursorPointer)}
+ className={cx(S.button, hoverClassName, CS.cursorPointer)}
align="center"
fw={700}
py="xxs"