feat: improve resend dialog

apps/remix/app/components/dialogs/document-resend-dialog.tsx

@@ -6,7 +6,7 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { type Recipient, SigningStatus } from '@prisma/client';
 import { History } from 'lucide-react';
-import { useForm } from 'react-hook-form';
+import { useForm, useWatch } from 'react-hook-form';
 import * as z from 'zod';
 
 import { useSession } from '@documenso/lib/client-only/providers/session';
@@ -85,6 +85,11 @@ export const DocumentResendDialog = ({ document, recipients }: DocumentResendDia
     formState: { isSubmitting },
   } = form;
 
+  const selectedRecipients = useWatch({
+    control: form.control,
+    name: 'recipients',
+  });
+
   const onFormSubmit = async ({ recipients }: TResendDocumentFormSchema) => {
     try {
       await resendDocument({ documentId: document.id, recipients });
@@ -151,7 +156,7 @@ export const DocumentResendDialog = ({ document, recipients }: DocumentResendDia
 
                       <FormControl>
                         <Checkbox
-                          className="h-5 w-5 rounded-full"
+                          className="h-5 w-5 rounded-full border border-neutral-400"
                           value={recipient.id}
                           checked={value.includes(recipient.id)}
                           onCheckedChange={(checked: boolean) =>
@@ -182,7 +187,13 @@ export const DocumentResendDialog = ({ document, recipients }: DocumentResendDia
               </Button>
             </DialogClose>
 
-            <Button className="flex-1" loading={isSubmitting} type="submit" form={FORM_ID}>
+            <Button
+              className="flex-1"
+              loading={isSubmitting}
+              type="submit"
+              form={FORM_ID}
+              disabled={isSubmitting || selectedRecipients.length === 0}
+            >
               <Trans>Send reminder</Trans>
             </Button>
           </div>

apps/remix/app/components/general/document-signing/document-signing-page-view.tsx

@@ -160,6 +160,14 @@ export const DocumentSigningPageView = ({
   return (
     <DocumentSigningRecipientProvider recipient={recipient} targetSigner={targetSigner}>
       <div className="mx-auto w-full max-w-screen-xl sm:px-6">
+        {document.team.teamGlobalSettings.brandingEnabled &&
+          document.team.teamGlobalSettings.brandingLogo && (
+            <img
+              src={`/api/branding/logo/team/${document.teamId}`}
+              alt={`${document.team.name}'s Logo`}
+              className="mb-4 h-12 w-12 md:mb-2"
+            />
+          )}
         <h1
           className="block max-w-[20rem] truncate text-2xl font-semibold sm:mt-4 md:max-w-[30rem] md:text-3xl"
           title={document.title}

apps/remix/app/routes/api+/health.ts

@@ -23,10 +23,12 @@ export const loader = async () => {
 
   try {
     const certStatus = getCertificateStatus();
+
     if (certStatus.isAvailable) {
       checks.certificate = { status: 'ok' };
     } else {
       checks.certificate = { status: 'warning' };
+
       if (overallStatus === 'ok') {
         overallStatus = 'warning';
       }

apps/remix/package.json

@@ -101,5 +101,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "1.12.2-rc.6"
+  "version": "1.12.4"
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.12.2-rc.6",
+  "version": "1.12.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.12.2-rc.6",
+      "version": "1.12.4",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -89,7 +89,7 @@
     },
     "apps/remix": {
       "name": "@documenso/remix",
-      "version": "1.12.2-rc.6",
+      "version": "1.12.4",
       "dependencies": {
         "@documenso/api": "*",
         "@documenso/assets": "*",

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.12.2-rc.6",
+  "version": "1.12.4",
   "scripts": {
     "build": "turbo run build",
     "dev": "turbo run dev --filter=@documenso/remix",

packages/lib/server-only/cert/cert-status.ts

@@ -2,18 +2,25 @@ import * as fs from 'node:fs';
 
 import { env } from '@documenso/lib/utils/env';
 
-export type CertificateStatus = {
-  isAvailable: boolean;
-};
+export const getCertificateStatus = () => {
+  if (env('NEXT_PRIVATE_SIGNING_TRANSPORT') !== 'local') {
+    return { isAvailable: true };
+  }
+
+  if (env('NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS')) {
+    return { isAvailable: true };
+  }
 
-export const getCertificateStatus = (): CertificateStatus => {
   const defaultPath =
     env('NODE_ENV') === 'production' ? '/opt/documenso/cert.p12' : './example/cert.p12';
+
   const filePath = env('NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH') || defaultPath;
 
   try {
     fs.accessSync(filePath, fs.constants.F_OK | fs.constants.R_OK);
+
     const stats = fs.statSync(filePath);
+
     return { isAvailable: stats.size > 0 };
   } catch {
     return { isAvailable: false };

packages/lib/server-only/document/get-document-by-token.ts

@@ -91,6 +91,12 @@ export const getDocumentAndSenderByToken = async ({
         select: {
           name: true,
           teamEmail: true,
+          teamGlobalSettings: {
+            select: {
+              brandingEnabled: true,
+              brandingLogo: true,
+            },
+          },
         },
       },
     },

packages/lib/server-only/document/handle-document-ownership-on-deletion.ts

@@ -1,84 +0,0 @@
-import { deletedAccountServiceAccount } from '@documenso/lib/server-only/user/service-accounts/deleted-account';
-import { prisma } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';
-
-type HandleDocumentOwnershipOnDeletionOptions = {
-  documentIds: number[];
-  organisationOwnerId: number;
-};
-
-export const handleDocumentOwnershipOnDeletion = async ({
-  documentIds,
-  organisationOwnerId,
-}: HandleDocumentOwnershipOnDeletionOptions) => {
-  if (documentIds.length === 0) {
-    return;
-  }
-
-  const serviceAccount = await deletedAccountServiceAccount();
-  const serviceAccountTeam = serviceAccount.ownedOrganisations[0].teams[0];
-
-  await prisma.document.deleteMany({
-    where: {
-      id: {
-        in: documentIds,
-      },
-      status: DocumentStatus.DRAFT,
-    },
-  });
-
-  const organisationOwner = await prisma.user.findUnique({
-    where: {
-      id: organisationOwnerId,
-    },
-    select: {
-      id: true,
-      ownedOrganisations: {
-        select: {
-          id: true,
-          teams: {
-            select: {
-              id: true,
-            },
-          },
-        },
-      },
-    },
-  });
-
-  if (organisationOwner && organisationOwner.ownedOrganisations.length > 0) {
-    const ownerPersonalTeam = organisationOwner.ownedOrganisations[0].teams[0];
-
-    await prisma.document.updateMany({
-      where: {
-        id: {
-          in: documentIds,
-        },
-        status: {
-          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
-        },
-      },
-      data: {
-        userId: organisationOwner.id,
-        teamId: ownerPersonalTeam.id,
-        deletedAt: new Date(),
-      },
-    });
-  } else {
-    await prisma.document.updateMany({
-      where: {
-        id: {
-          in: documentIds,
-        },
-        status: {
-          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
-        },
-      },
-      data: {
-        userId: serviceAccount.id,
-        teamId: serviceAccountTeam.id,
-        deletedAt: new Date(),
-      },
-    });
-  }
-};

packages/lib/server-only/user/service-accounts/deleted-account.ts

@@ -5,20 +5,6 @@ export const deletedAccountServiceAccount = async () => {
     where: {
       email: 'deleted-account@documenso.com',
     },
-    select: {
-      id: true,
-      email: true,
-      ownedOrganisations: {
-        select: {
-          id: true,
-          teams: {
-            select: {
-              id: true,
-            },
-          },
-        },
-      },
-    },
   });
 
   if (!serviceAccount) {

packages/trpc/server/organisation-router/delete-organisation.ts

@@ -3,7 +3,6 @@ import {
   ORGANISATION_USER_ACCOUNT_TYPE,
 } from '@documenso/lib/constants/organisations';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { handleDocumentOwnershipOnDeletion } from '@documenso/lib/server-only/document/handle-document-ownership-on-deletion';
 import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
 import { prisma } from '@documenso/prisma';
 
@@ -33,24 +32,6 @@ export const deleteOrganisationRoute = authenticatedProcedure
         userId: user.id,
         roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_ORGANISATION'],
       }),
-      select: {
-        id: true,
-        owner: {
-          select: {
-            id: true,
-          },
-        },
-        teams: {
-          select: {
-            id: true,
-            documents: {
-              select: {
-                id: true,
-              },
-            },
-          },
-        },
-      },
     });
 
     if (!organisation) {
@@ -59,15 +40,6 @@ export const deleteOrganisationRoute = authenticatedProcedure
       });
     }
 
-    const documentIds = organisation.teams.flatMap((team) => team.documents.map((doc) => doc.id));
-
-    if (documentIds && documentIds.length > 0) {
-      await handleDocumentOwnershipOnDeletion({
-        documentIds,
-        organisationOwnerId: organisation.owner.id,
-      });
-    }
-
     await prisma.$transaction(async (tx) => {
       await tx.account.deleteMany({
         where: {

packages/trpc/server/team-router/delete-team.ts

@@ -1,8 +1,4 @@
-import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
-import { handleDocumentOwnershipOnDeletion } from '@documenso/lib/server-only/document/handle-document-ownership-on-deletion';
 import { deleteTeam } from '@documenso/lib/server-only/team/delete-team';
-import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
-import { prisma } from '@documenso/prisma';
 
 import { authenticatedProcedure } from '../trpc';
 import { ZDeleteTeamRequestSchema, ZDeleteTeamResponseSchema } from './delete-team.types';
@@ -15,53 +11,12 @@ export const deleteTeamRoute = authenticatedProcedure
     const { teamId } = input;
     const { user } = ctx;
 
-    const team = await prisma.team.findUnique({
-      where: {
-        id: teamId,
-      },
-    });
-
-    const organisation = await prisma.organisation.findFirst({
-      where: buildOrganisationWhereQuery({
-        organisationId: team?.organisationId,
-        userId: user.id,
-        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_ORGANISATION'],
-      }),
-      select: {
-        id: true,
-        owner: {
-          select: {
-            id: true,
-          },
-        },
-        teams: {
-          select: {
-            id: true,
-            documents: {
-              select: {
-                id: true,
-              },
-            },
-          },
-        },
-      },
-    });
-
     ctx.logger.info({
       input: {
         teamId,
       },
     });
 
-    const documentIds = organisation?.teams.flatMap((team) => team.documents.map((doc) => doc.id));
-
-    if (documentIds && documentIds.length > 0 && organisation) {
-      await handleDocumentOwnershipOnDeletion({
-        documentIds,
-        organisationOwnerId: organisation.owner.id,
-      });
-    }
-
     await deleteTeam({
       userId: user.id,
       teamId,

packages/ui/primitives/document-flow/add-signers.tsx

@@ -714,7 +714,6 @@ export const AddSignersFormPartial = ({
                                           handleRecipientAutoCompleteSelect(index, suggestion)
                                         }
                                         onSearchQueryChange={(query) => {
-                                          console.log('onSearchQueryChange', query);
                                           field.onChange(query);
                                           setRecipientSearchQuery(query);
                                         }}

packages/ui/primitives/signature-pad/signature-pad.tsx

@@ -1,9 +1,9 @@
 import type { HTMLAttributes } from 'react';
 import { useState } from 'react';
 
-import { Trans } from '@lingui/react/macro';
 import { KeyboardIcon, UploadCloudIcon } from 'lucide-react';
 import { match } from 'ts-pattern';
+import { Trans } from '@lingui/react/macro';
 
 import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { isBase64Image } from '@documenso/lib/constants/signatures';

packages/ui/primitives/template-flow/add-template-settings.tsx

@@ -216,12 +216,7 @@ export const AddTemplateSettingsFormPartial = ({
                   </FormLabel>
 
                   <FormControl>
-                    <Input
-                      className="bg-background"
-                      {...field}
-                      maxLength={255}
-                      onBlur={handleAutoSave}
-                    />
+                    <Input className="bg-background" {...field} maxLength={255} onBlur={handleAutoSave} />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -629,12 +624,7 @@ export const AddTemplateSettingsFormPartial = ({
                           </FormLabel>
 
                           <FormControl>
-                            <Input
-                              className="bg-background"
-                              {...field}
-                              maxLength={255}
-                              onBlur={handleAutoSave}
-                            />
+                            <Input className="bg-background" {...field} maxLength={255} onBlur={handleAutoSave} />
                           </FormControl>
 
                           <FormMessage />
@@ -725,12 +715,7 @@ export const AddTemplateSettingsFormPartial = ({
                           </FormLabel>
 
                           <FormControl>
-                            <Input
-                              className="bg-background"
-                              {...field}
-                              maxLength={255}
-                              onBlur={handleAutoSave}
-                            />
+                            <Input className="bg-background" {...field} maxLength={255} onBlur={handleAutoSave} />
                           </FormControl>
 
                           <FormMessage />