From 40a2c29c3f17e248d826b15bbf53a1b31e94113e Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 16 May 2024 21:23:02 -0400
Subject: [PATCH] tsc

---
 .../Sharing/Collection/SharePopover.tsx        | 18 +++++++++---------
 .../Sharing/Document/SharePopover.tsx          |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/components/Sharing/Collection/SharePopover.tsx b/app/components/Sharing/Collection/SharePopover.tsx
index a9bcfe9bf..4978801ca 100644
--- a/app/components/Sharing/Collection/SharePopover.tsx
+++ b/app/components/Sharing/Collection/SharePopover.tsx
@@ -154,8 +154,8 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
                   collectionId: collection.id,
                   userId: user.id,
                   permission:
-                    user?.role === UserRole.Viewer ||
-                    user?.role === UserRole.Guest
+                    user.role === UserRole.Viewer ||
+                    user.role === UserRole.Guest
                       ? CollectionPermission.Read
                       : CollectionPermission.ReadWrite,
                 });
@@ -166,19 +166,19 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
                 await collectionGroupMemberships.create({
                   collectionId: collection.id,
                   groupId: group.id,
-                  permission:
-                    user?.role === UserRole.Viewer ||
-                    user?.role === UserRole.Guest
-                      ? CollectionPermission.Read
-                      : CollectionPermission.ReadWrite,
+                  permission: CollectionPermission.Read,
                 });
                 return group;
               }
             })
           );
 
-          const invitedUsers = invited.filter((item) => item instanceof User);
-          const invitedGroups = invited.filter((item) => item instanceof Group);
+          const invitedUsers = invited.filter(
+            (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.
           if (invitedUsers.length === 1 && invited.length === 1) {
diff --git a/app/components/Sharing/Document/SharePopover.tsx b/app/components/Sharing/Document/SharePopover.tsx
index 6f7b97659..abac3661f 100644
--- a/app/components/Sharing/Document/SharePopover.tsx
+++ b/app/components/Sharing/Document/SharePopover.tsx
@@ -8,6 +8,7 @@ import { toast } from "sonner";
 import { DocumentPermission, UserRole } from "@shared/types";
 import Document from "~/models/Document";
 import Share from "~/models/Share";
+import User from "~/models/User";
 import Avatar from "~/components/Avatar";
 import { AvatarSize } from "~/components/Avatar/Avatar";
 import ButtonSmall from "~/components/ButtonSmall";
@@ -161,7 +162,7 @@ function SharePopover({
           );
 
           if (usersInvited.length === 1) {
-            const user = usersInvited[0];
+            const user = usersInvited[0] as User;
             toast.message(
               t("{{ userName }} was invited to the document", {
                 userName: user.name,