diff --git a/app/components/Sharing/Collection/AccessControlList.tsx b/app/components/Sharing/Collection/AccessControlList.tsx index 7ab1fd914f..9364bb8494 100644 --- a/app/components/Sharing/Collection/AccessControlList.tsx +++ b/app/components/Sharing/Collection/AccessControlList.tsx @@ -1,3 +1,4 @@ +import { observer } from "mobx-react"; import { GroupIcon, UserIcon } from "outline-icons"; import * as React from "react"; import { useTranslation } from "react-i18next"; @@ -26,202 +27,204 @@ type Props = { invitedInSession: string[]; }; -export function AccessControlList({ collection, invitedInSession }: Props) { - const { memberships, groupMemberships } = useStores(); - const can = usePolicy(collection); - const { t } = useTranslation(); - const theme = useTheme(); - const collectionId = collection.id; +export const AccessControlList = observer( + ({ collection, invitedInSession }: Props) => { + const { memberships, groupMemberships } = useStores(); + const can = usePolicy(collection); + const { t } = useTranslation(); + const theme = useTheme(); + const collectionId = collection.id; - const { request: fetchMemberships, data: membershipData } = useRequest( - React.useCallback( - () => memberships.fetchAll({ id: collectionId }), - [memberships, collectionId] - ) - ); - - const { request: fetchGroupMemberships, data: groupMembershipData } = - useRequest( + const { request: fetchMemberships, data: membershipData } = useRequest( React.useCallback( - () => groupMemberships.fetchAll({ id: collectionId }), - [groupMemberships, collectionId] + () => memberships.fetchAll({ id: collectionId }), + [memberships, collectionId] ) ); - React.useEffect(() => { - void fetchMemberships(); - void fetchGroupMemberships(); - }, [fetchMemberships, fetchGroupMemberships]); - - const containerRef = React.useRef(null); - const { maxHeight, calcMaxHeight } = useMaxHeight({ - elementRef: containerRef, - maxViewportPercentage: 70, - }); - - React.useEffect(() => { - calcMaxHeight(); - }); - - const permissions = React.useMemo( - () => - [ - { - label: t("View only"), - value: CollectionPermission.Read, - }, - { - label: t("Can edit"), - value: CollectionPermission.ReadWrite, - }, - { - label: t("Manage"), - value: CollectionPermission.Admin, - }, - { - divider: true, - label: t("Remove"), - value: EmptySelectValue, - }, - ] as Permission[], - [t] - ); - - return ( - - {(!membershipData || !groupMembershipData) && } - - - - } - title={t("All members")} - subtitle={t("Everyone in the workspace")} - actions={ -
- { - void collection.save({ - permission: value === EmptySelectValue ? null : value, - }); - }} - disabled={!can.update} - value={collection?.permission} - labelHidden - nude - /> -
- } - /> - {groupMemberships - .inCollection(collection.id) - .sort((a, b) => - ( - (invitedInSession.includes(a.group.id) ? "_" : "") + a.group.name - ).localeCompare(b.group.name) + const { request: fetchGroupMemberships, data: groupMembershipData } = + useRequest( + React.useCallback( + () => groupMemberships.fetchAll({ id: collectionId }), + [groupMemberships, collectionId] ) - .map((membership) => ( - - - - } - title={membership.group.name} - subtitle={t("{{ count }} member", { - count: membership.group.memberCount, - })} - actions={ -
- { - if (permission === EmptySelectValue) { - await groupMemberships.delete({ - collectionId: collection.id, - groupId: membership.groupId, - }); - } else { - await groupMemberships.create({ - collectionId: collection.id, - groupId: membership.groupId, - permission, - }); - } - }} - disabled={!can.update} - value={membership.permission} - labelHidden - nude - /> -
- } - /> - ))} - {memberships - .inCollection(collection.id) - .sort((a, b) => - ( - (invitedInSession.includes(a.user.id) ? "_" : "") + a.user.name - ).localeCompare(b.user.name) - ) - .map((membership) => ( - { + void fetchMemberships(); + void fetchGroupMemberships(); + }, [fetchMemberships, fetchGroupMemberships]); + + const containerRef = React.useRef(null); + const { maxHeight, calcMaxHeight } = useMaxHeight({ + elementRef: containerRef, + maxViewportPercentage: 70, + }); + + React.useEffect(() => { + calcMaxHeight(); + }); + + const permissions = React.useMemo( + () => + [ + { + label: t("View only"), + value: CollectionPermission.Read, + }, + { + label: t("Can edit"), + value: CollectionPermission.ReadWrite, + }, + { + label: t("Manage"), + value: CollectionPermission.Admin, + }, + { + divider: true, + label: t("Remove"), + value: EmptySelectValue, + }, + ] as Permission[], + [t] + ); + + return ( + + {(!membershipData || !groupMembershipData) && } + + + + } + title={t("All members")} + subtitle={t("Everyone in the workspace")} + actions={ +
+ { + void collection.save({ + permission: value === EmptySelectValue ? null : value, + }); + }} + disabled={!can.update} + value={collection?.permission} + labelHidden + nude /> - } - title={membership.user.name} - subtitle={membership.user.email} - actions={ -
- { - if (permission === EmptySelectValue) { - await memberships.delete({ - collectionId: collection.id, - userId: membership.userId, - }); - } else { - await memberships.create({ - collectionId: collection.id, - userId: membership.userId, - permission, - }); - } - }} - disabled={!can.update} - value={membership.permission} - labelHidden - nude +
+ } + /> + {groupMemberships + .inCollection(collection.id) + .sort((a, b) => + ( + (invitedInSession.includes(a.group.id) ? "_" : "") + a.group.name + ).localeCompare(b.group.name) + ) + .map((membership) => ( + + + + } + title={membership.group.name} + subtitle={t("{{ count }} member", { + count: membership.group.memberCount, + })} + actions={ +
+ { + if (permission === EmptySelectValue) { + await groupMemberships.delete({ + collectionId: collection.id, + groupId: membership.groupId, + }); + } else { + await groupMemberships.create({ + collectionId: collection.id, + groupId: membership.groupId, + permission, + }); + } + }} + disabled={!can.update} + value={membership.permission} + labelHidden + nude + /> +
+ } + /> + ))} + {memberships + .inCollection(collection.id) + .sort((a, b) => + ( + (invitedInSession.includes(a.user.id) ? "_" : "") + a.user.name + ).localeCompare(b.user.name) + ) + .map((membership) => ( + -
- } - /> - ))} -
- ); -} + } + title={membership.user.name} + subtitle={membership.user.email} + actions={ +
+ { + if (permission === EmptySelectValue) { + await memberships.delete({ + collectionId: collection.id, + userId: membership.userId, + }); + } else { + await memberships.create({ + collectionId: collection.id, + userId: membership.userId, + permission, + }); + } + }} + disabled={!can.update} + value={membership.permission} + labelHidden + nude + /> +
+ } + /> + ))} +
+ ); + } +); const ScrollableContainer = styled(Scrollable)` padding: 12px 24px;