From 42549e5792e8da7f880f0f6a5396bd596542f09a Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Thu, 18 Apr 2024 12:49:24 +0530 Subject: [PATCH 1/8] fix: encode url parameters --- apps/OpenSign/src/pages/PlanSubscriptions.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/OpenSign/src/pages/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js index 3736b60e5..1eeccd4ab 100644 --- a/apps/OpenSign/src/pages/PlanSubscriptions.js +++ b/apps/OpenSign/src/pages/PlanSubscriptions.js @@ -19,15 +19,22 @@ const PlanSubscriptions = () => { const userDetails = JSON.parse(localStorage.getItem("userDetails")); const name = - userDetails && userDetails.name ? "first_name=" + userDetails.name : ""; + userDetails && userDetails.name + ? "first_name=" + encodeURIComponent(userDetails.name) + : ""; const email = - userDetails && userDetails.email ? "&email=" + userDetails.email : ""; + userDetails && userDetails.email + ? "&email=" + encodeURIComponent(userDetails.email) + : ""; const company = userDetails && userDetails.company - ? "&company_name=" + userDetails.company + ? "&company_name=" + encodeURIComponent(userDetails.company) : ""; const phone = - userDetails && userDetails.phone ? "&mobile=" + userDetails.phone : ""; + userDetails && userDetails.phone + ? "&mobile=" + encodeURIComponent(userDetails.phone) + : ""; + const details = "?shipping_country_code=US&billing_country_code=US&billing_state_code=CA&" + name + From d82da53258f63f34ab6e53d3ef2d8c08b4a71584 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 18 Apr 2024 14:02:33 +0530 Subject: [PATCH 2/8] fix: input number type validation issue with space and fix send mail modal design --- .../src/components/pdf/PlaceholderType.js | 2 +- apps/OpenSign/src/pages/PlaceHolderSign.js | 38 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js index 3db625fb4..b20f6ea2f 100644 --- a/apps/OpenSign/src/components/pdf/PlaceholderType.js +++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js @@ -63,7 +63,7 @@ function PlaceholderType(props) { validateExpression(regexValidation); break; case "number": - regexValidation = /^\d+$/; + regexValidation = /^[0-9\s]*$/; validateExpression(regexValidation); break; case "text": diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index ecd99108a..74f84fb2c 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -987,26 +987,32 @@ function PlaceHolderSign() { return shareLinkList.map((data, ind) => { return (
{copied && Copied} - + {data.signerEmail} -
- + console.log("shared successfully!")} >
@@ -1768,10 +1774,12 @@ function PlaceHolderSign() { )} {!isSubscribe && isEnableSubscription && ( - +
+ +
)}
@@ -1781,7 +1789,7 @@ function PlaceHolderSign() { {isSendAlert.mssg === "confirm" && ( <> -
+
-
{handleShareList()}
+
{handleShareList()}
)}
From 41a025715e7db117340a855ff6c4a333123ab289 Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Thu, 18 Apr 2024 14:14:57 +0530 Subject: [PATCH 3/8] refactor: change widget warning --- apps/OpenSign/src/pages/PlaceHolderSign.js | 2 +- apps/OpenSign/src/pages/TemplatePlaceholder.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 74f84fb2c..9893b1d61 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1695,7 +1695,7 @@ function PlaceHolderSign() { style={{ padding: 20 }} > {isSendAlert.mssg === "sure" ? ( - Please add field for all recipients. + Please add at least one signature field for all recipients. ) : isSendAlert.mssg === textWidget ? (

Please confirm that you have filled the text field.

) : ( diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js index a90bfd600..10237ec96 100644 --- a/apps/OpenSign/src/pages/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -1243,7 +1243,7 @@ const TemplatePlaceholder = () => { handleClose={() => setIsSendAlert(false)} >
-

Please add field for all recipients.

+

Please add at least one signature field for all roles.

Date: Thu, 18 Apr 2024 14:17:28 +0530 Subject: [PATCH 4/8] refactor: change user icon tour message --- apps/OpenSign/src/pages/PlaceHolderSign.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 9893b1d61..e7328ed0d 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1571,7 +1571,7 @@ function PlaceHolderSign() { { selector: '[data-tut="assignSigner"]', content: - " Please assign a new signer to use this icon for the placeholder. ", + " You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour. ", position: "top", style: { fontSize: "13px" } } From 06bcae64befcf6618fc32f20dd1b2c80311fe5f5 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 18 Apr 2024 14:39:32 +0530 Subject: [PATCH 5/8] feat: add tour message on add role button when user try to add widget without add any role --- .../OpenSign/src/pages/TemplatePlaceholder.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js index 10237ec96..23ea05acb 100644 --- a/apps/OpenSign/src/pages/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -145,6 +145,7 @@ const TemplatePlaceholder = () => { const [currWidgetsDetails, setCurrWidgetsDetails] = useState([]); const [isCheckbox, setIsCheckbox] = useState(false); const [widgetName, setWidgetName] = useState(false); + const [isAddRole, setIsAddRole] = useState(false); const senderUser = localStorage.getItem( `Parse/${localStorage.getItem("parseAppId")}/currentUser` @@ -481,9 +482,20 @@ const TemplatePlaceholder = () => { } else { setIsReceipent(false); } + } else { + setIsAddRole(true); } }; + const tourAddRole = [ + { + selector: '[data-tut="reactourAddbtn"]', + content: "You need to add a role before you can add fields for it. ", + position: "top", + style: { fontSize: "13px" } + } + ]; + //function for get pdf page details const pageDetails = async (pdf) => { const load = { @@ -1218,6 +1230,15 @@ const TemplatePlaceholder = () => { closeWithMask={false} /> )} + {isAddRole && ( + setIsAddRole(false)} + steps={tourAddRole} + isOpen={isAddRole} + rounded={5} + closeWithMask={false} + /> + )} {/* this component used to render all pdf pages in left side */} Date: Thu, 18 Apr 2024 15:24:29 +0530 Subject: [PATCH 6/8] fix: change the message to show for user who is not the last signer after signs the document --- apps/OpenSign/src/pages/PdfRequestFiles.js | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 39073a2fd..70a252528 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -593,15 +593,21 @@ function PdfRequestFiles() { setSignedSigners([]); setUnSignedSigners([]); getDocumentDetails(); + const index = pdfDetails?.[0].Signers.findIndex( + (x) => x.Email === jsonSender.email + ); + const newIndex = index + 1; + const user = pdfDetails?.[0].Signers[newIndex]; + if (user) { + setIsCompleted({ + isModal: true, + message: + "You have successfully signed the document. You can download or print a copy of the partially signed document. A copy of the digitally signed document will be sent to the owner over email once it is signed by all signers." + }); + } if (sendInOrder) { - const index = pdfDetails?.[0].Signers.findIndex( - (x) => x.Email === jsonSender.email - ); const requestBody = pdfDetails?.[0]?.RequestBody; const requestSubject = pdfDetails?.[0]?.RequestSubject; - - const newIndex = index + 1; - const user = pdfDetails?.[0].Signers[newIndex]; if (user) { const expireDate = pdfDetails?.[0].ExpiryDate.iso; const newDate = new Date(expireDate); @@ -1207,7 +1213,11 @@ function PdfRequestFiles() { }} >
-

This document has been signed by all Signers.

+

+ {" "} + {isCompleted?.message || + "This document has been signed by all Signers."} +

Date: Thu, 18 Apr 2024 17:20:44 +0530 Subject: [PATCH 7/8] fix: text input validation issue if user not select any validation or free user also --- .../src/components/pdf/PlaceholderType.js | 14 ++++++------- .../src/components/pdf/WidgetNameModal.js | 6 +++--- apps/OpenSign/src/constant/Utils.js | 8 +++---- apps/OpenSign/src/pages/PlaceHolderSign.js | 21 +++++++++++-------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js index b20f6ea2f..15d911251 100644 --- a/apps/OpenSign/src/components/pdf/PlaceholderType.js +++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js @@ -40,7 +40,7 @@ function PlaceholderType(props) { const validateExpression = (regexValidation) => { if (textValue) { let regexObject = regexValidation; - if (props.pos?.options.validation.type === "regex") { + if (props.pos?.options?.validation?.type === "regex") { regexObject = RegexParser(regexValidation); } // new RegExp(regexValidation); @@ -89,11 +89,11 @@ function PlaceholderType(props) { case "number": setValidatePlaceholder("12345"); break; - case textInputWidget: - setValidatePlaceholder("enter text"); + case "text": + setValidatePlaceholder("please enter text"); break; default: - setValidatePlaceholder("enter text"); + setValidatePlaceholder("please enter value"); } } @@ -407,7 +407,7 @@ function PlaceholderType(props) { (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (