Merge branch 'main' into feat/public-completed-document-access

packages/lib/universal/field-renderer/field-generic-items.ts

@@ -2,7 +2,7 @@ import Konva from 'konva';
 
 import {
   DEFAULT_RECT_BACKGROUND,
-  RECIPIENT_COLOR_STYLES,
+  getRecipientColorStyles,
 } from '@documenso/ui/lib/recipient-colors';
 
 import type { FieldToRender, RenderFieldElementOptions } from './field-renderer';
@@ -70,7 +70,7 @@ export const upsertFieldRect = (
     width: fieldWidth,
     height: fieldHeight,
     fill: DEFAULT_RECT_BACKGROUND,
-    stroke: color ? RECIPIENT_COLOR_STYLES[color].baseRing : '#e5e7eb',
+    stroke: color ? getRecipientColorStyles(color).baseRing : '#e5e7eb',
     strokeWidth: 2,
     cornerRadius: 2,
     strokeScaleEnabled: false,
@@ -150,7 +150,7 @@ export const createFieldHoverInteraction = ({
     return;
   }
 
-  const hoverColor = RECIPIENT_COLOR_STYLES[options.color].baseRingHover;
+  const hoverColor = getRecipientColorStyles(options.color).baseRingHover;
 
   fieldGroup.on('mouseover', () => {
     const layer = fieldRect.getLayer();

packages/lib/universal/upload/put-file.server.ts

@@ -20,7 +20,7 @@ type File = {
  * Uploads a document file to the appropriate storage location and creates
  * a document data record.
  */
-export const putPdfFileServerSide = async (file: File) => {
+export const putPdfFileServerSide = async (file: File, initialData?: string) => {
   const isEncryptedDocumentsAllowed = false; // Was feature flag.
 
   const arrayBuffer = await file.arrayBuffer();
@@ -41,7 +41,12 @@ export const putPdfFileServerSide = async (file: File) => {
 
   const { type, data } = await putFileServerSide(file);
 
-  return await createDocumentData({ type, data });
+  const createdData = await createDocumentData({ type, data, initialData });
+
+  return {
+    documentData: createdData,
+    filePageCount: pdf.getPageCount(),
+  };
 };
 
 /**