The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: recipients with CC role not being editable (#918)
David Nguyen8641884515a9
diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsxindex b7d2cf452..2bd888bb0 100644--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx@@ -114,7 +114,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr<DropdownMenuContent className="w-52" align="start" forceMount><DropdownMenuLabel>Action</DropdownMenuLabel>- {recipient?.role !== RecipientRole.CC && (+ {recipient && recipient?.role !== RecipientRole.CC && (<DropdownMenuItem disabled={!recipient || isComplete} asChild><Link href={`/sign/${recipient?.token}`}>{recipient?.role === RecipientRole.VIEWER && (diff --git a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx b/apps/web/src/app/(signing)/sign/[token]/name-field.tsxindex 6e661e77a..44de2fc36 100644--- a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx@@ -118,7 +118,7 @@ export const NameField = ({ field, recipient }: NameFieldProps) => {<span className="text-muted-foreground">({recipient.email})</span></DialogTitle>- <div className="py-4">+ <div><Label htmlFor="signature">Full Name</Label><Inputdiff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.tsindex ecb45d461..71508a9c5 100644--- a/packages/lib/server-only/field/set-fields-for-document.ts+++ b/packages/lib/server-only/field/set-fields-for-document.ts@@ -46,6 +46,10 @@ export const setFieldsForDocument = async ({throw new Error('Document not found');}+ if (document.completedAt) {+ throw new Error('Document already complete');+ }+const existingFields = await prisma.field.findMany({where: {documentId,diff --git a/packages/lib/server-only/recipient/set-recipients-for-document.ts b/packages/lib/server-only/recipient/set-recipients-for-document.tsindex d42d1d707..82261a446 100644--- a/packages/lib/server-only/recipient/set-recipients-for-document.ts+++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts@@ -44,6 +44,10 @@ export const setRecipientsForDocument = async ({throw new Error('Document not found');}+ if (document.completedAt) {+ throw new Error('Document already complete');+ }+const normalizedRecipients = recipients.map((recipient) => ({...recipient,email: recipient.email.toLowerCase(),@@ -77,8 +81,9 @@ export const setRecipientsForDocument = async ({}).filter((recipient) => {return (- recipient._persisted?.sendStatus !== SendStatus.SENT &&- recipient._persisted?.signingStatus !== SigningStatus.SIGNED+ recipient._persisted?.role === RecipientRole.CC ||+ (recipient._persisted?.sendStatus !== SendStatus.SENT &&+ recipient._persisted?.signingStatus !== SigningStatus.SIGNED));});@@ -96,6 +101,7 @@ export const setRecipientsForDocument = async ({email: recipient.email,role: recipient.role,documentId,+ sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT,signingStatus:recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED,},diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsxindex 9c8db7918..be7d451f7 100644--- a/packages/ui/primitives/document-flow/add-fields.tsx+++ b/packages/ui/primitives/document-flow/add-fields.tsx@@ -304,6 +304,13 @@ export const AddFieldsFormPartial = ({return recipientsByRole;}, [recipients]);+ const recipientsByRoleToDisplay = useMemo(() => {+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions+ return (Object.entries(recipientsByRole) as [RecipientRole, Recipient[]][]).filter(+ ([role]) => role !== RecipientRole.CC && role !== RecipientRole.VIEWER,+ );+ }, [recipientsByRole]);+return (<><DocumentFlowFormContainerHeader@@ -382,13 +389,10 @@ export const AddFieldsFormPartial = ({</span></CommandEmpty>- {Object.entries(recipientsByRole).map(([role, recipients], roleIndex) => (+ {recipientsByRoleToDisplay.map(([role, recipients], roleIndex) => (<CommandGroup key={roleIndex}><div className="text-muted-foreground mb-1 ml-2 mt-2 text-xs font-medium">- {- // eslint-disable-next-line @typescript-eslint/consistent-type-assertions- RECIPIENT_ROLES_DESCRIPTION[role as RecipientRole].roleName- }+ {`${RECIPIENT_ROLES_DESCRIPTION[role].roleName}s`}</div>{recipients.length === 0 && (@@ -403,7 +407,7 @@ export const AddFieldsFormPartial = ({{recipients.map((recipient) => (<CommandItemkey={recipient.id}- className={cn('px-4 last:mb-1 [&:not(:first-child)]:mt-1', {+ className={cn('px-2 last:mb-1 [&:not(:first-child)]:mt-1', {'text-muted-foreground': recipient.sendStatus === SendStatus.SENT,})}onSelect={() => {@@ -413,7 +417,7 @@ export const AddFieldsFormPartial = ({><spanclassName={cn('text-foreground/70 truncate', {- 'text-foreground': recipient === selectedSigner,+ 'text-foreground/80': recipient === selectedSigner,})}>{recipient.name && (diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsxindex 26aedcae7..b1341c6ca 100644--- a/packages/ui/primitives/document-flow/add-signers.tsx+++ b/packages/ui/primitives/document-flow/add-signers.tsx@@ -105,7 +105,10 @@ export const AddSignersFormPartial = ({}return recipients.some(- (recipient) => recipient.id === id && recipient.sendStatus === SendStatus.SENT,+ (recipient) =>+ recipient.id === id &&+ recipient.sendStatus === SendStatus.SENT &&+ recipient.role !== RecipientRole.CC,);};