fix: translations

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.1",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {

apps/web/src/app/(dashboard)/admin/leaderboard/data-table-leaderboard.tsx

@@ -16,9 +16,13 @@ import { Input } from '@documenso/ui/primitives/input';
 export type SigningVolume = {
   id: number;
   name: string;
+  email: string;
   signingVolume: number;
   createdAt: Date;
   planId: string;
+  userId?: number | null;
+  teamId?: number | null;
+  isTeam: boolean;
 };
 
 type LeaderboardTableProps = {

apps/web/src/app/(dashboard)/admin/leaderboard/page.tsx

@@ -4,7 +4,7 @@ import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
 
-import { LeaderboardTable } from './data-table-leaderboard';
+import { LeaderboardTable, type SigningVolume } from './data-table-leaderboard';
 import { search } from './fetch-leaderboard.actions';
 
 type AdminLeaderboardProps = {
@@ -32,7 +32,7 @@ export default async function Leaderboard({ searchParams = {} }: AdminLeaderboar
   const sortBy = searchParams.sortBy || 'signingVolume';
   const sortOrder = searchParams.sortOrder || 'desc';
 
-  const { leaderboard: signingVolume, totalPages } = await search({
+  const { leaderboard, totalPages } = await search({
     search: searchString,
     page,
     perPage,
@@ -40,14 +40,22 @@ export default async function Leaderboard({ searchParams = {} }: AdminLeaderboar
     sortOrder,
   });
 
+  const typedSigningVolume: SigningVolume[] = leaderboard.map((item) => ({
+    ...item,
+    name: item.name || '',
+    createdAt: item.createdAt || new Date(),
+  }));
+
   return (
     <div>
-      <h2 className="text-4xl font-semibold">
-        <Trans>Signing Volume</Trans>
-      </h2>
+      <div className="flex items-center">
+        <h2 className="text-4xl font-semibold">
+          <Trans>Signing Volume</Trans>
+        </h2>
+      </div>
       <div className="mt-8">
         <LeaderboardTable
-          signingVolume={signingVolume}
+          signingVolume={typedSigningVolume}
           totalPages={totalPages}
           page={page}
           perPage={perPage}

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx

@@ -14,12 +14,6 @@ import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { Button } from '@documenso/ui/primitives/button';
-import {
-  SplitButton,
-  SplitButtonAction,
-  SplitButtonDropdown,
-  SplitButtonDropdownItem,
-} from '@documenso/ui/primitives/split-button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentPageViewButtonProps = {
@@ -31,9 +25,7 @@ export type DocumentPageViewButtonProps = {
   team?: Pick<Team, 'id' | 'url'>;
 };
 
-export const DocumentPageViewButton = ({
-  document: activeDocument,
-}: DocumentPageViewButtonProps) => {
+export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps) => {
   const { data: session } = useSession();
   const { toast } = useToast();
   const { _ } = useLingui();
@@ -42,27 +34,25 @@ export const DocumentPageViewButton = ({
     return null;
   }
 
-  const recipient = activeDocument.recipients.find(
-    (recipient) => recipient.email === session.user.email,
-  );
+  const recipient = document.recipients.find((recipient) => recipient.email === session.user.email);
 
   const isRecipient = !!recipient;
-  const isPending = activeDocument.status === DocumentStatus.PENDING;
-  const isComplete = activeDocument.status === DocumentStatus.COMPLETED;
+  const isPending = document.status === DocumentStatus.PENDING;
+  const isComplete = document.status === DocumentStatus.COMPLETED;
   const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
   const role = recipient?.role;
 
-  const documentsPath = formatDocumentsPath(activeDocument.team?.url);
+  const documentsPath = formatDocumentsPath(document.team?.url);
 
   const onDownloadClick = async () => {
     try {
       const documentWithData = await trpcClient.document.getDocumentById.query(
         {
-          documentId: activeDocument.id,
+          documentId: document.id,
         },
         {
           context: {
-            teamId: activeDocument.team?.id?.toString(),
+            teamId: document.team?.id?.toString(),
           },
         },
       );
@@ -73,10 +63,7 @@ export const DocumentPageViewButton = ({
         throw new Error('No document available');
       }
 
-      await downloadPDF({
-        documentData,
-        fileName: documentWithData.title,
-      });
+      await downloadPDF({ documentData, fileName: documentWithData.title });
     } catch (err) {
       toast({
         title: _(msg`Something went wrong`),
@@ -86,100 +73,6 @@ export const DocumentPageViewButton = ({
     }
   };
 
-  const onDownloadAuditLogClick = async () => {
-    try {
-      const { url } = await trpcClient.document.downloadAuditLogs.mutate({
-        documentId: activeDocument.id,
-      });
-
-      const iframe = Object.assign(document.createElement('iframe'), {
-        src: url,
-      });
-
-      Object.assign(iframe.style, {
-        position: 'fixed',
-        top: '0',
-        left: '0',
-        width: '0',
-        height: '0',
-      });
-
-      const onLoaded = () => {
-        if (iframe.contentDocument?.readyState === 'complete') {
-          iframe.contentWindow?.print();
-
-          iframe.contentWindow?.addEventListener('afterprint', () => {
-            document.body.removeChild(iframe);
-          });
-        }
-      };
-
-      // When the iframe has loaded, print the iframe and remove it from the dom
-      iframe.addEventListener('load', onLoaded);
-
-      document.body.appendChild(iframe);
-
-      onLoaded();
-    } catch (error) {
-      console.error(error);
-
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(
-          msg`Sorry, we were unable to download the audit logs. Please try again later.`,
-        ),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const onDownloadSigningCertificateClick = async () => {
-    try {
-      const { url } = await trpcClient.document.downloadCertificate.mutate({
-        documentId: activeDocument.id,
-      });
-
-      const iframe = Object.assign(document.createElement('iframe'), {
-        src: url,
-      });
-
-      Object.assign(iframe.style, {
-        position: 'fixed',
-        top: '0',
-        left: '0',
-        width: '0',
-        height: '0',
-      });
-
-      const onLoaded = () => {
-        if (iframe.contentDocument?.readyState === 'complete') {
-          iframe.contentWindow?.print();
-
-          iframe.contentWindow?.addEventListener('afterprint', () => {
-            document.body.removeChild(iframe);
-          });
-        }
-      };
-
-      // When the iframe has loaded, print the iframe and remove it from the dom
-      iframe.addEventListener('load', onLoaded);
-
-      document.body.appendChild(iframe);
-
-      onLoaded();
-    } catch (error) {
-      console.error(error);
-
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(
-          msg`Sorry, we were unable to download the certificate. Please try again later.`,
-        ),
-        variant: 'destructive',
-      });
-    }
-  };
-
   return match({
     isRecipient,
     isPending,
@@ -213,27 +106,16 @@ export const DocumentPageViewButton = ({
     ))
     .with({ isComplete: false }, () => (
       <Button className="w-full" asChild>
-        <Link href={`${documentsPath}/${activeDocument.id}/edit`}>
+        <Link href={`${documentsPath}/${document.id}/edit`}>
           <Trans>Edit</Trans>
         </Link>
       </Button>
     ))
     .with({ isComplete: true }, () => (
-      <SplitButton className="flex w-full">
-        <SplitButtonAction className="w-full" onClick={() => void onDownloadClick()}>
-          <Download className="-ml-1 mr-2 inline h-4 w-4" />
-          <Trans>Download</Trans>
-        </SplitButtonAction>
-        <SplitButtonDropdown>
-          <SplitButtonDropdownItem onClick={() => void onDownloadAuditLogClick()}>
-            <Trans>Only Audit Log</Trans>
-          </SplitButtonDropdownItem>
-
-          <SplitButtonDropdownItem onClick={() => void onDownloadSigningCertificateClick()}>
-            <Trans>Only Signing Certificate</Trans>
-          </SplitButtonDropdownItem>
-        </SplitButtonDropdown>
-      </SplitButton>
+      <Button className="w-full" onClick={onDownloadClick}>
+        <Download className="-ml-1 mr-2 inline h-4 w-4" />
+        <Trans>Download</Trans>
+      </Button>
     ))
     .otherwise(() => null);
 };

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -187,8 +187,6 @@ export const EditDocumentForm = ({
           title: data.title,
           externalId: data.externalId || null,
           visibility: data.visibility,
-          includeSigningCertificate: data.includeSigningCertificate,
-          includeAuditTrailLog: data.includeAuditTrailLog,
           globalAccessAuth: data.globalAccessAuth ?? null,
           globalActionAuth: data.globalActionAuth ?? null,
         },

apps/web/src/app/(signing)/sign/[token]/reject-document-dialog.tsx

@@ -43,10 +43,9 @@ type TRejectDocumentFormSchema = z.infer<typeof ZRejectDocumentFormSchema>;
 export interface RejectDocumentDialogProps {
   document: Pick<Document, 'id'>;
   token: string;
-  onRejected?: (reason: string) => void | Promise<void>;
 }
 
-export function RejectDocumentDialog({ document, token, onRejected }: RejectDocumentDialogProps) {
+export function RejectDocumentDialog({ document, token }: RejectDocumentDialogProps) {
   const { toast } = useToast();
   const router = useRouter();
   const searchParams = useSearchParams();
@@ -80,11 +79,7 @@ export function RejectDocumentDialog({ document, token, onRejected }: RejectDocu
 
       setIsOpen(false);
 
-      if (onRejected) {
-        await onRejected(reason);
-      } else {
-        router.push(`/sign/${token}/rejected`);
-      }
+      router.push(`/sign/${token}/rejected`);
     } catch (err) {
       toast({
         title: 'Error',

apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx

@@ -41,7 +41,6 @@ const ZTeamDocumentPreferencesFormSchema = z.object({
   includeSenderDetails: z.boolean(),
   typedSignatureEnabled: z.boolean(),
   includeSigningCertificate: z.boolean(),
-  includeAuditTrailLog: z.boolean(),
 });
 
 type TTeamDocumentPreferencesFormSchema = z.infer<typeof ZTeamDocumentPreferencesFormSchema>;
@@ -73,7 +72,6 @@ export const TeamDocumentPreferencesForm = ({
       includeSenderDetails: settings?.includeSenderDetails ?? false,
       typedSignatureEnabled: settings?.typedSignatureEnabled ?? true,
       includeSigningCertificate: settings?.includeSigningCertificate ?? true,
-      includeAuditTrailLog: settings?.includeAuditTrailLog ?? false,
     },
     resolver: zodResolver(ZTeamDocumentPreferencesFormSchema),
   });
@@ -88,7 +86,6 @@ export const TeamDocumentPreferencesForm = ({
         includeSenderDetails,
         includeSigningCertificate,
         typedSignatureEnabled,
-        includeAuditTrailLog,
       } = data;
 
       await updateTeamDocumentPreferences({
@@ -99,7 +96,6 @@ export const TeamDocumentPreferencesForm = ({
           includeSenderDetails,
           typedSignatureEnabled,
           includeSigningCertificate,
-          includeAuditTrailLog,
         },
       });
 
@@ -304,37 +300,6 @@ export const TeamDocumentPreferencesForm = ({
             )}
           />
 
-          <FormField
-            control={form.control}
-            name="includeAuditTrailLog"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Include the Audit Trail Log in the Document</Trans>
-                </FormLabel>
-
-                <div>
-                  <FormControl className="block">
-                    <Switch
-                      ref={field.ref}
-                      name={field.name}
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </div>
-
-                <FormDescription>
-                  <Trans>
-                    Controls whether the audit trail log will be included in the document when it is
-                    downloaded. The audit trail log can still be downloaded from the logs page
-                    separately.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
           <div className="flex flex-row justify-end space-x-4">
             <Button type="submit" loading={form.formState.isSubmitting}>
               <Trans>Save</Trans>

apps/web/src/app/embed/rejected.tsx

@@ -1,40 +0,0 @@
-import { Trans } from '@lingui/macro';
-import { XCircle } from 'lucide-react';
-
-import type { Signature } from '@documenso/prisma/client';
-
-export type EmbedDocumentRejectedPageProps = {
-  name?: string;
-  signature?: Signature;
-};
-
-export const EmbedDocumentRejected = ({ name }: EmbedDocumentRejectedPageProps) => {
-  return (
-    <div className="embed--DocumentRejected relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
-      <div className="flex flex-col items-center">
-        <div className="flex items-center gap-x-4">
-          <XCircle className="text-destructive h-10 w-10" />
-
-          <h2 className="max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
-            <Trans>Document Rejected</Trans>
-          </h2>
-        </div>
-
-        <div className="text-destructive mt-4 flex items-center text-center text-sm">
-          <Trans>You have rejected this document</Trans>
-        </div>
-
-        <p className="text-muted-foreground mt-6 max-w-[60ch] text-center text-sm">
-          <Trans>
-            The document owner has been notified of your decision. They may contact you with further
-            instructions if necessary.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mt-2 max-w-[60ch] text-center text-sm">
-          <Trans>No further action is required from you at this time.</Trans>
-        </p>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/embed/sign/[[...url]]/client.tsx

@@ -10,13 +10,7 @@ import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn'
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { DocumentMeta, TemplateMeta } from '@documenso/prisma/client';
-import {
-  type DocumentData,
-  type Field,
-  FieldType,
-  RecipientRole,
-  SigningStatus,
-} from '@documenso/prisma/client';
+import { type DocumentData, type Field, FieldType, RecipientRole } from '@documenso/prisma/client';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
@@ -32,13 +26,11 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
 import { RecipientProvider } from '~/app/(signing)/sign/[token]/recipient-context';
-import { RejectDocumentDialog } from '~/app/(signing)/sign/[token]/reject-document-dialog';
 import { Logo } from '~/components/branding/logo';
 
 import { EmbedClientLoading } from '../../client-loading';
 import { EmbedDocumentCompleted } from '../../completed';
 import { EmbedDocumentFields } from '../../document-fields';
-import { EmbedDocumentRejected } from '../../rejected';
 import { injectCss } from '../../util';
 import { ZSignDocumentEmbedDataSchema } from './schema';
 
@@ -83,9 +75,6 @@ export const EmbedSignDocumentClientPage = ({
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
   const [hasCompletedDocument, setHasCompletedDocument] = useState(isCompleted);
-  const [hasRejectedDocument, setHasRejectedDocument] = useState(
-    recipient.signingStatus === SigningStatus.REJECTED,
-  );
   const [selectedSignerId, setSelectedSignerId] = useState<number | null>(
     allRecipients.length > 0 ? allRecipients[0].id : null,
   );
@@ -94,8 +83,6 @@ export const EmbedSignDocumentClientPage = ({
   const [isNameLocked, setIsNameLocked] = useState(false);
   const [showPendingFieldTooltip, setShowPendingFieldTooltip] = useState(false);
 
-  const [allowDocumentRejection, setAllowDocumentRejection] = useState(false);
-
   const selectedSigner = allRecipients.find((r) => r.id === selectedSignerId);
   const isAssistantMode = recipient.role === RecipientRole.ASSISTANT;
 
@@ -174,25 +161,6 @@ export const EmbedSignDocumentClientPage = ({
     }
   };
 
-  const onDocumentRejected = (reason: string) => {
-    if (window.parent) {
-      window.parent.postMessage(
-        {
-          action: 'document-rejected',
-          data: {
-            token,
-            documentId,
-            recipientId: recipient.id,
-            reason,
-          },
-        },
-        '*',
-      );
-    }
-
-    setHasRejectedDocument(true);
-  };
-
   useLayoutEffect(() => {
     const hash = window.location.hash.slice(1);
 
@@ -206,7 +174,6 @@ export const EmbedSignDocumentClientPage = ({
       // Since a recipient can be provided a name we can lock it without requiring
       // a to be provided by the parent application, unlike direct templates.
       setIsNameLocked(!!data.lockName);
-      setAllowDocumentRejection(!!data.allowDocumentRejection);
 
       if (data.darkModeDisabled) {
         document.documentElement.classList.add('dark-mode-disabled');
@@ -241,10 +208,6 @@ export const EmbedSignDocumentClientPage = ({
     }
   }, [hasFinishedInit, hasDocumentLoaded]);
 
-  if (hasRejectedDocument) {
-    return <EmbedDocumentRejected name={fullName} />;
-  }
-
   if (hasCompletedDocument) {
     return (
       <EmbedDocumentCompleted
@@ -266,16 +229,6 @@ export const EmbedSignDocumentClientPage = ({
       <div className="embed--Root relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
         {(!hasFinishedInit || !hasDocumentLoaded) && <EmbedClientLoading />}
 
-        {allowDocumentRejection && (
-          <div className="embed--Actions mb-4 flex w-full flex-row-reverse items-baseline justify-between">
-            <RejectDocumentDialog
-              document={{ id: documentId }}
-              token={token}
-              onRejected={onDocumentRejected}
-            />
-          </div>
-        )}
-
         <div className="embed--DocumentContainer relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
           {/* Viewer */}
           <div className="embed--DocumentViewer flex-1">
@@ -467,7 +420,7 @@ export const EmbedSignDocumentClientPage = ({
                   </Button>
                 ) : (
                   <Button
-                    className={allowDocumentRejection ? 'col-start-2' : 'col-span-2'}
+                    className="col-start-2"
                     disabled={
                       isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
                     }

apps/web/src/app/embed/sign/[[...url]]/schema.ts

@@ -13,5 +13,4 @@ export const ZSignDocumentEmbedDataSchema = ZBaseEmbedDataSchema.extend({
     .optional()
     .transform((value) => value || undefined),
   lockName: z.boolean().optional().default(false),
-  allowDocumentRejection: z.boolean().optional(),
 });

apps/web/src/components/document/document-history-sheet.tsx

@@ -363,40 +363,6 @@ export const DocumentHistorySheet = ({
                       ]}
                     />
                   ))
-                  .with(
-                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED },
-                    ({ data }) => (
-                      <DocumentHistorySheetChanges
-                        values={[
-                          {
-                            key: 'Old',
-                            value: data.from,
-                          },
-                          {
-                            key: 'New',
-                            value: data.to,
-                          },
-                        ]}
-                      />
-                    ),
-                  )
-                  .with(
-                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED },
-                    ({ data }) => (
-                      <DocumentHistorySheetChanges
-                        values={[
-                          {
-                            key: 'Old',
-                            value: data.from,
-                          },
-                          {
-                            key: 'New',
-                            value: data.to,
-                          },
-                        ]}
-                      />
-                    ),
-                  )
                   .exhaustive()}
 
                 {isUserDetailsVisible && (

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.9.1-rc.2",
+      "version": "1.9.1-rc.1",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -106,7 +106,7 @@
     },
     "apps/web": {
       "name": "@documenso/web",
-      "version": "1.9.1-rc.2",
+      "version": "1.9.1-rc.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/api": "*",
@@ -35722,6 +35722,21 @@
       "engines": {
         "node": ">=6"
       }
+    },
+    "packages/trpc/node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.6.tgz",
+      "integrity": "sha512-hNukAxq7hu4o5/UjPp5jqoBEtrpCbOmnUqZSKNJG8GrUVzfq0ucdhQFVrHcLRMvQcwqqDh1a5AJN9ORnNDpgBQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.1",
   "scripts": {
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",

packages/lib/jobs/definitions/emails/send-team-deleted-email.ts

@@ -17,7 +17,6 @@ const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
         documentLanguage: z.string(),
         includeSenderDetails: z.boolean(),
         includeSigningCertificate: z.boolean(),
-        includeAuditTrailLog: z.boolean(),
         brandingEnabled: z.boolean(),
         brandingLogo: z.string(),
         brandingUrl: z.string(),

packages/lib/jobs/definitions/internal/seal-document.handler.ts

@@ -13,7 +13,6 @@ import { signPdf } from '@documenso/signing';
 
 import { sendCompletedEmail } from '../../../server-only/document/send-completed-email';
 import PostHogServerClient from '../../../server-only/feature-flags/get-post-hog-server-client';
-import { getAuditLogsPdf } from '../../../server-only/htmltopdf/get-audit-logs-pdf';
 import { getCertificatePdf } from '../../../server-only/htmltopdf/get-certificate-pdf';
 import { flattenAnnotations } from '../../../server-only/pdf/flatten-annotations';
 import { flattenForm } from '../../../server-only/pdf/flatten-form';
@@ -58,7 +57,6 @@ export const run = async ({
           teamGlobalSettings: {
             select: {
               includeSigningCertificate: true,
-              includeAuditTrailLog: true,
             },
           },
         },
@@ -123,36 +121,13 @@ export const run = async ({
 
   const pdfData = await getFile(documentData);
 
-  let includeSigningCertificate;
-
-  if (document.teamId) {
-    includeSigningCertificate =
-      document.team?.teamGlobalSettings?.includeSigningCertificate ?? true;
-  } else {
-    includeSigningCertificate = document.includeSigningCertificate ?? true;
-  }
-
-  const certificateData = includeSigningCertificate
-    ? await getCertificatePdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch(() => null)
-    : null;
-
-  let includeAuditTrailLog;
-
-  if (document.teamId) {
-    includeAuditTrailLog = document.team?.teamGlobalSettings?.includeAuditTrailLog ?? true;
-  } else {
-    includeAuditTrailLog = document.includeAuditTrailLog ?? true;
-  }
-
-  const auditLogData = includeAuditTrailLog
-    ? await getAuditLogsPdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch(() => null)
-    : null;
+  const certificateData =
+    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
+      ? await getCertificatePdf({
+          documentId,
+          language: document.documentMeta?.language,
+        }).catch(() => null)
+      : null;
 
   const newDataId = await io.runTask('decorate-and-sign-pdf', async () => {
     const pdfDoc = await PDFDocument.load(pdfData);
@@ -175,16 +150,6 @@ export const run = async ({
       });
     }
 
-    if (auditLogData) {
-      const auditLog = await PDFDocument.load(auditLogData);
-
-      const auditLogPages = await pdfDoc.copyPages(auditLog, auditLog.getPageIndices());
-
-      auditLogPages.forEach((page) => {
-        pdfDoc.addPage(page);
-      });
-    }
-
     for (const field of fields) {
       if (field.inserted) {
         await insertFieldInPDF(pdfDoc, field);

packages/lib/server-only/admin/get-signing-volume.ts

@@ -1,15 +1,7 @@
-import { kyselyPrisma, sql } from '@documenso/prisma';
+import { prisma } from '@documenso/prisma';
 import { DocumentStatus, SubscriptionStatus } from '@documenso/prisma/client';
 
-export type SigningVolume = {
-  id: number;
-  name: string;
-  signingVolume: number;
-  createdAt: Date;
-  planId: string;
-};
-
-export type GetSigningVolumeOptions = {
+type GetSigningVolumeOptions = {
   search?: string;
   page?: number;
   perPage?: number;
@@ -17,85 +9,187 @@ export type GetSigningVolumeOptions = {
   sortOrder?: 'asc' | 'desc';
 };
 
-export async function getSigningVolume({
+export const getSigningVolume = async ({
   search = '',
   page = 1,
   perPage = 10,
   sortBy = 'signingVolume',
   sortOrder = 'desc',
-}: GetSigningVolumeOptions) {
-  const offset = Math.max(page - 1, 0) * perPage;
+}: GetSigningVolumeOptions) => {
+  const validPage = Math.max(1, page);
+  const validPerPage = Math.max(1, perPage);
+  const skip = (validPage - 1) * validPerPage;
 
-  let findQuery = kyselyPrisma.$kysely
-    .selectFrom('Subscription as s')
-    .leftJoin('User as u', 's.userId', 'u.id')
-    .leftJoin('Team as t', 's.teamId', 't.id')
-    .leftJoin('Document as ud', (join) =>
-      join
-        .onRef('u.id', '=', 'ud.userId')
-        .on('ud.status', '=', sql.lit(DocumentStatus.COMPLETED))
-        .on('ud.deletedAt', 'is', null)
-        .on('ud.teamId', 'is', null),
-    )
-    .leftJoin('Document as td', (join) =>
-      join
-        .onRef('t.id', '=', 'td.teamId')
-        .on('td.status', '=', sql.lit(DocumentStatus.COMPLETED))
-        .on('td.deletedAt', 'is', null),
-    )
-    // @ts-expect-error - Raw SQL enum casting not properly typed by Kysely
-    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
-    .where((eb) =>
-      eb.or([
-        eb('u.name', 'ilike', `%${search}%`),
-        eb('u.email', 'ilike', `%${search}%`),
-        eb('t.name', 'ilike', `%${search}%`),
-      ]),
-    )
-    .select([
-      's.id as id',
-      's.createdAt as createdAt',
-      's.planId as planId',
-      sql<string>`COALESCE(u.name, t.name, u.email, 'Unknown')`.as('name'),
-      sql<number>`COUNT(DISTINCT ud.id) + COUNT(DISTINCT td.id)`.as('signingVolume'),
-    ])
-    .groupBy(['s.id', 'u.name', 't.name', 'u.email']);
+  const activeSubscriptions = await prisma.subscription.findMany({
+    where: {
+      status: SubscriptionStatus.ACTIVE,
+    },
+    select: {
+      id: true,
+      planId: true,
+      userId: true,
+      teamId: true,
+      createdAt: true,
+      user: {
+        select: {
+          id: true,
+          name: true,
+          email: true,
+          createdAt: true,
+        },
+      },
+      team: {
+        select: {
+          id: true,
+          name: true,
+          teamEmail: {
+            select: {
+              email: true,
+            },
+          },
+          createdAt: true,
+        },
+      },
+    },
+  });
 
-  switch (sortBy) {
-    case 'name':
-      findQuery = findQuery.orderBy('name', sortOrder);
-      break;
-    case 'createdAt':
-      findQuery = findQuery.orderBy('createdAt', sortOrder);
-      break;
-    case 'signingVolume':
-      findQuery = findQuery.orderBy('signingVolume', sortOrder);
-      break;
-    default:
-      findQuery = findQuery.orderBy('signingVolume', 'desc');
-  }
+  const userSubscriptionsMap = new Map();
+  const teamSubscriptionsMap = new Map();
 
-  findQuery = findQuery.limit(perPage).offset(offset);
+  activeSubscriptions.forEach((subscription) => {
+    const isTeam = !!subscription.teamId;
 
-  const countQuery = kyselyPrisma.$kysely
-    .selectFrom('Subscription as s')
-    .leftJoin('User as u', 's.userId', 'u.id')
-    .leftJoin('Team as t', 's.teamId', 't.id')
-    // @ts-expect-error - Raw SQL enum casting not properly typed by Kysely
-    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
-    .where((eb) =>
-      eb.or([
-        eb('u.name', 'ilike', `%${search}%`),
-        eb('u.email', 'ilike', `%${search}%`),
-        eb('t.name', 'ilike', `%${search}%`),
-      ]),
-    )
-    .select(({ fn }) => [fn.countAll().as('count')]);
+    if (isTeam && subscription.teamId) {
+      if (!teamSubscriptionsMap.has(subscription.teamId)) {
+        teamSubscriptionsMap.set(subscription.teamId, {
+          id: subscription.id,
+          planId: subscription.planId,
+          teamId: subscription.teamId,
+          name: subscription.team?.name || '',
+          email: subscription.team?.teamEmail?.email || `Team ${subscription.team?.id}`,
+          createdAt: subscription.team?.createdAt,
+          isTeam: true,
+          subscriptionIds: [subscription.id],
+        });
+      } else {
+        const existingTeam = teamSubscriptionsMap.get(subscription.teamId);
+        existingTeam.subscriptionIds.push(subscription.id);
+      }
+    } else if (subscription.userId) {
+      if (!userSubscriptionsMap.has(subscription.userId)) {
+        userSubscriptionsMap.set(subscription.userId, {
+          id: subscription.id,
+          planId: subscription.planId,
+          userId: subscription.userId,
+          name: subscription.user?.name || '',
+          email: subscription.user?.email || '',
+          createdAt: subscription.user?.createdAt,
+          isTeam: false,
+          subscriptionIds: [subscription.id],
+        });
+      } else {
+        const existingUser = userSubscriptionsMap.get(subscription.userId);
+        existingUser.subscriptionIds.push(subscription.id);
+      }
+    }
+  });
 
-  const [results, [{ count }]] = await Promise.all([findQuery.execute(), countQuery.execute()]);
+  const subscriptions = [
+    ...Array.from(userSubscriptionsMap.values()),
+    ...Array.from(teamSubscriptionsMap.values()),
+  ];
+
+  const filteredSubscriptions = search
+    ? subscriptions.filter((sub) => {
+        const searchLower = search.toLowerCase();
+        return (
+          sub.name?.toLowerCase().includes(searchLower) ||
+          sub.email?.toLowerCase().includes(searchLower)
+        );
+      })
+    : subscriptions;
+
+  const signingVolume = await Promise.all(
+    filteredSubscriptions.map(async (subscription) => {
+      let signingVolume = 0;
+
+      if (subscription.userId && !subscription.isTeam) {
+        const personalCount = await prisma.document.count({
+          where: {
+            userId: subscription.userId,
+            status: DocumentStatus.COMPLETED,
+            teamId: null,
+          },
+        });
+
+        signingVolume += personalCount;
+
+        const userTeams = await prisma.teamMember.findMany({
+          where: {
+            userId: subscription.userId,
+          },
+          select: {
+            teamId: true,
+          },
+        });
+
+        if (userTeams.length > 0) {
+          const teamIds = userTeams.map((team) => team.teamId);
+          const teamCount = await prisma.document.count({
+            where: {
+              teamId: {
+                in: teamIds,
+              },
+              status: DocumentStatus.COMPLETED,
+            },
+          });
+
+          signingVolume += teamCount;
+        }
+      }
+
+      if (subscription.teamId) {
+        const teamCount = await prisma.document.count({
+          where: {
+            teamId: subscription.teamId,
+            status: DocumentStatus.COMPLETED,
+          },
+        });
+
+        signingVolume += teamCount;
+      }
+
+      return {
+        ...subscription,
+        signingVolume,
+      };
+    }),
+  );
+
+  const sortedResults = [...signingVolume].sort((a, b) => {
+    if (sortBy === 'name') {
+      return sortOrder === 'asc'
+        ? (a.name || '').localeCompare(b.name || '')
+        : (b.name || '').localeCompare(a.name || '');
+    }
+
+    if (sortBy === 'createdAt') {
+      const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+      const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
+      return sortOrder === 'asc' ? dateA - dateB : dateB - dateA;
+    }
+
+    return sortOrder === 'asc'
+      ? a.signingVolume - b.signingVolume
+      : b.signingVolume - a.signingVolume;
+  });
+
+  const paginatedResults = sortedResults.slice(skip, skip + validPerPage);
+
+  const totalPages = Math.ceil(sortedResults.length / validPerPage);
 
   return {
-    leaderboard: results,
-    totalPages: Math.ceil(Number(count) / perPage),
+    leaderboard: paginatedResults,
+    totalPages,
   };
-}
+};

packages/lib/server-only/document/complete-document-with-token.ts

@@ -12,7 +12,6 @@ import {
   WebhookTriggerEvents,
 } from '@documenso/prisma/client';
 
-import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import type { TRecipientActionAuth } from '../../types/document-auth';
 import {
@@ -73,13 +72,6 @@ export const completeDocumentWithToken = async ({
     throw new Error(`Recipient ${recipient.id} has already signed`);
   }
 
-  if (recipient.signingStatus === SigningStatus.REJECTED) {
-    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
-      message: 'Recipient has already rejected the document',
-      statusCode: 400,
-    });
-  }
-
   if (document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
     const isRecipientsTurn = await getIsRecipientsTurnToSign({ token: recipient.token });
 

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

@@ -124,8 +124,6 @@ export const createDocument = async ({
           team?.teamGlobalSettings?.documentVisibility,
           userTeamRole ?? TeamMemberRole.MEMBER,
         ),
-        includeSigningCertificate: team?.teamGlobalSettings?.includeSigningCertificate ?? true,
-        includeAuditTrailLog: team?.teamGlobalSettings?.includeAuditTrailLog ?? true,
         formValues,
         source: DocumentSource.DOCUMENT,
         documentMeta: {

packages/lib/server-only/document/seal-document.ts

@@ -22,7 +22,6 @@ import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFile } from '../../universal/upload/get-file';
 import { putPdfFile } from '../../universal/upload/put-file';
 import { fieldsContainUnsignedRequiredField } from '../../utils/advanced-fields-helpers';
-import { getAuditLogsPdf } from '../htmltopdf/get-audit-logs-pdf';
 import { getCertificatePdf } from '../htmltopdf/get-certificate-pdf';
 import { flattenAnnotations } from '../pdf/flatten-annotations';
 import { flattenForm } from '../pdf/flatten-form';
@@ -62,7 +61,6 @@ export const sealDocument = async ({
           teamGlobalSettings: {
             select: {
               includeSigningCertificate: true,
-              includeAuditTrailLog: true,
             },
           },
         },
@@ -111,36 +109,13 @@ export const sealDocument = async ({
   // !: Need to write the fields onto the document as a hard copy
   const pdfData = await getFile(documentData);
 
-  let includeSigningCertificate;
-
-  if (document.teamId) {
-    includeSigningCertificate =
-      document.team?.teamGlobalSettings?.includeSigningCertificate ?? true;
-  } else {
-    includeSigningCertificate = document.includeSigningCertificate ?? true;
-  }
-
-  const certificateData = includeSigningCertificate
-    ? await getCertificatePdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch(() => null)
-    : null;
-
-  let includeAuditTrailLog;
-
-  if (document.teamId) {
-    includeAuditTrailLog = document.team?.teamGlobalSettings?.includeAuditTrailLog ?? true;
-  } else {
-    includeAuditTrailLog = document.includeAuditTrailLog ?? true;
-  }
-
-  const auditLogData = includeAuditTrailLog
-    ? await getAuditLogsPdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch(() => null)
-    : null;
+  const certificateData =
+    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
+      ? await getCertificatePdf({
+          documentId,
+          language: document.documentMeta?.language,
+        }).catch(() => null)
+      : null;
 
   const doc = await PDFDocument.load(pdfData);
 
@@ -159,16 +134,6 @@ export const sealDocument = async ({
     });
   }
 
-  if (auditLogData) {
-    const auditLog = await PDFDocument.load(auditLogData);
-
-    const auditLogPages = await doc.copyPages(auditLog, auditLog.getPageIndices());
-
-    auditLogPages.forEach((page) => {
-      doc.addPage(page);
-    });
-  }
-
   for (const field of fields) {
     await insertFieldInPDF(doc, field);
   }

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

@@ -21,8 +21,6 @@ export type UpdateDocumentOptions = {
     title?: string;
     externalId?: string | null;
     visibility?: DocumentVisibility | null;
-    includeSigningCertificate?: boolean;
-    includeAuditTrailLog?: boolean;
     globalAccessAuth?: TDocumentAccessAuthTypes | null;
     globalActionAuth?: TDocumentActionAuthTypes | null;
   };
@@ -158,12 +156,6 @@ export const updateDocument = async ({
     documentGlobalActionAuth === undefined || documentGlobalActionAuth === newGlobalActionAuth;
   const isDocumentVisibilitySame =
     data.visibility === undefined || data.visibility === document.visibility;
-  const isIncludeSigningCertificateSame =
-    data.includeSigningCertificate === undefined ||
-    data.includeSigningCertificate === document.includeSigningCertificate;
-  const isIncludeAuditTrailLogSame =
-    data.includeAuditTrailLog === undefined ||
-    data.includeAuditTrailLog === document.includeAuditTrailLog;
 
   const auditLogs: CreateDocumentAuditLogDataResponse[] = [];
 
@@ -243,34 +235,6 @@ export const updateDocument = async ({
     );
   }
 
-  if (!isIncludeSigningCertificateSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: String(document.includeSigningCertificate),
-          to: String(data.includeSigningCertificate || false),
-        },
-      }),
-    );
-  }
-
-  if (!isIncludeAuditTrailLogSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: String(document.includeAuditTrailLog),
-          to: String(data.includeAuditTrailLog || false),
-        },
-      }),
-    );
-  }
-
   // Early return if nothing is required.
   if (auditLogs.length === 0) {
     return document;
@@ -290,8 +254,6 @@ export const updateDocument = async ({
         title: data.title,
         externalId: data.externalId,
         visibility: data.visibility as DocumentVisibility,
-        includeSigningCertificate: data.includeSigningCertificate,
-        includeAuditTrailLog: data.includeAuditTrailLog,
         authOptions,
       },
     });

packages/lib/server-only/htmltopdf/get-audit-logs-pdf.ts

@@ -1,74 +0,0 @@
-import { DateTime } from 'luxon';
-import type { Browser } from 'playwright';
-
-import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
-import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
-import { encryptSecondaryData } from '../crypto/encrypt';
-
-export type GetAuditLogsPdfParams = {
-  documentId: number;
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  language?: SupportedLanguageCodes | (string & {});
-};
-
-export const getAuditLogsPdf = async ({ documentId, language }: GetAuditLogsPdfParams) => {
-  const { chromium } = await import('playwright');
-
-  const encryptedId = encryptSecondaryData({
-    data: documentId.toString(),
-    expiresAt: DateTime.now().plus({ minutes: 5 }).toJSDate().valueOf(),
-  });
-
-  let browser: Browser;
-
-  if (process.env.NEXT_PRIVATE_BROWSERLESS_URL) {
-    // !: Use CDP rather than the default `connect` method to avoid coupling to the playwright version.
-    // !: Previously we would have to keep the playwright version in sync with the browserless version to avoid errors.
-    browser = await chromium.connectOverCDP(process.env.NEXT_PRIVATE_BROWSERLESS_URL);
-  } else {
-    browser = await chromium.launch();
-  }
-
-  if (!browser) {
-    throw new Error(
-      'Failed to establish a browser, please ensure you have either a Browserless.io url or chromium browser installed',
-    );
-  }
-
-  const browserContext = await browser.newContext();
-
-  const page = await browserContext.newPage();
-
-  const lang = isValidLanguageCode(language) ? language : 'en';
-
-  await page.context().addCookies([
-    {
-      name: 'language',
-      value: lang,
-      url: NEXT_PUBLIC_WEBAPP_URL(),
-    },
-  ]);
-
-  try {
-    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/audit-log?d=${encryptedId}`, {
-      waitUntil: 'networkidle',
-      timeout: 10_000,
-    });
-
-    const result = await page.pdf({
-      format: 'A4',
-    });
-
-    await browserContext.close();
-
-    void browser.close();
-
-    return result;
-  } catch (error) {
-    await browserContext.close();
-
-    void browser.close();
-
-    throw error;
-  }
-};

packages/lib/server-only/team/update-team-document-settings.ts

@@ -17,7 +17,6 @@ export type UpdateTeamDocumentSettingsOptions = {
     includeSenderDetails: boolean;
     typedSignatureEnabled: boolean;
     includeSigningCertificate: boolean;
-    includeAuditTrailLog: boolean;
   };
 };
 
@@ -37,7 +36,6 @@ export const updateTeamDocumentSettings = async ({
     documentLanguage,
     includeSenderDetails,
     includeSigningCertificate,
-    includeAuditTrailLog,
     typedSignatureEnabled,
   } = settings;
 
@@ -63,7 +61,6 @@ export const updateTeamDocumentSettings = async ({
       includeSenderDetails,
       typedSignatureEnabled,
       includeSigningCertificate,
-      includeAuditTrailLog,
     },
     update: {
       documentVisibility,
@@ -71,7 +68,6 @@ export const updateTeamDocumentSettings = async ({
       includeSenderDetails,
       typedSignatureEnabled,
       includeSigningCertificate,
-      includeAuditTrailLog,
     },
   });
 };

packages/lib/types/document-audit-logs.ts

@@ -29,9 +29,7 @@ export const ZDocumentAuditLogTypeSchema = z.enum([
   'DOCUMENT_FIELD_INSERTED', // When a field is inserted (signed/approved/etc) by a recipient.
   'DOCUMENT_FIELD_UNINSERTED', // When a field is uninserted by a recipient.
   'DOCUMENT_FIELD_PREFILLED', // When a field is prefilled by an assistant.
-  'DOCUMENT_VISIBILITY_UPDATED', // When the document visibility scope is updated.
-  'DOCUMENT_SIGNING_CERTIFICATE_UPDATED', // When the include signing certificate is updated.
-  'DOCUMENT_AUDIT_TRAIL_UPDATED', // When the include audit trail is updated.
+  'DOCUMENT_VISIBILITY_UPDATED', // When the document visibility scope is updated
   'DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED', // When the global access authentication is updated.
   'DOCUMENT_GLOBAL_AUTH_ACTION_UPDATED', // When the global action authentication is updated.
   'DOCUMENT_META_UPDATED', // When the document meta data is updated.
@@ -399,16 +397,6 @@ export const ZDocumentAuditLogEventDocumentVisibilitySchema = z.object({
   data: ZGenericFromToSchema,
 });
 
-export const ZDocumentAuditLogEventDocumentSigningCertificateUpdatedSchema = z.object({
-  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED),
-  data: ZGenericFromToSchema,
-});
-
-export const ZDocumentAuditLogEventDocumentAuditTrailUpdatedSchema = z.object({
-  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED),
-  data: ZGenericFromToSchema,
-});
-
 /**
  * Event: Document global authentication access updated.
  */
@@ -586,8 +574,6 @@ export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and(
     ZDocumentAuditLogEventDocumentFieldUninsertedSchema,
     ZDocumentAuditLogEventDocumentFieldPrefilledSchema,
     ZDocumentAuditLogEventDocumentVisibilitySchema,
-    ZDocumentAuditLogEventDocumentSigningCertificateUpdatedSchema,
-    ZDocumentAuditLogEventDocumentAuditTrailUpdatedSchema,
     ZDocumentAuditLogEventDocumentGlobalAuthAccessUpdatedSchema,
     ZDocumentAuditLogEventDocumentGlobalAuthActionUpdatedSchema,
     ZDocumentAuditLogEventDocumentMetaUpdatedSchema,

packages/lib/types/document.ts

@@ -18,8 +18,6 @@ import { ZRecipientLiteSchema } from './recipient';
  */
 export const ZDocumentSchema = DocumentSchema.pick({
   visibility: true,
-  includeSigningCertificate: true,
-  includeAuditTrailLog: true,
   status: true,
   source: true,
   id: true,
@@ -84,8 +82,6 @@ export const ZDocumentLiteSchema = DocumentSchema.pick({
   deletedAt: true,
   teamId: true,
   templateId: true,
-  includeSigningCertificate: true,
-  includeAuditTrailLog: true,
 });
 
 /**
@@ -108,8 +104,6 @@ export const ZDocumentManySchema = DocumentSchema.pick({
   deletedAt: true,
   teamId: true,
   templateId: true,
-  includeSigningCertificate: true,
-  includeAuditTrailLog: true,
 }).extend({
   user: UserSchema.pick({
     id: true,

packages/lib/utils/document-audit-logs.ts

@@ -322,14 +322,6 @@ export const formatDocumentAuditLogAction = (
       anonymous: msg`Document visibility updated`,
       identified: msg`${prefix} updated the document visibility`,
     }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED }, () => ({
-      anonymous: msg`Document signing certificate updated`,
-      identified: msg`${prefix} updated the document signing certificate`,
-    }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED }, () => ({
-      anonymous: msg`Document audit trail updated`,
-      identified: msg`${prefix} updated the document audit trail`,
-    }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED }, () => ({
       anonymous: msg`Document access auth updated`,
       identified: msg`${prefix} updated the document access auth requirements`,

packages/prisma/migrations/20250217090902_add_audit_trail_log_team_preferences/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "TeamGlobalSettings" ADD COLUMN     "includeAuditTrailLog" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/migrations/20250219075352_add_document_properties/migration.sql

@@ -1,3 +0,0 @@
--- AlterTable
-ALTER TABLE "Document" ADD COLUMN     "includeAuditTrail" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "includeSigningCertificate" BOOLEAN NOT NULL DEFAULT true;

packages/prisma/migrations/20250219100115_update_property_name/migration.sql

@@ -1,9 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `includeAuditTrail` on the `Document` table. All the data in the column will be lost.
-
-*/
--- AlterTable
-ALTER TABLE "Document" DROP COLUMN "includeAuditTrail",
-ADD COLUMN     "includeAuditTrailLog" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/schema.prisma

@@ -311,32 +311,30 @@ enum DocumentVisibility {
 
 /// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';", "import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';"])
 model Document {
-  id                        Int                 @id @default(autoincrement())
-  externalId                String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
-  userId                    Int /// @zod.number.describe("The ID of the user that created this document.")
-  user                      User                @relation(fields: [userId], references: [id], onDelete: Cascade)
-  authOptions               Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
-  formValues                Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
-  visibility                DocumentVisibility  @default(EVERYONE)
-  includeSigningCertificate Boolean             @default(true)
-  includeAuditTrailLog      Boolean             @default(false)
-  title                     String
-  status                    DocumentStatus      @default(DRAFT)
-  recipients                Recipient[]
-  fields                    Field[]
-  shareLinks                DocumentShareLink[]
-  documentDataId            String
-  documentData              DocumentData        @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
-  documentMeta              DocumentMeta?
-  createdAt                 DateTime            @default(now())
-  updatedAt                 DateTime            @default(now()) @updatedAt
-  completedAt               DateTime?
-  deletedAt                 DateTime?
-  teamId                    Int?
-  team                      Team?               @relation(fields: [teamId], references: [id])
-  templateId                Int?
-  template                  Template?           @relation(fields: [templateId], references: [id], onDelete: SetNull)
-  source                    DocumentSource
+  id             Int                 @id @default(autoincrement())
+  externalId     String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
+  userId         Int /// @zod.number.describe("The ID of the user that created this document.")
+  user           User                @relation(fields: [userId], references: [id], onDelete: Cascade)
+  authOptions    Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
+  formValues     Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
+  visibility     DocumentVisibility  @default(EVERYONE)
+  title          String
+  status         DocumentStatus      @default(DRAFT)
+  recipients     Recipient[]
+  fields         Field[]
+  shareLinks     DocumentShareLink[]
+  documentDataId String
+  documentData   DocumentData        @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
+  documentMeta   DocumentMeta?
+  createdAt      DateTime            @default(now())
+  updatedAt      DateTime            @default(now()) @updatedAt
+  completedAt    DateTime?
+  deletedAt      DateTime?
+  teamId         Int?
+  team           Team?               @relation(fields: [teamId], references: [id])
+  templateId     Int?
+  template       Template?           @relation(fields: [templateId], references: [id], onDelete: SetNull)
+  source         DocumentSource
 
   auditLogs DocumentAuditLog[]
 
@@ -545,7 +543,6 @@ model TeamGlobalSettings {
   includeSenderDetails      Boolean            @default(true)
   typedSignatureEnabled     Boolean            @default(true)
   includeSigningCertificate Boolean            @default(true)
-  includeAuditTrailLog      Boolean            @default(false)
 
   brandingEnabled        Boolean @default(false)
   brandingLogo           String  @default("")

packages/trpc/server/document-router/router.ts

@@ -65,7 +65,7 @@ export const documentRouter = router({
     .input(ZGetDocumentByIdQuerySchema)
     .query(async ({ input, ctx }) => {
       const { teamId } = ctx;
-      const { documentId, includeCertificate, includeAuditLog } = input;
+      const { documentId } = input;
 
       return await getDocumentById({
         userId: ctx.user.id,

packages/trpc/server/document-router/schema.ts

@@ -63,16 +63,6 @@ export const ZDocumentVisibilitySchema = z
   .nativeEnum(DocumentVisibility)
   .describe('The visibility of the document.');
 
-export const ZDocumentIncludeSigningCertificateSchema = z
-  .boolean()
-  .default(true)
-  .describe('Whether to include a signing certificate in the document.');
-
-export const ZDocumentIncludeAuditTrailSchema = z
-  .boolean()
-  .default(true)
-  .describe('Whether to include an audit trail in the document.');
-
 export const ZDocumentMetaTimezoneSchema = z
   .string()
   .describe(
@@ -151,8 +141,6 @@ export const ZFindDocumentAuditLogsQuerySchema = ZFindSearchParamsSchema.extend(
 
 export const ZGetDocumentByIdQuerySchema = z.object({
   documentId: z.number(),
-  includeCertificate: z.boolean().default(true).optional(),
-  includeAuditLog: z.boolean().default(true).optional(),
 });
 
 export const ZDuplicateDocumentRequestSchema = z.object({
@@ -247,8 +235,6 @@ export const ZUpdateDocumentRequestSchema = z.object({
       title: ZDocumentTitleSchema.optional(),
       externalId: ZDocumentExternalIdSchema.nullish(),
       visibility: ZDocumentVisibilitySchema.optional(),
-      includeSigningCertificate: ZDocumentIncludeSigningCertificateSchema.optional(),
-      includeAuditTrailLog: ZDocumentIncludeAuditTrailSchema.optional(),
       globalAccessAuth: ZDocumentAccessAuthTypesSchema.nullish(),
       globalActionAuth: ZDocumentActionAuthTypesSchema.nullish(),
     })

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

@@ -206,7 +206,6 @@ export const ZUpdateTeamDocumentSettingsMutationSchema = z.object({
     includeSenderDetails: z.boolean().optional().default(false),
     typedSignatureEnabled: z.boolean().optional().default(true),
     includeSigningCertificate: z.boolean().optional().default(true),
-    includeAuditTrailLog: z.boolean().optional().default(true),
   }),
 });
 

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

@@ -42,7 +42,6 @@ import {
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 
-import { Checkbox } from '../checkbox';
 import { Combobox } from '../combobox';
 import { Input } from '../input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../select';
@@ -93,8 +92,6 @@ export const AddSettingsFormPartial = ({
       visibility: document.visibility || '',
       globalAccessAuth: documentAuthOption?.globalAccessAuth || undefined,
       globalActionAuth: documentAuthOption?.globalActionAuth || undefined,
-      includeSigningCertificate: document.includeSigningCertificate ?? true,
-      includeAuditTrailLog: document.includeAuditTrailLog ?? true,
       meta: {
         timezone:
           TIME_ZONES.find((timezone) => timezone === document.documentMeta?.timezone) ??
@@ -262,111 +259,6 @@ export const AddSettingsFormPartial = ({
               />
             )}
 
-            <FormField
-              control={form.control}
-              name="globalActionAuth"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel className="flex flex-row items-center">
-                    <Trans>Recipient action authentication</Trans>
-                    <DocumentGlobalAuthActionTooltip />
-                  </FormLabel>
-
-                  <FormControl>
-                    <DocumentGlobalAuthActionSelect {...field} onValueChange={field.onChange} />
-                  </FormControl>
-                </FormItem>
-              )}
-            />
-
-            <Accordion type="multiple" className="mt-6">
-              <AccordionItem value="advanced-options" className="border-none">
-                <AccordionTrigger className="text-foreground mb-2 rounded border px-3 py-2 text-left hover:bg-neutral-200/30 hover:no-underline">
-                  <Trans>Certificates</Trans>
-                </AccordionTrigger>
-
-                <AccordionContent className="text-muted-foreground -mx-1 px-1 pt-2 text-sm leading-relaxed">
-                  <div className="flex flex-col space-y-6">
-                    <FormField
-                      control={form.control}
-                      name="includeSigningCertificate"
-                      render={({ field }) => (
-                        <FormItem>
-                          <div className="flex flex-row items-center gap-4">
-                            <FormControl>
-                              <Checkbox
-                                checked={field.value}
-                                className="h-5 w-5"
-                                onCheckedChange={field.onChange}
-                              />
-                            </FormControl>
-                            <FormLabel className="m-0 flex flex-row items-center">
-                              <Trans>Include signing certificate</Trans>{' '}
-                              <Tooltip>
-                                <TooltipTrigger>
-                                  <InfoIcon className="mx-2 h-4 w-4" />
-                                </TooltipTrigger>
-
-                                <TooltipContent className="text-muted-foreground max-w-xs">
-                                  <Trans>
-                                    Including the signing certificate means that the certificate
-                                    will be attached to the document. You won't be able to remove
-                                    it. <br />
-                                    <br />
-                                    If you don't include it, you can download it individually.
-                                  </Trans>
-                                </TooltipContent>
-                              </Tooltip>
-                            </FormLabel>
-                          </div>
-
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-
-                    <FormField
-                      control={form.control}
-                      name="includeAuditTrailLog"
-                      render={({ field }) => (
-                        <FormItem>
-                          <div className="flex flex-row items-center gap-4">
-                            <FormControl>
-                              <Checkbox
-                                checked={field.value}
-                                className="h-5 w-5"
-                                onCheckedChange={field.onChange}
-                              />
-                            </FormControl>
-                            <FormLabel className="m-0 flex flex-row items-center">
-                              <Trans>Include audit trail</Trans>{' '}
-                              <Tooltip>
-                                <TooltipTrigger>
-                                  <InfoIcon className="mx-2 h-4 w-4" />
-                                </TooltipTrigger>
-
-                                <TooltipContent className="text-muted-foreground max-w-xs">
-                                  <Trans>
-                                    Including the audit trail means that the log of all actions will
-                                    be attached to the document. You won't be able to remove it.{' '}
-                                    <br />
-                                    <br />
-                                    If you don't include it, you can download it individually.
-                                  </Trans>
-                                </TooltipContent>
-                              </Tooltip>
-                            </FormLabel>
-                          </div>
-
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-                  </div>
-                </AccordionContent>
-              </AccordionItem>
-            </Accordion>
-
             {isDocumentEnterprise && (
               <FormField
                 control={form.control}

packages/ui/primitives/document-flow/add-settings.types.ts

@@ -29,8 +29,6 @@ export const ZAddSettingsFormSchema = z.object({
   title: z.string().trim().min(1, { message: "Title can't be empty" }),
   externalId: z.string().optional(),
   visibility: z.nativeEnum(DocumentVisibility).optional(),
-  includeSigningCertificate: z.boolean().default(true).optional(),
-  includeAuditTrailLog: z.boolean().default(true).optional(),
   globalAccessAuth: ZMapNegativeOneToUndefinedSchema.pipe(
     ZDocumentAccessAuthTypesSchema.optional(),
   ),

packages/ui/primitives/split-button.tsx

@@ -1,83 +0,0 @@
-'use client';
-
-import * as React from 'react';
-
-import { ChevronDown } from 'lucide-react';
-
-import { cn } from '../lib/utils';
-import { Button } from './button';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from './dropdown-menu';
-
-const SplitButtonContext = React.createContext<{
-  variant?: React.ComponentProps<typeof Button>['variant'];
-  size?: React.ComponentProps<typeof Button>['size'];
-}>({});
-
-const SplitButton = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement> & {
-    variant?: React.ComponentProps<typeof Button>['variant'];
-    size?: React.ComponentProps<typeof Button>['size'];
-  }
->(({ className, children, variant = 'default', size = 'default', ...props }, ref) => {
-  return (
-    <SplitButtonContext.Provider value={{ variant, size }}>
-      <div ref={ref} className={cn('inline-flex', className)} {...props}>
-        {children}
-      </div>
-    </SplitButtonContext.Provider>
-  );
-});
-SplitButton.displayName = 'SplitButton';
-
-const SplitButtonAction = React.forwardRef<
-  HTMLButtonElement,
-  React.ButtonHTMLAttributes<HTMLButtonElement>
->(({ className, children, ...props }, ref) => {
-  const { variant, size } = React.useContext(SplitButtonContext);
-  return (
-    <Button
-      ref={ref}
-      variant={variant}
-      size={size}
-      className={cn('rounded-r-none border-r-0', className)}
-      {...props}
-    >
-      {children}
-    </Button>
-  );
-});
-SplitButtonAction.displayName = 'SplitButtonAction';
-
-const SplitButtonDropdown = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({ children, ...props }, ref) => {
-    const { variant, size } = React.useContext(SplitButtonContext);
-    return (
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button
-            variant={variant}
-            size={size}
-            className="rounded-l-none px-2 focus-visible:ring-offset-0"
-          >
-            <ChevronDown className="h-4 w-4" />
-            <span className="sr-only">More options</span>
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" {...props} ref={ref}>
-          {children}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    );
-  },
-);
-SplitButtonDropdown.displayName = 'SplitButtonDropdown';
-
-const SplitButtonDropdownItem = DropdownMenuItem;
-
-export { SplitButton, SplitButtonAction, SplitButtonDropdown, SplitButtonDropdownItem };