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 Group managers UI from Emotion to Mantine and CSS modules (#74993)
Andrei Chernykhfdfbd63fc286
diff --git a/e2e/test/scenarios/admin-2/people.cy.spec.js b/e2e/test/scenarios/admin-2/people.cy.spec.jsindex 13a64232608..193c2dd75bb 100644--- a/e2e/test/scenarios/admin-2/people.cy.spec.js+++ b/e2e/test/scenarios/admin-2/people.cy.spec.js@@ -119,7 +119,7 @@ describe("scenarios > admin > people", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("0 members");// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage- cy.findByText("A group is only as good as its members.");+ cy.findByText("Add members to get started.");});it(diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.module.css b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.module.cssnew file mode 100644index 00000000000..5b766fbf8b3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.module.css@@ -0,0 +1,9 @@+.changeButton {+ cursor: pointer;+ vertical-align: middle;+ visibility: hidden;+}++.cell:hover .changeButton {+ visibility: visible;+}diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsx b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsxdeleted file mode 100644index 5abc41830dc..00000000000--- a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsx+++ /dev/null@@ -1,25 +0,0 @@-import styled from "@emotion/styled";--export const ChangeTypeButton = styled.button`- padding: 0 0.25rem;- color: var(--mb-color-filter);- cursor: pointer;- vertical-align: middle;-`;--export const UserTypeCellRoot = styled.td`- text-transform: capitalize;- font-size: 14px;- font-weight: bold;- color: var(--mb-color-text-secondary);-- ${ChangeTypeButton} {- visibility: hidden;- }-- &:hover {- ${ChangeTypeButton} {- visibility: visible;- }- }-`;diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.tsx b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.tsxindex b1e7e54f676..f84f0d9b1be 100644--- a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.tsx+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.tsx@@ -1,8 +1,10 @@import { t } from "ttag";+import { Box } from "metabase/ui";+import { UserTypeToggle } from "../UserTypeToggle";-import { ChangeTypeButton, UserTypeCellRoot } from "./UserTypeCell.styled";+import S from "./UserTypeCell.module.css";interface UserTypeCellProps {isAdmin: boolean;@@ -15,15 +17,39 @@ export const UserTypeCell = ({onChange,}: UserTypeCellProps) => {if (isAdmin) {- return <UserTypeCellRoot>{t`Admin`}</UserTypeCellRoot>;+ return (+ <Box+ component="td"+ className={S.cell}+ tt="capitalize"+ fz="md"+ fw="bold"+ c="text-secondary"+ >+ {t`Admin`}+ </Box>+ );}return (- <UserTypeCellRoot>+ <Box+ component="td"+ className={S.cell}+ tt="capitalize"+ fz="md"+ fw="bold"+ c="text-secondary"+ >{isManager ? t`Manager` : t`Member`}- <ChangeTypeButton>+ <Box+ component="button"+ className={S.changeButton}+ c="filter"+ px="xs"+ py={0}+ ><UserTypeToggle isManager={isManager} onChange={onChange} />- </ChangeTypeButton>- </UserTypeCellRoot>+ </Box>+ </Box>);};diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.module.css b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.module.cssnew file mode 100644index 00000000000..e27befdcd09--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.module.css@@ -0,0 +1,4 @@+.toggle {+ cursor: pointer;+ vertical-align: middle;+}diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.styled.tsx b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.styled.tsxdeleted file mode 100644index 07424dda950..00000000000--- a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-import styled from "@emotion/styled";--export const UserTypeToggleRoot = styled.button`- padding: 0 0.5rem;- color: var(--mb-color-filter);- cursor: pointer;- vertical-align: middle;-`;diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.tsx b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.tsxindex bcdba5fa4b7..01308b75b33 100644--- a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.tsx+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeToggle/UserTypeToggle.tsx@@ -1,9 +1,9 @@import type { MouseEventHandler } from "react";import { t } from "ttag";-import { type FloatingPosition, Icon, Tooltip } from "metabase/ui";+import { Box, type FloatingPosition, Icon, Tooltip } from "metabase/ui";-import { UserTypeToggleRoot } from "./UserTypeToggle.styled";+import S from "./UserTypeToggle.module.css";interface UserTypeCellProps {isManager: boolean;@@ -25,13 +25,18 @@ export const UserTypeToggle = ({return (<Tooltip label={tooltipText} position={tooltipPlacement}>- <UserTypeToggleRoot+ <Box+ component="button"+ className={S.toggle}+ c="filter"+ px="sm"+ py={0}aria-label={tooltipText}data-testid="user-type-toggle"onClick={handleChangeType}><Icon name={icon} />- </UserTypeToggleRoot>+ </Box></Tooltip>);};diff --git a/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx b/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsxindex f0491a73eb2..4ba8ec260dc 100644--- a/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx+++ b/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";import CS from "metabase/css/core/index.css";-import { Flex, Stack, Text } from "metabase/ui";+import { Box, Flex, Stack, Text } from "metabase/ui";interface AdminPaneLayoutProps {title?: React.ReactNode;@@ -19,8 +19,8 @@ export const AdminPaneLayout = ({titleActions,}: AdminPaneLayoutProps) => {return (- <div data-testid="admin-panel">- <Stack component="section" px="md" mb="xl" gap="lg">+ <Box data-testid="admin-panel" px="md">+ <Stack component="section" mb="md" gap="lg">{(title || description || titleActions) && (<Flexjustify="space-between"@@ -46,6 +46,6 @@ export const AdminPaneLayout = ({</Stack>{children}- </div>+ </Box>);};diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsxindex ea5bbcbfe5a..511ee054e79 100644--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx@@ -1,4 +1,4 @@-import { Fragment, useState } from "react";+import { useState } from "react";import { msgid, ngettext, t } from "ttag";import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";@@ -117,18 +117,12 @@ export const GroupDetail = ({return (<SettingsSection><AdminPaneLayout- title={- <Fragment>- {getGroupNameLocalized(group ?? {})}- <Box component="span" c="text-tertiary" ms="sm">- {ngettext(- msgid`${group.members.length} member`,- `${group.members.length} members`,- group.members.length,- )}- </Box>- </Fragment>- }+ title={getGroupNameLocalized(group ?? {})}+ description={ngettext(+ msgid`${group.members.length} member`,+ `${group.members.length} members`,+ group.members.length,+ )}titleActions={canEditMembership(group) && (<Button@@ -164,7 +158,7 @@ const GroupDescription = ({ group }: { group: Group }) => {if (isDefaultGroup(group)) {return (- <Box maw="38rem" px="1rem">+ <Box maw="38rem" mb="md"><Text>{t`All users belong to the ${getGroupNameLocalized(group,@@ -177,7 +171,7 @@ const GroupDescription = ({ group }: { group: Group }) => {if (isAdminGroup(group)) {return (- <Box maw="38rem" px="1rem">+ <Box maw="38rem" mb="md"><Text>{t`This is a special group whose members can see everything in the Metabase instance, and who can access and make changes to thesettings in the Admin Panel, including changing permissions! So, add people to this group with care.`}diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsxindex ea8e7fc9c21..4bff9b8e66d 100644--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx@@ -50,6 +50,16 @@ export function GroupMembersTable({return _.partition(group.members, isApiKeyGroupMember).flat();}, [group.members]);const groupsPage = members.slice(offset, offset + pageSize);+ const hasMembers = members.length > 0;++ // An empty group renders just the call to action, without the column header.+ if (!hasMembers && !showAddUser) {+ return (+ <Text c="text-secondary" ta="center" mt="xl">+ {t`Add members to get started.`}+ </Text>+ );+ }return (<>@@ -83,7 +93,7 @@ export function GroupMembersTable({)}</AdminContentTable>- {members.length > 0 ? (+ {hasMembers && (<Flex align="center" justify="flex-end" p="md"><PaginationControlspage={page}@@ -94,10 +104,6 @@ export function GroupMembersTable({onPreviousPage={handlePreviousPage}/></Flex>- ) : (- <Text size="lg" fw="700" ta="center" mt="4rem">- {t`A group is only as good as its members.`}- </Text>)}</>);