yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tsc

Browse Source
This commit is contained in:
Tom Moor
2024-05-16 21:23:02 -04:00
parent 3d87a03ca6
commit 40a2c29c3f
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/components/Sharing/Collection/SharePopover.tsx
View File

@@ -154,8 +154,8 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
collectionId: collection.id, collectionId: collection.id,
userId: user.id, userId: user.id,
permission: permission:
user?.role === UserRole.Viewer || user.role === UserRole.Viewer ||
user?.role === UserRole.Guest user.role === UserRole.Guest
? CollectionPermission.Read ? CollectionPermission.Read
: CollectionPermission.ReadWrite, : CollectionPermission.ReadWrite,
}); });
@@ -166,19 +166,19 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
await collectionGroupMemberships.create({ await collectionGroupMemberships.create({
collectionId: collection.id, collectionId: collection.id,
groupId: group.id, groupId: group.id,
permission: permission: CollectionPermission.Read,
user?.role === UserRole.Viewer ||
user?.role === UserRole.Guest
? CollectionPermission.Read
: CollectionPermission.ReadWrite,
}); });
return group; return group;
} }
}) })
); );
const invitedUsers = invited.filter((item) => item instanceof User); const invitedUsers = invited.filter(
const invitedGroups = invited.filter((item) => item instanceof Group); (item) => item instanceof User
) as User[];
const invitedGroups = invited.filter(
(item) => item instanceof Group
) as Group[];
// Special case for the common action of adding a single user. // Special case for the common action of adding a single user.
if (invitedUsers.length === 1 && invited.length === 1) { if (invitedUsers.length === 1 && invited.length === 1) {

3
app/components/Sharing/Document/SharePopover.tsx
View File

@@ -8,6 +8,7 @@ import { toast } from "sonner";
import { DocumentPermission, UserRole } from "@shared/types"; import { DocumentPermission, UserRole } from "@shared/types";
import Document from "~/models/Document"; import Document from "~/models/Document";
import Share from "~/models/Share"; import Share from "~/models/Share";
import User from "~/models/User";
import Avatar from "~/components/Avatar"; import Avatar from "~/components/Avatar";
import { AvatarSize } from "~/components/Avatar/Avatar"; import { AvatarSize } from "~/components/Avatar/Avatar";
import ButtonSmall from "~/components/ButtonSmall"; import ButtonSmall from "~/components/ButtonSmall";
@@ -161,7 +162,7 @@ function SharePopover({
); );
if (usersInvited.length === 1) { if (usersInvited.length === 1) {
const user = usersInvited[0]; const user = usersInvited[0] as User;
toast.message( toast.message(
t("{{ userName }} was invited to the document", { t("{{ userName }} was invited to the document", {
userName: user.name, userName: user.name,