From e86d4cc71986c965755ef91230949fb0a30ef1c7 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 9 Apr 2023 12:26:48 +0000 Subject: [PATCH 1/5] Disable the edit and add signer button for completed documents --- apps/web/pages/documents.tsx | 1 + apps/web/pages/documents/[id]/recipients.tsx | 156 ++++++++++--------- packages/prisma/seed.ts | 2 +- 3 files changed, 85 insertions(+), 74 deletions(-) diff --git a/apps/web/pages/documents.tsx b/apps/web/pages/documents.tsx index b1ef1fce7..eaad896a5 100644 --- a/apps/web/pages/documents.tsx +++ b/apps/web/pages/documents.tsx @@ -291,6 +291,7 @@ const DocumentsPage: NextPageWithLayout = (props: any) => { event.stopPropagation(); router.push("/documents/" + document.id); }} + disabled={document.status === "COMPLETED"} /> { href={"/api/documents/" + props.document.id}> Download - - + {props.document.status !== DocumentStatus.COMPLETED && ( + <> + + + + )}
@@ -246,7 +252,7 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { + className={`mt-3 inline-block flex-shrink-0 rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800`}> Signed @@ -256,60 +262,64 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { )}
-
- { - if (confirm("Resend this signing request?")) { - setLoading(true); - sendSigningRequests(props.document, [item.id]).finally(() => { - setLoading(false); - }); + {props.document.status !== DocumentStatus.COMPLETED && ( +
+ - Resend - - { - const removedItem = { ...fields }[index]; - remove(index); - deleteRecipient(item)?.catch((err) => { - append(removedItem); - }); - }} - className="group-hover:text-neon-dark group-hover:disabled:text-gray-400" - /> -
+ color="secondary" + className="my-auto mr-4 h-9" + onClick={() => { + if (confirm("Resend this signing request?")) { + setLoading(true); + sendSigningRequests(props.document, [item.id]).finally(() => { + setLoading(false); + }); + } + }}> + Resend +
+ { + const removedItem = { ...fields }[index]; + remove(index); + deleteRecipient(item)?.catch((err) => { + append(removedItem); + }); + }} + className="group-hover:text-neon-dark group-hover:disabled:text-gray-400" + /> +
+ )} ))} - + {props.document.status !== "COMPLETED" && ( + + )} diff --git a/packages/prisma/seed.ts b/packages/prisma/seed.ts index 42812331f..d686e02ac 100644 --- a/packages/prisma/seed.ts +++ b/packages/prisma/seed.ts @@ -24,7 +24,7 @@ async function createUser(userData: { email: string; password: string }) { async function main() { console.info("Start seeding..."); const password = "123456789"; - const email = "example6@documenso.com"; + const email = "example@documenso.com"; const user = await createUser({ email: email, password: await hashPassword(password), From 065efabb392fffb383a8231c980f97bccd877f8d Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 9 Apr 2023 12:29:31 +0000 Subject: [PATCH 2/5] Change wording on completed signers page --- apps/web/pages/documents/[id]/recipients.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/pages/documents/[id]/recipients.tsx b/apps/web/pages/documents/[id]/recipients.tsx index 4807c60eb..d786dc40d 100644 --- a/apps/web/pages/documents/[id]/recipients.tsx +++ b/apps/web/pages/documents/[id]/recipients.tsx @@ -124,7 +124,9 @@ const RecipientsPage: NextPageWithLayout = (props: any) => {

Signers

- The people who will sign the document. + {props.document.status !== DocumentStatus.COMPLETED + ? "The people who will sign the document." + : "The people who signed the document."}

From 0ce66a7957f540d09cfeab51dae987ded9592061 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 9 Apr 2023 12:34:26 +0000 Subject: [PATCH 3/5] Redirect breadcrump link on completed to avoid editing --- apps/web/pages/documents/[id]/recipients.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/pages/documents/[id]/recipients.tsx b/apps/web/pages/documents/[id]/recipients.tsx index d786dc40d..ba86ba642 100644 --- a/apps/web/pages/documents/[id]/recipients.tsx +++ b/apps/web/pages/documents/[id]/recipients.tsx @@ -34,7 +34,10 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { }, { title: props.document.title, - href: NEXT_PUBLIC_WEBAPP_URL + "/documents/" + props.document.id, + href: + props.document.status !== DocumentStatus.COMPLETED + ? NEXT_PUBLIC_WEBAPP_URL + "/documents/" + props.document.id + : NEXT_PUBLIC_WEBAPP_URL + "/documents/" + props.document.id + "/recipients", }, { title: "Recipients", From 2a34cc26c65b52cd76fa301eaf351255afffaae9 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Sun, 9 Apr 2023 12:39:18 +0000 Subject: [PATCH 4/5] Replace empty string with fragments --- apps/web/pages/documents/[id]/recipients.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/web/pages/documents/[id]/recipients.tsx b/apps/web/pages/documents/[id]/recipients.tsx index ba86ba642..bf15aee21 100644 --- a/apps/web/pages/documents/[id]/recipients.tsx +++ b/apps/web/pages/documents/[id]/recipients.tsx @@ -227,7 +227,7 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { Not Sent ) : ( - "" + <> )} {item.sendStatus === "SENT" && item.readStatus !== "OPENED" ? ( @@ -238,7 +238,7 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { ) : ( - "" + <> )} {item.readStatus === "OPENED" && item.signingStatus === "NOT_SIGNED" ? ( @@ -251,19 +251,19 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { ) : ( - "" + <> )} {item.signingStatus === "SIGNED" ? ( + className="mt-3 inline-block flex-shrink-0 rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-800"> Signed ) : ( - "" + <> )} From e4e44b7f22167a4839767b7398aed8f5a53d9782 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Mon, 10 Apr 2023 01:34:20 +0000 Subject: [PATCH 5/5] Replace fragment with null --- apps/web/pages/documents/[id]/recipients.tsx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/web/pages/documents/[id]/recipients.tsx b/apps/web/pages/documents/[id]/recipients.tsx index bf15aee21..fefa9a27a 100644 --- a/apps/web/pages/documents/[id]/recipients.tsx +++ b/apps/web/pages/documents/[id]/recipients.tsx @@ -226,9 +226,7 @@ const RecipientsPage: NextPageWithLayout = (props: any) => { className="mt-3 inline-block flex-shrink-0 rounded-full bg-yellow-200 px-2 py-0.5 text-xs font-medium text-gray-800"> Not Sent - ) : ( - <> - )} + ) : null} {item.sendStatus === "SENT" && item.readStatus !== "OPENED" ? ( { Sent - ) : ( - <> - )} + ) : null} {item.readStatus === "OPENED" && item.signingStatus === "NOT_SIGNED" ? ( { Seen - ) : ( - <> - )} + ) : null} {item.signingStatus === "SIGNED" ? ( { Signed - ) : ( - <> - )} + ) : null} {props.document.status !== DocumentStatus.COMPLETED && (