diff --git a/apps/client/src/ee/page-permission/components/page-permission-item.tsx b/apps/client/src/ee/page-permission/components/page-permission-item.tsx index 01aa7ade..67691d74 100644 --- a/apps/client/src/ee/page-permission/components/page-permission-item.tsx +++ b/apps/client/src/ee/page-permission/components/page-permission-item.tsx @@ -1,4 +1,4 @@ -import { Group, Menu, Text, UnstyledButton } from "@mantine/core"; +import { Menu, Text, UnstyledButton, Group } from "@mantine/core"; import { IconChevronDown, IconCheck } from "@tabler/icons-react"; import { useTranslation } from "react-i18next"; import { useAtomValue } from "jotai"; @@ -43,65 +43,61 @@ export function PagePermissionItem({ {member.type === "group" && }
- - - {member.name} - - {isCurrentUser && ( - - ({t("You")}) - - )} - - + + {member.name} + {isCurrentUser && ({t("You")})} + + {member.type === "user" && member.email} {member.type === "group" && formatMemberCount(member.memberCount, t)}
- {isCurrentUser || disabled ? ( - - {t(roleLabel)} - - ) : ( - - - - - {t(roleLabel)} - - - - +
+ {isCurrentUser || disabled ? ( + + {t(roleLabel)} + + ) : ( + + + + + {t(roleLabel)} + + + + - - {pagePermissionRoleData.map((role) => ( + + {pagePermissionRoleData.map((role) => ( + onRoleChange(member.id, member.type, role.value)} + rightSection={ + role.value === member.role ? : null + } + > +
+ {t(role.label)} + + {t(role.description)} + +
+
+ ))} + onRoleChange(member.id, member.type, role.value)} - rightSection={ - role.value === member.role ? : null - } + color="red" + onClick={() => onRemove(member.id, member.type)} > -
- {t(role.label)} - - {t(role.description)} - -
+ {t("Remove access")}
- ))} - - onRemove(member.id, member.type)} - > - {t("Remove access")} - -
-
- )} + +
+ )} + ); } diff --git a/apps/client/src/ee/page-permission/components/page-permission-list.tsx b/apps/client/src/ee/page-permission/components/page-permission-list.tsx index 64788756..2c59e4d0 100644 --- a/apps/client/src/ee/page-permission/components/page-permission-list.tsx +++ b/apps/client/src/ee/page-permission/components/page-permission-list.tsx @@ -163,7 +163,7 @@ export function PagePermissionList({ - + {sortedMembers.map((member) => ( ))} - + ); } diff --git a/apps/client/src/ee/page-permission/components/page-permission-tab.tsx b/apps/client/src/ee/page-permission/components/page-permission-tab.tsx index 99854236..dcb245a9 100644 --- a/apps/client/src/ee/page-permission/components/page-permission-tab.tsx +++ b/apps/client/src/ee/page-permission/components/page-permission-tab.tsx @@ -26,8 +26,8 @@ import { useUnrestrictPageMutation, } from "@/ee/page-permission/queries/page-permission-query"; import { pagePermissionRoleData } from "@/ee/page-permission/types/page-permission-role-data"; -import { GeneralAccessSelect } from "./general-access-select"; -import { PagePermissionList } from "./page-permission-list"; +import { GeneralAccessSelect } from "@/ee/page-permission"; +import { PagePermissionList } from "@/ee/page-permission"; import classes from "./page-permission.module.css"; import { buildPageUrl } from "@/features/page/page.utils"; diff --git a/apps/client/src/ee/page-permission/components/page-permission.module.css b/apps/client/src/ee/page-permission/components/page-permission.module.css index ee545f83..5c8b81b3 100644 --- a/apps/client/src/ee/page-permission/components/page-permission.module.css +++ b/apps/client/src/ee/page-permission/components/page-permission.module.css @@ -37,6 +37,7 @@ align-items: center; justify-content: space-between; padding: var(--mantine-spacing-xs) 0; + gap: var(--mantine-spacing-sm); } .permissionItemInfo { @@ -45,11 +46,19 @@ gap: var(--mantine-spacing-sm); flex: 1; min-width: 0; + overflow: hidden; } .permissionItemDetails { min-width: 0; flex: 1; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.permissionItemRole { + flex-shrink: 0; } .avatarStack {