Skip to content

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

Remove the "Groups" heading from the invite popover (#67222)

Nemanja Glumac4bece3e5c121
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css
index c01006f10f2..f5ac90a7f66 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css
@@ -1,18 +1,11 @@
-.membershipSelectContainer {
- padding: 0.5rem 0;
- width: 300px;
- max-height: 600px;
-}
-
.membershipSelectItem {
display: flex;
align-items: center;
justify-content: space-between;
- cursor: pointer;
padding: 0.5rem 1.5rem;
background-color: var(--mb-color-bg-white);
color: var(--mb-color-text-medium);
- font-weight: 700;
+ font-weight: bold;
&:hover {
color: var(--mb-color-text-white);
@@ -23,21 +16,3 @@
}
}
}
-
-.membershipSelectItemDisabled {
- cursor: not-allowed;
-}
-
-.membershipSelectHeader {
- padding: 0.75rem 1.5rem 0.5rem 1.5rem;
- font-size: 12px;
- font-weight: 800;
- color: var(--mb-color-filter);
-}
-
-.membershipActionsContainer {
- padding-left: 1rem;
- display: flex;
- align-items: center;
- justify-content: flex-end;
-}
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
index 86ac8fcb6b2..3205d4f7b48 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
@@ -1,6 +1,4 @@
import { useDisclosure } from "@mantine/hooks";
-import cx from "classnames";
-import { Fragment } from "react";
import { t } from "ttag";
import {
@@ -10,14 +8,14 @@ import {
} from "metabase/lib/groups";
import { isNotNull } from "metabase/lib/types";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
-import { Box, Flex, Icon, Popover } from "metabase/ui";
+import { Box, Divider, Flex, Icon, Popover } from "metabase/ui";
import type { GroupInfo, Member } from "metabase-types/api";
import { GroupSummary } from "../GroupSummary";
import S from "./MembershipSelect.module.css";
-const getGroupSections = (groups: GroupInfo[], groupsTitle = t`Groups`) => {
+const getGroupSections = (groups: GroupInfo[]) => {
const defaultGroup = groups.find(
(g) => isDefaultGroup(g) || PLUGIN_TENANTS.isExternalUsersGroup(g),
);
@@ -30,14 +28,7 @@ const getGroupSections = (groups: GroupInfo[], groupsTitle = t`Groups`) => {
!PLUGIN_TENANTS.isExternalUsersGroup(group),
);
- if (pinnedGroups.length > 0) {
- return [
- { groups: pinnedGroups },
- { groups: regularGroups, header: groupsTitle },
- ];
- }
-
- return [{ groups: regularGroups }];
+ return { pinnedGroups, regularGroups };
};
type Memberships = Map<GroupInfo["id"], Partial<Member>>;
@@ -52,7 +43,6 @@ interface MembershipSelectProps {
onRemove: (groupId: number) => void;
onChange: (groupId: number, membershipData: Partial<Member>) => void;
isConfirmModalOpen?: boolean;
- groupsTitle?: string;
}
export const MembershipSelect = ({
@@ -64,13 +54,12 @@ export const MembershipSelect = ({
isCurrentUser = false,
isUserAdmin = false,
emptyListMessage = t`No groups`,
- groupsTitle = t`Groups`,
isConfirmModalOpen,
}: MembershipSelectProps) => {
const [popoverOpened, { open: openPopover, toggle: togglePopover }] =
useDisclosure();
const selectedGroupIds = Array.from(memberships.keys());
- const groupSections = getGroupSections(groups, groupsTitle);
+ const { pinnedGroups, regularGroups } = getGroupSections(groups);
const handleToggleMembership = (groupId: number) => {
if (memberships.has(groupId)) {
@@ -87,13 +76,61 @@ export const MembershipSelect = ({
onChange(groupId, membershipData);
};
+ const renderGroup = (group: GroupInfo) => {
+ const isDisabled =
+ (isAdminGroup(group) && isCurrentUser) ||
+ isDefaultGroup(group) ||
+ PLUGIN_TENANTS.isExternalUsersGroup(group);
+ const isMember = memberships.has(group.id);
+ const canEditMembershipType =
+ isMember &&
+ !isUserAdmin &&
+ !isDisabled &&
+ !PLUGIN_TENANTS.isTenantGroup(group) &&
+ !isAdminGroup(group);
+
+ return (
+ <li
+ className={S.membershipSelectItem}
+ key={group.id}
+ aria-label={group.name}
+ onClick={() =>
+ isDisabled ? undefined : handleToggleMembership(group.id)
+ }
+ style={{ cursor: isDisabled ? "not-allowed" : "pointer" }}
+ >
+ <span>{getGroupNameLocalized(group)}</span>
+ <Flex pl="md" align="center" justify="end">
+ {canEditMembershipType && (
+ <PLUGIN_GROUP_MANAGERS.UserTypeToggle
+ tooltipPlacement="bottom"
+ isManager={memberships.get(group.id)?.is_group_manager}
+ onChange={(is_group_manager: boolean) =>
+ handleChangeMembership(group.id, {
+ is_group_manager,
+ })
+ }
+ />
+ )}
+ <span
+ style={{
+ visibility: isMember ? "visible" : "hidden",
+ }}
+ >
+ <Icon name="check" />
+ </span>
+ </Flex>
+ </li>
+ );
+ };
+
return (
<Popover
opened={popoverOpened}
// prevent clicks on the confirm modal from closing this popover
closeOnClickOutside={!isConfirmModalOpen}
onChange={togglePopover}
- position="bottom-end"
+ position="bottom-start"
>
<Popover.Target>
<Flex
@@ -110,75 +147,31 @@ export const MembershipSelect = ({
<Icon c="text-light" name="chevrondown" size={10} />
</Flex>
</Popover.Target>
- <Popover.Dropdown>
+ <Popover.Dropdown w="300px" mah="600px" py="sm">
{groups.length === 0 && (
<Box component="span" p="sm">
{emptyListMessage}
</Box>
)}
- {groups.length > 0 && (
- <ul className={S.membershipSelectContainer}>
- {groupSections.map((section, index) => (
- <Fragment key={index}>
- {section.header && (
- <li className={S.membershipSelectHeader}>{section.header}</li>
- )}
- {section.groups.map((group) => {
- const isDisabled =
- (isAdminGroup(group) && isCurrentUser) ||
- isDefaultGroup(group) ||
- PLUGIN_TENANTS.isExternalUsersGroup(group);
- const isMember = memberships.has(group.id);
- const canEditMembershipType =
- isMember &&
- !isUserAdmin &&
- !isDisabled &&
- !PLUGIN_TENANTS.isTenantGroup(group) &&
- !isAdminGroup(group);
- return (
- <li
- className={cx(S.membershipSelectItem, {
- [S.membershipSelectItemDisabled]: isDisabled,
- })}
- key={group.id}
- aria-label={group.name}
- onClick={() =>
- isDisabled
- ? undefined
- : handleToggleMembership(group.id)
- }
- >
- <span>{getGroupNameLocalized(group)}</span>
- <div className={S.membershipActionsContainer}>
- {canEditMembershipType && (
- <PLUGIN_GROUP_MANAGERS.UserTypeToggle
- tooltipPlacement="bottom"
- isManager={
- memberships.get(group.id)?.is_group_manager
- }
- onChange={(is_group_manager: boolean) =>
- handleChangeMembership(group.id, {
- is_group_manager,
- })
- }
- />
- )}
- <span
- style={{
- visibility: isMember ? "visible" : "hidden",
- }}
- >
- <Icon name="check" />
- </span>
- </div>
- </li>
- );
- })}
- </Fragment>
- ))}
+ {pinnedGroups.length > 0 && (
+ <ul>
+ {pinnedGroups.map((group) => {
+ return renderGroup(group);
+ })}
</ul>
)}
+
+ {regularGroups.length > 0 && (
+ <>
+ <Divider my="sm" />
+ <ul>
+ {regularGroups.map((group) => {
+ return renderGroup(group);
+ })}
+ </ul>
+ </>
+ )}
</Popover.Dropdown>
</Popover>
);
diff --git a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx b/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
index 6051c72cba2..4ba5bb17937 100644
--- a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
+++ b/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
@@ -107,7 +107,6 @@ export const FormGroupsWidget = ({
onAdd={handleAdd}
onRemove={handleRemove}
onChange={handleChange}
- groupsTitle={title}
isUserAdmin={isUserAdmin}
/>
</FormField>