From 6a47b3a6e5ffe88b7d45d97d1be6101574194263 Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:44:13 +0200
Subject: [PATCH] chore: documents work properly

---
 packages/lib/server-only/field/set-fields-for-document.ts | 7 -------
 packages/trpc/server/field-router/schema.ts               | 2 +-
 packages/ui/primitives/document-flow/add-fields.tsx       | 7 +++++--
 packages/ui/primitives/document-flow/add-fields.types.ts  | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.ts
index ecc0cbd4a..b22eeda21 100644
--- a/packages/lib/server-only/field/set-fields-for-document.ts
+++ b/packages/lib/server-only/field/set-fields-for-document.ts
@@ -209,13 +209,6 @@ export const setFieldsForDocument = async ({
             id: field._persisted?.id ?? -1,
             documentId,
           },
-          include: {
-            recipient: {
-              select: {
-                email: true,
-              },
-            },
-          },
           update: {
             page: field.pageNumber,
             positionX: field.pageX,
diff --git a/packages/trpc/server/field-router/schema.ts b/packages/trpc/server/field-router/schema.ts
index 358e2b6ed..126deae7f 100644
--- a/packages/trpc/server/field-router/schema.ts
+++ b/packages/trpc/server/field-router/schema.ts
@@ -121,7 +121,7 @@ export const ZSetDocumentFieldsRequestSchema = z.object({
       pageY: ZFieldPageYSchema,
       pageWidth: ZFieldWidthSchema,
       pageHeight: ZFieldHeightSchema,
-      fieldMeta: ZFieldMetaSchema.optional(),
+      fieldMeta: ZFieldMetaSchema,
     }),
   ),
 });
diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx
index 987822c4d..8fa5e2b73 100644
--- a/packages/ui/primitives/document-flow/add-fields.tsx
+++ b/packages/ui/primitives/document-flow/add-fields.tsx
@@ -145,7 +145,8 @@ export const AddFieldsFormPartial = ({
         pageWidth: Number(field.width),
         pageHeight: Number(field.height),
         recipientId: field.recipientId,
-        signerEmail: recipients.find((r) => r.id === field.recipientId)?.email || '',
+        signerEmail:
+          recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
         fieldMeta: field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined,
       })),
       typedSignatureEnabled: typedSignatureEnabled ?? false,
@@ -466,12 +467,14 @@ export const AddFieldsFormPartial = ({
           ...copiedField,
           formId: nanoid(12),
           recipientId: selectedSigner?.id ?? copiedField.recipientId,
+          signerEmail: selectedSigner?.email ?? copiedField.signerEmail,
+
           pageX: copiedField.pageX + 3,
           pageY: copiedField.pageY + 3,
         });
       }
     },
-    [append, fieldClipboard, selectedSigner?.id],
+    [append, fieldClipboard, selectedSigner?.id, selectedSigner?.email],
   );
 
   useEffect(() => {
diff --git a/packages/ui/primitives/document-flow/add-fields.types.ts b/packages/ui/primitives/document-flow/add-fields.types.ts
index 8657ca0ce..cff330d57 100644
--- a/packages/ui/primitives/document-flow/add-fields.types.ts
+++ b/packages/ui/primitives/document-flow/add-fields.types.ts
@@ -9,8 +9,8 @@ export const ZAddFieldsFormSchema = z.object({
       formId: z.string().min(1),
       nativeId: z.number().optional(),
       type: z.nativeEnum(FieldType),
+      signerEmail: z.string().min(1),
       recipientId: z.number(),
-      signerEmail: z.string(),
       pageNumber: z.number().min(1),
       pageX: z.number().min(0),
       pageY: z.number().min(0),