Merge branch 'main' into feat/separate-document-page

apps/web/src/components/(dashboard)/layout/menu-switcher.tsx

@@ -166,6 +166,7 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
               </div>
             </DropdownMenuLabel>
 
+            <div className="custom-scrollbar max-h-[40vh] overflow-auto">
               {teams.map((team) => (
                 <DropdownMenuItem asChild key={team.id}>
                   <Link href={formatRedirectUrlOnSwitch(team.url)}>
@@ -182,6 +183,7 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
                   </Link>
                 </DropdownMenuItem>
               ))}
+            </div>
           </>
         ) : (
           <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>

packages/lib/server-only/document/resend-document.tsx

@@ -16,9 +16,8 @@ import { prisma } from '@documenso/prisma';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import type { Prisma } from '@documenso/prisma/client';
 
-import { getDocumentWhereInput } from './get-document-by-id';
-
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { getDocumentWhereInput } from './get-document-by-id';
 
 export type ResendDocumentOptions = {
   documentId: number;
@@ -111,7 +110,8 @@ export const resendDocument = async ({
 
       const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role];
 
-      await prisma.$transaction(async (tx) => {
+      await prisma.$transaction(
+        async (tx) => {
           await mailer.sendMail({
             to: {
               address: email,
@@ -144,7 +144,9 @@ export const resendDocument = async ({
               },
             }),
           });
-      });
+        },
+        { timeout: 30_000 },
+      );
     }),
   );
 };

packages/lib/server-only/document/send-completed-email.ts

@@ -49,7 +49,8 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
         downloadLink: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}/complete`,
       });
 
-      await prisma.$transaction(async (tx) => {
+      await prisma.$transaction(
+        async (tx) => {
           await mailer.sendMail({
             to: {
               address: email,
@@ -86,7 +87,9 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
               },
             }),
           });
-      });
+        },
+        { timeout: 30_000 },
+      );
     }),
   );
 };

packages/lib/server-only/document/send-document.tsx

@@ -108,7 +108,8 @@ export const sendDocument = async ({
 
       const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role];
 
-      await prisma.$transaction(async (tx) => {
+      await prisma.$transaction(
+        async (tx) => {
           await mailer.sendMail({
             to: {
               address: email,
@@ -150,7 +151,9 @@ export const sendDocument = async ({
               },
             }),
           });
-      });
+        },
+        { timeout: 30_000 },
+      );
     }),
   );
 

packages/lib/server-only/document/update-title.ts

@@ -24,8 +24,7 @@ export const updateTitle = async ({
     },
   });
 
-  return await prisma.$transaction(async (tx) => {
-    const document = await tx.document.findFirstOrThrow({
+  const document = await prisma.document.findFirstOrThrow({
     where: {
       id: documentId,
       OR: [
@@ -49,9 +48,14 @@ export const updateTitle = async ({
     return document;
   }
 
+  return await prisma.$transaction(async (tx) => {
+    // Instead of doing everything in a transaction we can use our knowledge
+    // of the current document title to ensure we aren't performing a conflicting
+    // update.
     const updatedDocument = await tx.document.update({
       where: {
         id: documentId,
+        title: document.title,
       },
       data: {
         title,

packages/lib/server-only/team/accept-team-invitation.ts

@@ -9,7 +9,8 @@ export type AcceptTeamInvitationOptions = {
 };
 
 export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitationOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const user = await tx.user.findFirstOrThrow({
         where: {
           id: userId,
@@ -59,5 +60,7 @@ export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitat
           quantity: numberOfSeats,
         });
       }
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/create-team-email-verification.ts

@@ -28,7 +28,8 @@ export const createTeamEmailVerification = async ({
   data,
 }: CreateTeamEmailVerificationOptions) => {
   try {
-    await prisma.$transaction(async (tx) => {
+    await prisma.$transaction(
+      async (tx) => {
         const team = await tx.team.findFirstOrThrow({
           where: {
             id: teamId,
@@ -77,7 +78,9 @@ export const createTeamEmailVerification = async ({
         });
 
         await sendTeamEmailVerificationEmail(data.email, token, team.name, team.url);
-    });
+      },
+      { timeout: 30_000 },
+    );
   } catch (err) {
     console.error(err);
 

packages/lib/server-only/team/delete-team-members.ts

@@ -27,7 +27,8 @@ export const deleteTeamMembers = async ({
   teamId,
   teamMemberIds,
 }: DeleteTeamMembersOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       // Find the team and validate that the user is allowed to remove members.
       const team = await tx.team.findFirstOrThrow({
         where: {
@@ -54,7 +55,9 @@ export const deleteTeamMembers = async ({
       });
 
       const currentTeamMember = team.members.find((member) => member.userId === userId);
-    const teamMembersToRemove = team.members.filter((member) => teamMemberIds.includes(member.id));
+      const teamMembersToRemove = team.members.filter((member) =>
+        teamMemberIds.includes(member.id),
+      );
 
       if (!currentTeamMember) {
         throw new AppError(AppErrorCode.NOT_FOUND, 'Team member record does not exist');
@@ -98,5 +101,7 @@ export const deleteTeamMembers = async ({
           quantity: numberOfSeats,
         });
       }
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/delete-team.ts

@@ -9,7 +9,8 @@ export type DeleteTeamOptions = {
 };
 
 export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const team = await tx.team.findFirstOrThrow({
         where: {
           id: teamId,
@@ -38,5 +39,7 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
           ownerUserId: userId,
         },
       });
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/leave-team.ts

@@ -15,7 +15,8 @@ export type LeaveTeamOptions = {
 };
 
 export const leaveTeam = async ({ userId, teamId }: LeaveTeamOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const team = await tx.team.findFirstOrThrow({
         where: {
           id: teamId,
@@ -55,5 +56,7 @@ export const leaveTeam = async ({ userId, teamId }: LeaveTeamOptions) => {
           quantity: numberOfSeats,
         });
       }
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/request-team-ownership-transfer.ts

@@ -44,7 +44,8 @@ export const requestTeamOwnershipTransfer = async ({
   // Todo: Clear payment methods disabled for now.
   const clearPaymentMethods = false;
 
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const team = await tx.team.findFirstOrThrow({
         where: {
           id: teamId,
@@ -102,5 +103,7 @@ export const requestTeamOwnershipTransfer = async ({
         html: render(template),
         text: render(template, { plainText: true }),
       });
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/resend-team-email-verification.ts

@@ -17,7 +17,8 @@ export const resendTeamEmailVerification = async ({
   userId,
   teamId,
 }: ResendTeamMemberInvitationOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const team = await tx.team.findUniqueOrThrow({
         where: {
           id: teamId,
@@ -61,5 +62,7 @@ export const resendTeamEmailVerification = async ({
       });
 
       await sendTeamEmailVerificationEmail(emailVerification.email, token, team.name, team.url);
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/resend-team-member-invitation.ts

@@ -35,7 +35,8 @@ export const resendTeamMemberInvitation = async ({
   teamId,
   invitationId,
 }: ResendTeamMemberInvitationOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const team = await tx.team.findUniqueOrThrow({
         where: {
           id: teamId,
@@ -72,5 +73,7 @@ export const resendTeamMemberInvitation = async ({
         teamUrl: team.url,
         senderName: userName,
       });
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/team/transfer-team-ownership.ts

@@ -11,7 +11,8 @@ export type TransferTeamOwnershipOptions = {
 };
 
 export const transferTeamOwnership = async ({ token }: TransferTeamOwnershipOptions) => {
-  await prisma.$transaction(async (tx) => {
+  await prisma.$transaction(
+    async (tx) => {
       const teamTransferVerification = await tx.teamTransferVerification.findFirstOrThrow({
         where: {
           token,
@@ -84,5 +85,7 @@ export const transferTeamOwnership = async ({ token }: TransferTeamOwnershipOpti
           },
         },
       });
-  });
+    },
+    { timeout: 30_000 },
+  );
 };

packages/lib/server-only/user/create-user.ts

@@ -53,7 +53,8 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
   await Promise.allSettled(
     acceptedTeamInvites.map(async (invite) =>
       prisma
-        .$transaction(async (tx) => {
+        .$transaction(
+          async (tx) => {
             await tx.teamMember.create({
               data: {
                 teamId: invite.teamId,
@@ -93,7 +94,9 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
                 quantity: team.members.length,
               });
             }
-        })
+          },
+          { timeout: 30_000 },
+        )
         .catch(async () => {
           await prisma.teamMemberInvite.update({
             where: {

packages/ui/primitives/pdf-viewer.tsx

@@ -233,10 +233,8 @@ export const PDFViewer = ({
             {Array(numPages)
               .fill(null)
               .map((_, i) => (
-                <div
-                  key={i}
-                  className="border-border my-8 overflow-hidden rounded border will-change-transform first:mt-0 last:mb-0"
-                >
+                <div key={i} className="last:-mb-2">
+                  <div className="border-border overflow-hidden rounded border will-change-transform">
                     <PDFPage
                       pageNumber={i + 1}
                       width={width}
@@ -246,6 +244,10 @@ export const PDFViewer = ({
                       onClick={(e) => onDocumentPageClick(e, i + 1)}
                     />
                   </div>
+                  <p className="text-muted-foreground/80 my-2 text-center text-[11px]">
+                    Page {i + 1} of {numPages}
+                  </p>
+                </div>
               ))}
           </PDFDocument>