Add 'No access' option to document permissions

This commit is contained in:
Tom Moor committed 2023-12-31 22:53:14 -05:00
1 parent 2e17d0c185
commit 446fe1f3eb
7 files changed
+142 -71

No files matched your search

@@ -2,34 +2,18 @@ import * as React from "react";
import { useTranslation } from "react-i18next";
import styled from "styled-components";
import { s } from "@shared/styles";
import { CollectionPermission } from "@shared/types";
import InputSelect, { Props as SelectProps } from "~/components/InputSelect";
import { Permission } from "~/types";
export default function InputMemberPermissionSelect(
props: Partial<SelectProps> & { permissions?: Permission[] }
props: Partial<SelectProps> & { permissions: Permission[] }
) {
const { t } = useTranslation();
return (
<Select
label={t("Permissions")}
options={
props.permissions ?? [
{
label: t("View only"),
value: CollectionPermission.Read,
},
{
label: t("View and edit"),
value: CollectionPermission.ReadWrite,
},
{
label: t("Admin"),
value: CollectionPermission.Admin,
},
]
}
options={props.permissions}
ariaLabel={t("Permissions")}
labelHidden
nude
+2 -2
View File
@@ -244,8 +244,8 @@ const StyledButton = styled(Button)<{ nude?: boolean }>`
${Inner} {
line-height: 28px;
padding-left: 16px;
padding-right: 8px;
padding-left: 12px;
padding-right: 4px;
}
svg {
@@ -1,10 +1,11 @@
import * as React from "react";
import { useTranslation } from "react-i18next";
import { CollectionPermission } from "@shared/types";
import CollectionGroupMembership from "~/models/CollectionGroupMembership";
import Group from "~/models/Group";
import GroupListItem from "~/components/GroupListItem";
import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
import CollectionGroupMemberMenu from "~/menus/CollectionGroupMemberMenu";
import InputMemberPermissionSelect from "./InputMemberPermissionSelect";
type Props = {
group: Group;
@@ -18,27 +19,41 @@ const CollectionGroupMemberListItem = ({
collectionGroupMembership,
onUpdate,
onRemove,
}: Props) => (
<GroupListItem
group={group}
showAvatar
renderActions={({ openMembersModal }) => (
<>
<InputMemberPermissionSelect
value={
collectionGroupMembership
? collectionGroupMembership.permission
: undefined
}
onChange={onUpdate}
/>
<CollectionGroupMemberMenu
onMembers={openMembersModal}
onRemove={onRemove}
/>
</>
)}
/>
);
}: Props) => {
const { t } = useTranslation();
return (
<GroupListItem
group={group}
showAvatar
renderActions={({ openMembersModal }) => (
<>
<InputMemberPermissionSelect
value={collectionGroupMembership?.permission}
onChange={onUpdate}
permissions={[
{
label: t("View only"),
value: CollectionPermission.Read,
},
{
label: t("View and edit"),
value: CollectionPermission.ReadWrite,
},
{
label: t("Admin"),
value: CollectionPermission.Admin,
},
]}
/>
<CollectionGroupMemberMenu
onMembers={openMembersModal}
onRemove={onRemove}
/>
</>
)}
/>
);
};
export default CollectionGroupMemberListItem;
@@ -9,11 +9,10 @@ import Avatar from "~/components/Avatar";
import Badge from "~/components/Badge";
import Button from "~/components/Button";
import Flex from "~/components/Flex";
import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
import ListItem from "~/components/List/Item";
import Time from "~/components/Time";
import MemberMenu from "~/menus/MemberMenu";
import { Permission } from "~/types";
import InputMemberPermissionSelect from "./InputMemberPermissionSelect";
type Props = {
user: User;
@@ -22,7 +21,6 @@ type Props = {
onAdd?: () => void;
onRemove?: () => void;
onUpdate?: (permission: CollectionPermission) => void;
permissions?: Permission[];
};
const MemberListItem = ({
@@ -32,7 +30,6 @@ const MemberListItem = ({
onUpdate,
onAdd,
canEdit,
permissions,
}: Props) => {
const { t } = useTranslation();
@@ -57,8 +54,21 @@ const MemberListItem = ({
<Flex align="center" gap={8}>
{onUpdate && (
<InputMemberPermissionSelect
permissions={permissions}
value={membership ? membership.permission : undefined}
permissions={[
{
label: t("View only"),
value: CollectionPermission.Read,
},
{
label: t("View and edit"),
value: CollectionPermission.ReadWrite,
},
{
label: t("Admin"),
value: CollectionPermission.Admin,
},
]}
value={membership?.permission}
onChange={onUpdate}
disabled={!canEdit}
/>
@@ -5,11 +5,9 @@ import * as React from "react";
import { toast } from "sonner";
import styled from "styled-components";
import { Pagination } from "@shared/constants";
import { DocumentPermission } from "@shared/types";
import Document from "~/models/Document";
import User from "~/models/User";
import UserMembership from "~/models/UserMembership";
import MemberListItem from "~/scenes/CollectionPermissions/components/MemberListItem";
import Avatar from "~/components/Avatar";
import { AvatarSize } from "~/components/Avatar/Avatar";
import Flex from "~/components/Flex";
@@ -20,6 +18,7 @@ import useRequest from "~/hooks/useRequest";
import useStores from "~/hooks/useStores";
import useThrottledCallback from "~/hooks/useThrottledCallback";
import Combobox from "./Combobox";
import MemberListItem from "./MemberListItem";
type Props = {
/** Document to which team members are supposed to be invited */
@@ -87,15 +86,7 @@ function InviteTeamMembers({ document }: Props) {
.notInDocument(document.id, query)
.filter((u) => u.id !== user.id)
: [],
[
users,
document.id,
teamMembers,
documentMembers,
document.members,
user.id,
query,
]
[users, document.id, teamMembers, documentMembers, user.id, query]
);
React.useEffect(() => {
@@ -196,16 +187,6 @@ function InviteTeamMembers({ document }: Props) {
canEdit={item.id !== user.id || user.isAdmin}
onRemove={() => handleRemoveUser(item)}
onUpdate={(permission) => handleUpdateUser(item, permission)}
permissions={[
{
label: t("View only"),
value: DocumentPermission.Read,
},
{
label: t("View and edit"),
value: DocumentPermission.ReadWrite,
},
]}
/>
)}
/>
@@ -0,0 +1,79 @@
import { observer } from "mobx-react";
import * as React from "react";
import { useTranslation } from "react-i18next";
import { DocumentPermission } from "@shared/types";
import Membership from "~/models/Membership";
import User from "~/models/User";
import UserMembership from "~/models/UserMembership";
import Avatar from "~/components/Avatar";
import { AvatarSize } from "~/components/Avatar/Avatar";
import Flex from "~/components/Flex";
import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
import ListItem from "~/components/List/Item";
import { EmptySelectValue } from "~/types";
type Props = {
user: User;
membership?: Membership | UserMembership | undefined;
canEdit: boolean;
onAdd?: () => void;
onRemove?: () => void;
onUpdate?: (permission: DocumentPermission) => void;
};
const MemberListItem = ({
user,
membership,
onRemove,
onUpdate,
canEdit,
}: Props) => {
const { t } = useTranslation();
const handleChange = React.useCallback(
(permission: DocumentPermission | typeof EmptySelectValue) => {
if (permission === EmptySelectValue) {
onRemove?.();
} else {
onUpdate?.(permission);
}
},
[onRemove, onUpdate]
);
return (
<ListItem
title={user.name}
image={<Avatar model={user} size={AvatarSize.Medium} />}
border={false}
style={{ marginRight: -8 }}
actions={
<Flex align="center" gap={8}>
{onUpdate && (
<InputMemberPermissionSelect
permissions={[
{
label: t("No access"),
value: EmptySelectValue,
},
{
label: t("View only"),
value: DocumentPermission.Read,
},
{
label: t("View and edit"),
value: DocumentPermission.ReadWrite,
},
]}
value={membership?.permission}
onChange={handleChange}
disabled={!canEdit}
/>
)}
</Flex>
}
/>
);
};
export default observer(MemberListItem);
+3 -1
View File
@@ -210,9 +210,11 @@ export type AwarenessChangeEvent = {
states: { user?: { id: string }; cursor: any; scrollY: number | undefined }[];
};
export const EmptySelectValue = "__empty__";
export type Permission = {
label: string;
value: CollectionPermission | DocumentPermission;
value: CollectionPermission | DocumentPermission | typeof EmptySelectValue;
};
// TODO: Can we make this type driven by the @Field decorator