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 select, sidebar and table off Emotion (#83999)

Andrei Chernykh0db1eabf08ed
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.module.css
new file mode 100644
index 00000000000..9d2a4636de5
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.module.css
@@ -0,0 +1,18 @@
+.selectedOption {
+ transition: color 200ms;
+
+ &:hover {
+ color: var(--mb-color-core-filter);
+ }
+}
+
+.option {
+ &:hover {
+ color: var(--mb-color-text-primary-inverse);
+ background-color: var(--mb-color-accent7);
+ }
+}
+
+.actionsList {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx
deleted file mode 100644
index 355de7fb33e..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx
+++ /dev/null
@@ -1,81 +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";
-import { lighten } from "metabase/ui/colors";
-import { color } from "metabase/ui/utils/colors";
-
-import { PermissionsSelectOption } from "./PermissionsSelectOption";
-
-export const PermissionsSelectRoot = styled.div<{ isDisabled: boolean }>`
- display: flex;
- align-items: center;
- min-width: 180px;
- cursor: ${(props) => (props.isDisabled ? "default" : "pointer")};
-`;
-
-export const SelectedOption = styled(PermissionsSelectOption)`
- transition: color 200ms;
-
- &:hover {
- color: var(--mb-color-core-filter);
- }
-`;
-
-export const OptionsList = styled.ul`
- min-width: 210px;
- padding: 0.5rem 0;
-`;
-
-export const OptionsListItem = styled.li`
- cursor: pointer;
- padding: 0.5rem 1rem;
-
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: ${() => lighten("accent7", 0.1)};
- }
-`;
-
-export const ActionsList = styled(OptionsList)`
- border-top: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const ToggleContainer = styled.div`
- display: flex;
- align-items: center;
- background-color: var(--mb-color-background_page-tertiary);
- padding: 0.5rem 1rem;
- justify-content: flex-end;
-`;
-
-export const ToggleLabel = styled.label`
- font-size: 12px;
- margin-right: 1rem;
-`;
-
-export const WarningIcon = styled(
- forwardRef<SVGSVGElement, Partial<IconProps>>(
- function WarningIcon(props, ref) {
- return (
- <Icon
- {...props}
- size={props.size ?? 18}
- name={props.name ?? "warning"}
- ref={ref}
- />
- );
- },
- ),
-)`
- margin-right: 0.25rem;
- color: var(--mb-color-text-disabled);
-`;
-
-export const DisabledPermissionOption = styled(PermissionsSelectOption)<{
- isHighlighted: boolean;
-}>`
- color: ${(props) =>
- props.isHighlighted ? color("text-secondary") : color("text-disabled")};
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
index 57cf494ddd3..2c103541276 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
@@ -1,6 +1,8 @@
-import { Fragment, memo, useState } from "react";
+import cx from "classnames";
+import { memo, useState } from "react";
-import { Icon, Popover, Switch, Tooltip } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, Flex, Icon, Popover, Switch, Tooltip } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import type { IconName } from "metabase-types/api";
@@ -10,17 +12,7 @@ import type {
PermissionSectionConfig,
} from "../../types";
-import {
- ActionsList,
- DisabledPermissionOption,
- OptionsList,
- OptionsListItem,
- PermissionsSelectRoot,
- SelectedOption,
- ToggleContainer,
- ToggleLabel,
- WarningIcon,
-} from "./PermissionsSelect.styled";
+import S from "./PermissionsSelect.module.css";
import { PermissionsSelectOption } from "./PermissionsSelectOption";
interface PermissionSelectProps extends PermissionSectionConfig {
@@ -73,27 +65,32 @@ export const PermissionsSelect = memo(function PermissionsSelect({
const hasActions = actionsForCurrentValue.length > 0;
const triggerContent = (
- <PermissionsSelectRoot
- isDisabled={isDisabled}
+ <Flex
+ className={isDisabled ? CS.cursorDefault : CS.cursorPointer}
+ align="center"
+ miw="11.25rem"
aria-haspopup="listbox"
data-testid="permissions-select"
aria-disabled={isDisabled}
onClick={isDisabled ? undefined : () => setOpened((o) => !o)}
>
{isDisabled ? (
- <DisabledPermissionOption
+ <PermissionsSelectOption
{...selectedOption}
- isHighlighted={isHighlighted ?? false}
+ c={isHighlighted ? "text-secondary" : "text-disabled"}
hint={disabledTooltip}
iconColor="text-disabled"
/>
) : (
- <SelectedOption {...selectedOption} />
+ <PermissionsSelectOption
+ {...selectedOption}
+ className={S.selectedOption}
+ />
)}
{warning && (
<Tooltip label={warning}>
- <WarningIcon />
+ <Icon name="warning" size={18} mr="xxs" c="text-disabled" />
</Tooltip>
)}
@@ -103,7 +100,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({
size={16}
c="text-disabled"
/>
- </PermissionsSelectRoot>
+ </Flex>
);
if (!opened) {
@@ -114,49 +111,69 @@ export const PermissionsSelect = memo(function PermissionsSelect({
<Popover opened onChange={setOpened}>
<Popover.Target>{triggerContent}</Popover.Target>
<Popover.Dropdown>
- <Fragment>
- <OptionsList role="listbox">
- {selectableOptions.map((option) => (
- <OptionsListItem
+ <Box component="ul" miw="13.125rem" py="sm" px={0} role="listbox">
+ {selectableOptions.map((option) => (
+ <Box
+ component="li"
+ className={cx(S.option, CS.cursorPointer)}
+ py="sm"
+ px="lg"
+ role="option"
+ key={option.value}
+ onClick={() => {
+ setOpened(false);
+ onChange(option.value, toggleLabel ? toggleState : null);
+ }}
+ >
+ <PermissionsSelectOption {...option} />
+ </Box>
+ ))}
+ </Box>
+ {hasActions && (
+ <Box
+ component="ul"
+ className={S.actionsList}
+ miw="13.125rem"
+ py="sm"
+ px={0}
+ >
+ {actionsForCurrentValue.map((action, index) => (
+ <Box
+ component="li"
+ className={cx(S.option, CS.cursorPointer)}
+ py="sm"
+ px="lg"
+ key={index}
role="option"
- key={option.value}
onClick={() => {
setOpened(false);
- onChange(option.value, toggleLabel ? toggleState : null);
+ onAction?.(action);
}}
>
- <PermissionsSelectOption {...option} />
- </OptionsListItem>
+ <PermissionsSelectOption {...action} />
+ </Box>
))}
- </OptionsList>
- {hasActions && (
- <ActionsList>
- {actionsForCurrentValue.map((action, index) => (
- <OptionsListItem
- key={index}
- role="option"
- onClick={() => {
- setOpened(false);
- onAction?.(action);
- }}
- >
- <PermissionsSelectOption {...action} />
- </OptionsListItem>
- ))}
- </ActionsList>
- )}
+ </Box>
+ )}
- {hasChildren && (
- <ToggleContainer>
- <ToggleLabel>{toggleLabel}</ToggleLabel>
- <Switch
- checked={toggleState || false}
- onChange={(e) => onToggleChange(e.currentTarget.checked)}
- disabled={toggleDisabled ?? false}
- />
- </ToggleContainer>
- )}
- </Fragment>
+ {hasChildren && (
+ <Flex
+ align="center"
+ justify="flex-end"
+ bg="background_page-tertiary"
+ py="sm"
+ px="lg"
+ >
+ <Box component="label" fz="sm" mr="lg">
+ {toggleLabel}
+ </Box>
+ <Switch
+ checked={toggleState || false}
+ onChange={(e) => onToggleChange(e.currentTarget.checked)}
+ disabled={toggleDisabled ?? false}
+ />
+ </Flex>
+ )}
</Popover.Dropdown>
</Popover>
);
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx
deleted file mode 100644
index 1c2c21d7440..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx
+++ /dev/null
@@ -1,30 +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";
-
-export const PermissionsSelectOptionRoot = styled.div`
- display: flex;
- align-items: center;
- width: 100%;
-`;
-
-export const IconContainer = styled.div<{ color: ColorName }>`
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 3px;
- width: 20px;
- height: 20px;
- color: var(--mb-color-text-primary-inverse);
- background-color: ${(props) => color(props.color)};
- flex-shrink: 0;
-`;
-
-export const PermissionsSelectLabel = styled.div`
- font-size: 14px;
- font-weight: 700;
- margin: 0;
- padding: 0 0.5rem;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
index 92cd7213b27..4c3408c11f1 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
@@ -1,17 +1,13 @@
import { useState } from "react";
-import { Icon, Tooltip } from "metabase/ui";
+import { Box, Center, Flex, Icon, Tooltip } from "metabase/ui";
+import type { ColorName } from "metabase/ui/colors/types";
import type { PermissionOption } from "../../types";
-import {
- IconContainer,
- PermissionsSelectLabel,
- PermissionsSelectOptionRoot,
-} from "./PermissionsSelectOption.styled";
-
interface PermissionsSelectOptionProps extends Omit<PermissionOption, "value"> {
className?: string;
+ c?: ColorName;
hint?: string | null;
}
@@ -20,22 +16,35 @@ export function PermissionsSelectOption({
icon,
iconColor,
className,
+ c,
hint,
}: PermissionsSelectOptionProps) {
const [shouldShowTooltip, setShouldShowTooltip] = useState(false);
return (
- <PermissionsSelectOptionRoot
+ <Flex
className={className}
+ align="center"
+ w="100%"
+ c={c}
onMouseEnter={() => setShouldShowTooltip(true)}
onMouseLeave={() => setShouldShowTooltip(false)}
>
<Tooltip label={hint} disabled={!hint} opened={shouldShowTooltip}>
- <IconContainer color={iconColor}>
+ <Center
+ flex="0 0 auto"
+ w="1.25rem"
+ h="1.25rem"
+ bdrs="0.1875rem"
+ c="text-primary-inverse"
+ bg={iconColor}
+ >
<Icon name={icon} />
- </IconContainer>
+ </Center>
</Tooltip>
- <PermissionsSelectLabel>{label}</PermissionsSelectLabel>
- </PermissionsSelectOptionRoot>
+ <Box fz="md" fw={700} px="sm">
+ {label}
+ </Box>
+ </Flex>
);
}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.module.css
new file mode 100644
index 00000000000..b96c9d8f46c
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.module.css
@@ -0,0 +1,3 @@
+.borderRight {
+ border-right: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx
deleted file mode 100644
index 75a7b4cfc8d..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Icon } from "metabase/ui";
-
-export const SidebarRoot = styled.aside`
- display: flex;
- flex-direction: column;
- flex-shrink: 0;
- overflow: hidden;
- width: 300px;
- border-right: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const SidebarHeader = styled.div`
- padding: 0.75rem 1.5rem 0 1.5rem;
- flex-shrink: 0;
-`;
-
-export const BackIcon = styled(Icon)`
- margin-right: 0.5rem;
- color: var(--mb-color-text-disabled);
-`;
-
-export const BackButton = styled.button`
- display: flex;
- align-items: center;
- color: var(--mb-color-text-primary);
- font-family: var(--mb-default-font-family);
- font-weight: 700;
- font-size: 14px;
- padding: 0.5rem 0;
- cursor: pointer;
- transition: color 200ms;
- text-align: left;
-
- &:hover {
- color: var(--mb-color-core-filter);
- }
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsx
index bf31714dc97..472f2b1e6f1 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsx
@@ -1,6 +1,10 @@
+import cx from "classnames";
+
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import CS from "metabase/css/core/index.css";
+import { Flex } from "metabase/ui";
-import { SidebarRoot } from "./PermissionsSidebar.styled";
+import S from "./PermissionsSidebar.module.css";
import type { PermissionsSidebarContentProps } from "./PermissionsSidebarContent";
import { PermissionsSidebarContent } from "./PermissionsSidebarContent";
@@ -15,10 +19,16 @@ export const PermissionsSidebar = ({
...contentProps
}: PermissionsSidebarProps) => {
return (
- <SidebarRoot>
+ <Flex
+ component="aside"
+ className={cx(S.borderRight, CS.overflowHidden)}
+ direction="column"
+ flex="0 0 auto"
+ w="18.75rem"
+ >
<LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper>
<PermissionsSidebarContent {...contentProps} />
</LoadingAndErrorWrapper>
- </SidebarRoot>
+ </Flex>
);
};
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css
index 0b8bde58143..5b999ccb1c0 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css
@@ -5,3 +5,12 @@
font-weight: 700;
margin-top: 0.5rem;
}
+
+.backButton {
+ color: var(--mb-color-text-primary);
+ transition: color 200ms;
+
+ &:hover {
+ color: var(--mb-color-core-filter);
+ }
+}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
index 0a6013c45e3..c6e2e48b836 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
@@ -1,16 +1,13 @@
+import cx from "classnames";
import { memo } from "react";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
-import { Text } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, Flex, Icon, Text } from "metabase/ui";
import { EntityViewSwitch } from "../EntityViewSwitch";
import { FilterableTree } from "../FilterableTree";
-import {
- BackButton,
- BackIcon,
- SidebarHeader,
-} from "./PermissionsSidebar.styled";
import S from "./PermissionsSidebarContent.module.css";
export interface PermissionsSidebarContentProps {
@@ -39,12 +36,21 @@ export const PermissionsSidebarContent = memo(
}: PermissionsSidebarContentProps) {
return (
<>
- <SidebarHeader>
+ <Box pt="md" px="xl" flex="0 0 auto">
{onBack ? (
- <BackButton onClick={onBack}>
- <BackIcon name="arrow_left" />
+ <Flex
+ component="button"
+ className={cx(S.backButton, CS.cursorPointer)}
+ align="center"
+ fz="md"
+ fw={700}
+ py="sm"
+ ta="left"
+ onClick={onBack}
+ >
+ <Icon name="arrow_left" mr="sm" c="text-disabled" />
{title}
- </BackButton>
+ </Flex>
) : (
<div className={S.SidebarContentTitle}>{title}</div>
)}
@@ -59,7 +65,7 @@ export const PermissionsSidebarContent = memo(
onChange={onEntityChange}
/>
)}
- </SidebarHeader>
+ </Box>
<FilterableTree
placeholder={filterPlaceholder}
onSelect={onSelect}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.module.css
new file mode 100644
index 00000000000..f9ee04884d5
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.module.css
@@ -0,0 +1,59 @@
+.table {
+ border-collapse: collapse;
+}
+
+.cell {
+ padding: 0.625rem 1rem;
+ min-height: 2.5rem;
+ overflow: hidden;
+ background: var(--mb-color-background_page-primary);
+
+ &:first-of-type {
+ position: sticky;
+ top: 0;
+ left: 0;
+ max-width: 18.75rem;
+ padding-left: 0;
+ padding-right: 1.5rem;
+
+ /* Collapsed table borders do not follow a sticky cell, so the column divider is drawn here */
+ &::after {
+ content: " ";
+ position: absolute;
+ top: 0;
+ right: 0;
+ height: 100%;
+ border-right: 1px solid var(--mb-color-border-neutral-subtle);
+ }
+ }
+}
+
+/* The header paints its own 1px bottom line over the page color, since collapsed table borders do not stick with it */
+.headerCell {
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ background-image: linear-gradient(
+ to top,
+ var(--mb-color-border-neutral-subtle) 1px,
+ transparent 1px
+ );
+
+ &:first-of-type {
+ z-index: 2;
+
+ &::after {
+ display: none;
+ }
+ }
+}
+
+.row {
+ border-bottom: 1px solid var(--mb-color-border-neutral-subtle);
+}
+
+.entityNameLink {
+ font-weight: 700;
+ text-decoration: underline;
+ color: var(--mb-color-navbar-admin-inverse);
+}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx
deleted file mode 100644
index 203cec8bc24..00000000000
--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-import { forwardRef } from "react";
-
-import { Link } from "metabase/common/components/Link";
-import { Label } from "metabase/common/components/type/Label";
-import { Icon, type IconProps } from "metabase/ui";
-import { color } from "metabase/ui/utils/colors";
-
-const getTableBorder = () =>
- `1px solid color-mix(in srgb, var(--mb-color-border-neutral), transparent 50%)`;
-
-// background with 1px of border color at the bottom
-// to work properly with sticky positioning
-const getHeaderBackground = () =>
- `linear-gradient(
- to top,
- color-mix(in srgb, var(--mb-color-border-neutral) 50%, var(--mb-color-background_page-primary) 50%) 1px,
- var(--mb-color-background_page-primary) 1px,
- var(--mb-color-background_page-primary) 100%
- )`;
-
-export const PermissionsTableRoot = styled.table`
- border-collapse: collapse;
- max-height: 100%;
- overflow-y: auto;
- min-width: max-content;
-`;
-
-export const PermissionsTableCell = styled.td`
- vertical-align: center;
- padding: 0.625rem 1rem;
- box-sizing: border-box;
- min-height: 40px;
- overflow: hidden;
- background: var(--mb-color-background_page-primary);
-
- &:first-of-type {
- max-width: 300px;
- left: 0;
- top: 0;
- position: sticky;
- padding-left: 0;
- padding-right: 1.5rem;
- background: var(--mb-color-background_page-primary);
-
- &:after {
- position: absolute;
- right: 0;
- top: 0;
- height: 100%;
- border-right: ${() => getTableBorder()};
- content: " ";
- }
- }
-`;
-
-export const PermissionTableHeaderCell = styled(
- PermissionsTableCell.withComponent("th"),
-)`
- position: sticky;
- top: 0;
- border: none;
- background: ${() => getHeaderBackground()};
- z-index: 1;
-
- &:first-of-type {
- background: ${() => getHeaderBackground()};
- z-index: 2;
-
- &:after {
- display: none;
- }
- }
-`;
-
-export const PermissionsTableRow = styled.tr`
- border-bottom: ${() => getTableBorder()};
-`;
-
-export const EntityNameLink = styled(Link)`
- display: inline;
- font-weight: 700;
- text-decoration: underline;
- color: ${() => color("navbar-admin-inverse")};
-`;
-
-export const HintIcon = styled(
- forwardRef<SVGSVGElement, Partial<IconProps>>(function HintIcon(props, ref) {
- return (
- <Icon
- {...props}
- name={props.name ?? "info"}
- size={props.size ?? 16}
- ref={ref}
- />
- );
- }),
-)`
- color: var(--mb-color-text-disabled);
- margin-left: 0.375rem;
- cursor: pointer;
-`;
-
-export const ColumnName = styled(Label)`
- display: inline;
- margin: 0;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
index 227eab7debc..4040d5ddf4d 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
@@ -4,8 +4,10 @@ import { memo, useCallback, useRef, useState } from "react";
import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
+import { Link } from "metabase/common/components/Link";
+import { Label } from "metabase/common/components/type/Label";
import CS from "metabase/css/core/index.css";
-import { Ellipsified, Flex, Text, Tooltip } from "metabase/ui";
+import { Box, Ellipsified, Flex, Icon, Text, Tooltip } from "metabase/ui";
import type {
DataPermissionValue,
@@ -17,15 +19,7 @@ import type {
} from "../../types";
import { PermissionsSelect } from "../PermissionsSelect";
-import {
- ColumnName,
- EntityNameLink,
- HintIcon,
- PermissionTableHeaderCell,
- PermissionsTableCell,
- PermissionsTableRoot,
- PermissionsTableRow,
-} from "./PermissionsTable.styled";
+import S from "./PermissionsTable.module.css";
export type PermissionsTableProps = Pick<
PermissionEditorType,
@@ -164,13 +158,19 @@ export function PermissionsTable({
return (
<>
- <PermissionsTableRoot data-testid="permission-table">
+ <Box
+ component="table"
+ className={cx(S.table, CS.overflowAuto)}
+ mah="100%"
+ miw="max-content"
+ data-testid="permission-table"
+ >
<thead>
<tr>
{columns.map(({ name, hint }) => {
return (
- <PermissionTableHeaderCell key={name}>
- <ColumnName>
+ <th key={name} className={cx(S.cell, S.headerCell)}>
+ <Label display="inline" m={0}>
{name}{" "}
{hint && (
<Tooltip
@@ -178,17 +178,23 @@ export function PermissionsTable({
closeDelay={100}
classNames={{ tooltip: CS.pointerEventsAuto }}
>
- <HintIcon />
+ <Icon
+ className={CS.cursorPointer}
+ name="info"
+ size={16}
+ ml="xs"
+ c="text-disabled"
+ />
</Tooltip>
)}
- </ColumnName>
- </PermissionTableHeaderCell>
+ </Label>
+ </th>
);
})}
</tr>
</thead>
{tableContent}
- </PermissionsTableRoot>
+ </Box>
{!hasItems && emptyState}
<ConfirmModal
opened={confirmations?.length > 0}
@@ -224,16 +230,23 @@ const EntityRow = memo(function EntityRow({
<Ellipsified>{entity.name}</Ellipsified>
{typeof entity.hint === "string" && (
<Tooltip label={entity.hint}>
- <HintIcon />
+ <Icon
+ className={CS.cursorPointer}
+ name="info"
+ size={16}
+ ml="xs"
+ c="text-disabled"
+ />
</Tooltip>
)}
</span>
);
return (
- <PermissionsTableRow aria-label={`${entity.name} permissions`}>
- <PermissionsTableCell>
+ <tr className={S.row} aria-label={`${entity.name} permissions`}>
+ <td className={S.cell}>
{entity.canSelect ? (
- <EntityNameLink
+ <Link
+ className={S.entityNameLink}
onClick={() => onSelect?.(entity)}
// The hub overrides the link's default admin purple with its own
// blue, both colors the design system already owns.
@@ -242,7 +255,7 @@ const EntityRow = memo(function EntityRow({
}
>
{entityName}
- </EntityNameLink>
+ </Link>
) : (
<Flex gap="xxs" fw="bold">
{entityName}
@@ -250,11 +263,11 @@ const EntityRow = memo(function EntityRow({
</Flex>
)}
{entity.callout && <Text c="text-secondary">{entity.callout}</Text>}
- </PermissionsTableCell>
+ </td>
{entity.permissions?.map((permission, index) => {
return (
- <PermissionsTableCell key={permission.type ?? String(index)}>
+ <td key={permission.type ?? String(index)} className={S.cell}>
<PermissionsSelect
{...permission}
onChange={(value, toggleState) =>
@@ -262,9 +275,9 @@ const EntityRow = memo(function EntityRow({
}
onAction={(action) => onAction?.(action, entity)}
/>
- </PermissionsTableCell>
+ </td>
);
})}
- </PermissionsTableRow>
+ </tr>
);
});
diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css
new file mode 100644
index 00000000000..d2323b8e925
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css
@@ -0,0 +1,8 @@
+.button {
+ color: var(--mb-color-text-primary);
+ transition: color 200ms;
+
+ &:hover {
+ color: var(--mb-color-core-filter);
+ }
+}
diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx
deleted file mode 100644
index 1672638e4fe..00000000000
--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Icon } from "metabase/ui";
-
-export const ToolbarButtonRoot = styled.button`
- display: flex;
- align-items: center;
- cursor: pointer;
- color: var(--mb-color-text-primary);
- padding: 0.25rem 0.75rem;
- font-weight: 700;
- transition: color 200ms;
-
- &:hover {
- color: var(--mb-color-core-filter);
- }
-`;
-
-export const ToolbarButtonIcon = styled(Icon)`
- margin-right: 0.25rem;
-`;
diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
index eb248f4fb7e..4d071948f57 100644
--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
+++ b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx
@@ -1,7 +1,10 @@
-import { Text } from "metabase/ui";
+import cx from "classnames";
+
+import CS from "metabase/css/core/index.css";
+import { Flex, Icon, Text } from "metabase/ui";
import type { IconName } from "metabase-types/api";
-import { ToolbarButtonIcon, ToolbarButtonRoot } from "./ToolbarButton.styled";
+import S from "./ToolbarButton.module.css";
interface ToolbarButtonProps {
text: string;
@@ -11,9 +14,17 @@ interface ToolbarButtonProps {
export const ToolbarButton = ({ onClick, text, icon }: ToolbarButtonProps) => {
return (
- <ToolbarButtonRoot onClick={onClick}>
- <ToolbarButtonIcon name={icon} />
+ <Flex
+ component="button"
+ className={cx(S.button, CS.cursorPointer)}
+ align="center"
+ fw={700}
+ py="xxs"
+ px="md"
+ onClick={onClick}
+ >
+ <Icon name={icon} mr="xxs" />
<Text>{text}</Text>
- </ToolbarButtonRoot>
+ </Flex>
);
};