fix: cleanup

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx

@@ -5,7 +5,7 @@ import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { FieldType, RecipientRole } from '@prisma/client';
 import { FileTextIcon } from 'lucide-react';
-import { Link, useSearchParams } from 'react-router';
+import { Link } from 'react-router';
 import { isDeepEqual } from 'remeda';
 import { match } from 'ts-pattern';
 
@@ -65,8 +65,6 @@ const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
 };
 
 export const EnvelopeEditorFieldsPage = () => {
-  const [searchParams] = useSearchParams();
-
   const { envelope, editorFields, relativePath } = useCurrentEnvelopeEditor();
 
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
@@ -210,37 +208,6 @@ export const EnvelopeEditorFieldsPage = () => {
               <section>
                 <Separator className="my-4" />
 
-                {searchParams.get('devmode') && (
-                  <>
-                    <div className="px-4">
-                      <h3 className="text-foreground mb-3 text-sm font-semibold">
-                        <Trans>Developer Mode</Trans>
-                      </h3>
-
-                      <div className="bg-muted/50 border-border text-foreground space-y-2 rounded-md border p-3 text-sm">
-                        <p>
-                          <span className="text-muted-foreground min-w-12">Pos X:&nbsp;</span>
-                          {selectedField.positionX.toFixed(2)}
-                        </p>
-                        <p>
-                          <span className="text-muted-foreground min-w-12">Pos Y:&nbsp;</span>
-                          {selectedField.positionY.toFixed(2)}
-                        </p>
-                        <p>
-                          <span className="text-muted-foreground min-w-12">Width:&nbsp;</span>
-                          {selectedField.width.toFixed(2)}
-                        </p>
-                        <p>
-                          <span className="text-muted-foreground min-w-12">Height:&nbsp;</span>
-                          {selectedField.height.toFixed(2)}
-                        </p>
-                      </div>
-                    </div>
-
-                    <Separator className="my-4" />
-                  </>
-                )}
-
                 <div className="[&_label]:text-foreground/70 px-4 [&_label]:text-xs">
                   <h3 className="text-sm font-semibold">
                     {t(FieldSettingsTypeTranslations[selectedField.type])}

apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx

@@ -44,7 +44,7 @@ export default function EnvelopeEditorHeader() {
     <nav className="bg-background border-border w-full border-b px-4 py-3 md:px-6">
       <div className="flex items-center justify-between">
         <div className="flex items-center space-x-4">
-          <Link to="/">
+          <Link to={relativePath.basePath}>
             <BrandingLogo className="h-6 w-auto" />
           </Link>
           <Separator orientation="vertical" className="h-6" />

apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx

@@ -22,12 +22,14 @@ import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounce
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isTemplateRecipientEmailPlaceholder } from '@documenso/lib/constants/template';
 import {
   ZRecipientActionAuthTypesSchema,
   ZRecipientAuthOptionsSchema,
 } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
 import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
+import { generateRecipientPlaceholder } from '@documenso/lib/utils/templates';
 import { trpc } from '@documenso/trpc/react';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import { RecipientActionAuthSelect } from '@documenso/ui/components/recipient/recipient-action-auth-select';
@@ -82,7 +84,8 @@ const ZEnvelopeRecipientsForm = z.object({
 type TEnvelopeRecipientsForm = z.infer<typeof ZEnvelopeRecipientsForm>;
 
 export const EnvelopeEditorRecipientForm = () => {
-  const { envelope, setRecipientsDebounced, updateEnvelope } = useCurrentEnvelopeEditor();
+  const { envelope, setRecipientsDebounced, updateEnvelope, isTemplate } =
+    useCurrentEnvelopeEditor();
 
   const organisation = useCurrentOrganisation();
 
@@ -119,6 +122,7 @@ export const EnvelopeEditorRecipientForm = () => {
       role: RecipientRole.SIGNER,
       signingOrder: 1,
       actionAuth: [],
+      ...(isTemplate ? generateRecipientPlaceholder(1) : {}),
     },
   ];
 
@@ -234,6 +238,8 @@ export const EnvelopeEditorRecipientForm = () => {
   };
 
   const onAddSigner = () => {
+    const placeholderRecipientCount = signers.length > 1 ? signers.length + 1 : 2;
+
     appendSigner({
       formId: nanoid(12),
       name: '',
@@ -241,7 +247,10 @@ export const EnvelopeEditorRecipientForm = () => {
       role: RecipientRole.SIGNER,
       actionAuth: [],
       signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
+      ...(isTemplate ? generateRecipientPlaceholder(placeholderRecipientCount) : {}),
     });
+
+    void form.trigger('signers');
   };
 
   const onRemoveSigner = (index: number) => {
@@ -806,7 +815,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                       })}
                                     >
                                       {!showAdvancedSettings && index === 0 && (
-                                        <FormLabel required>
+                                        <FormLabel required={!isTemplate}>
                                           <Trans>Email</Trans>
                                         </FormLabel>
                                       )}
@@ -815,7 +824,12 @@ export const EnvelopeEditorRecipientForm = () => {
                                         <RecipientAutoCompleteInput
                                           type="email"
                                           placeholder={t`Email`}
-                                          value={field.value}
+                                          value={
+                                            isTemplate &&
+                                            isTemplateRecipientEmailPlaceholder(field.value)
+                                              ? ''
+                                              : field.value
+                                          }
                                           disabled={
                                             snapshot.isDragging ||
                                             isSubmitting ||

apps/remix/package.json

@@ -106,5 +106,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "2.0.13"
+  "version": "2.0.12"
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "2.0.13",
+  "version": "2.0.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "2.0.13",
+      "version": "2.0.12",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -101,7 +101,7 @@
     },
     "apps/remix": {
       "name": "@documenso/remix",
-      "version": "2.0.13",
+      "version": "2.0.12",
       "dependencies": {
         "@cantoo/pdf-lib": "^2.5.2",
         "@documenso/api": "*",

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "2.0.13",
+  "version": "2.0.12",
   "scripts": {
     "build": "turbo run build",
     "dev": "turbo run dev --filter=@documenso/remix",

packages/lib/constants/i18n.ts

@@ -1,16 +1,6 @@
 import { z } from 'zod';
 
-export const SUPPORTED_LANGUAGE_CODES = [
-  'de',
-  'en',
-  'fr',
-  'es',
-  'it',
-  'pl',
-  'ja',
-  'ko',
-  'zh',
-] as const;
+export const SUPPORTED_LANGUAGE_CODES = ['de', 'en', 'fr', 'es', 'it', 'pl'] as const;
 
 export const ZSupportedLanguageCodeSchema = z.enum(SUPPORTED_LANGUAGE_CODES).catch('en');
 
@@ -64,18 +54,6 @@ export const SUPPORTED_LANGUAGES: Record<string, SupportedLanguage> = {
     short: 'pl',
     full: 'Polish',
   },
-  ja: {
-    short: 'ja',
-    full: 'Japanese',
-  },
-  ko: {
-    short: 'ko',
-    full: 'Korean',
-  },
-  zh: {
-    short: 'zh',
-    full: 'Chinese',
-  },
 } satisfies Record<SupportedLanguageCodes, SupportedLanguage>;
 
 export const isValidLanguageCode = (code: unknown): code is SupportedLanguageCodes =>

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

@@ -25,6 +25,7 @@ import { signPdf } from '@documenso/signing';
 
 import { AppError, AppErrorCode } from '../../../errors/app-error';
 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 { addRejectionStampToPdf } from '../../../server-only/pdf/add-rejection-stamp-to-pdf';
@@ -61,7 +62,6 @@ export const run = async ({
 }) => {
   const { documentId, sendEmail = true, isResealing = false, requestMetadata } = payload;
 
-  const { envelopeId, envelopeStatus, isRejected } = await io.runTask('seal-document', async () => {
   const envelope = await prisma.envelope.findFirstOrThrow({
     where: {
       type: EnvelopeType.DOCUMENT,
@@ -102,7 +102,24 @@ export const run = async ({
     });
   }
 
-    let envelopeItems = envelope.envelopeItems;
+  // Seems silly but we need to do this in case the job is re-ran
+  // after it has already run through the update task further below.
+  // eslint-disable-next-line @typescript-eslint/require-await
+  const documentStatus = await io.runTask('get-document-status', async () => {
+    return envelope.status;
+  });
+
+  // This is the same case as above.
+  let envelopeItems = await io.runTask(
+    'get-document-data-id',
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async () => {
+      // eslint-disable-next-line unused-imports/no-unused-vars
+      return envelope.envelopeItems.map(({ field, ...rest }) => ({
+        ...rest,
+      }));
+    },
+  );
 
   if (envelopeItems.length < 1) {
     throw new Error(`Document ${envelope.id} has no envelope items`);
@@ -172,9 +189,44 @@ export const run = async ({
     settings,
   });
 
+  // !: The commented out code is our desired implementation but we're seemingly
+  // !: running into issues with inngest parallelism in production.
+  // !: Until this is resolved we will do this sequentially which is slower but
+  // !: will actually work.
+  // const decoratePromises: Array<Promise<{ oldDocumentDataId: string; newDocumentDataId: string }>> =
+  //   [];
+
+  // for (const envelopeItem of envelopeItems) {
+  //   const task = io.runTask(`decorate-${envelopeItem.id}`, async () => {
+  //     const envelopeItemFields = envelope.envelopeItems.find(
+  //       (item) => item.id === envelopeItem.id,
+  //     )?.field;
+
+  //     if (!envelopeItemFields) {
+  //       throw new Error(`Envelope item fields not found for envelope item ${envelopeItem.id}`);
+  //     }
+
+  //     return decorateAndSignPdf({
+  //       envelope,
+  //       envelopeItem,
+  //       envelopeItemFields,
+  //       isRejected,
+  //       rejectionReason,
+  //       certificateData,
+  //       auditLogData,
+  //     });
+  //   });
+
+  //   decoratePromises.push(task);
+  // }
+
+  // const newDocumentData = await Promise.all(decoratePromises);
+
+  // TODO: Remove once parallelization is working
   const newDocumentData: Array<{ oldDocumentDataId: string; newDocumentDataId: string }> = [];
 
   for (const envelopeItem of envelopeItems) {
+    const result = await io.runTask(`decorate-${envelopeItem.id}`, async () => {
       const envelopeItemFields = envelope.envelopeItems.find(
         (item) => item.id === envelopeItem.id,
       )?.field;
@@ -183,7 +235,7 @@ export const run = async ({
         throw new Error(`Envelope item fields not found for envelope item ${envelopeItem.id}`);
       }
 
-      const result = await decorateAndSignPdf({
+      return decorateAndSignPdf({
         envelope,
         envelopeItem,
         envelopeItemFields,
@@ -192,10 +244,25 @@ export const run = async ({
         certificateData,
         auditLogData,
       });
+    });
 
     newDocumentData.push(result);
   }
 
+  const postHog = PostHogServerClient();
+
+  if (postHog) {
+    postHog.capture({
+      distinctId: nanoid(),
+      event: 'App: Document Sealed',
+      properties: {
+        documentId: envelope.id,
+        isRejected,
+      },
+    });
+  }
+
+  await io.runTask('update-document', async () => {
     await prisma.$transaction(async (tx) => {
       for (const { oldDocumentDataId, newDocumentDataId } of newDocumentData) {
         const newData = await tx.documentData.findFirstOrThrow({
@@ -237,24 +304,18 @@ export const run = async ({
         }),
       });
     });
-
-    return {
-      envelopeId: envelope.id,
-      envelopeStatus: envelope.status,
-      isRejected,
-    };
   });
 
   await io.runTask('send-completed-email', async () => {
     let shouldSendCompletedEmail = sendEmail && !isResealing && !isRejected;
 
-    if (isResealing && !isDocumentCompleted(envelopeStatus)) {
+    if (isResealing && !isDocumentCompleted(envelope.status)) {
       shouldSendCompletedEmail = sendEmail;
     }
 
     if (shouldSendCompletedEmail) {
       await sendCompletedEmail({
-        id: { type: 'envelopeId', id: envelopeId },
+        id: { type: 'envelopeId', id: envelope.id },
         requestMetadata,
       });
     }
@@ -262,7 +323,7 @@ export const run = async ({
 
   const updatedEnvelope = await prisma.envelope.findFirstOrThrow({
     where: {
-      id: envelopeId,
+      id: envelope.id,
     },
     include: {
       documentMeta: true,

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

@@ -31,16 +31,26 @@ export const viewedDocument = async ({
         type: EnvelopeType.DOCUMENT,
       },
     },
+    include: {
+      envelope: {
+        include: {
+          documentMeta: true,
+          recipients: true,
+        },
+      },
+    },
   });
 
   if (!recipient) {
     return;
   }
 
+  const { envelope } = recipient;
+
   await prisma.documentAuditLog.create({
     data: createDocumentAuditLogData({
       type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VIEWED,
-      envelopeId: recipient.envelopeId,
+      envelopeId: envelope.id,
       user: {
         name: recipient.name,
         email: recipient.email,
@@ -76,7 +86,7 @@ export const viewedDocument = async ({
     await tx.documentAuditLog.create({
       data: createDocumentAuditLogData({
         type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED,
-        envelopeId: recipient.envelopeId,
+        envelopeId: envelope.id,
         user: {
           name: recipient.name,
           email: recipient.email,
@@ -93,16 +103,6 @@ export const viewedDocument = async ({
     });
   });
 
-  const envelope = await prisma.envelope.findUniqueOrThrow({
-    where: {
-      id: recipient.envelopeId,
-    },
-    include: {
-      documentMeta: true,
-      recipients: true,
-    },
-  });
-
   await triggerWebhook({
     event: WebhookTriggerEvents.DOCUMENT_OPENED,
     data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(envelope)),