Merge pull request #1279 from OpenSignLabs/form-layout

fix: unexpected finish button visible after finish signature in disable otp public signing flow

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -429,7 +429,7 @@ function PdfRequestFiles(props) {
 
         currUserId = getCurrentSigner?.objectId
           ? getCurrentSigner.objectId
-          : contactBookId || "";
+          : signerObjectId || "";
         if (isEnableSubscription) {
           await checkIsSubscribed(
             documentData[0]?.ExtUserPtr?.objectId,
@@ -1013,7 +1013,7 @@ function PdfRequestFiles(props) {
                           receiver_phone: user.Phone,
                           expiry_date: localExpireDate,
                           company_name: orgName,
-                          signing_url: `<a href=${signPdf}>Sign here</a>`
+                          signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
                         };
                         replaceVar = replaceMailVaribles(
                           requestSubject,
@@ -1047,7 +1047,7 @@ function PdfRequestFiles(props) {
                             orgName +
                             "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
                             localExpireDate +
-                            "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+                            "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
                             signPdf +
                             "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
                             senderEmail +
@@ -1517,10 +1517,11 @@ function PdfRequestFiles(props) {
         } else {
           setIsPublicContact(false);
           setIsPublicTemplate(false);
-          setIsLoading({ isLoad: false });
+          setLoading(false);
           setDocumentId(userRes.data?.result?.docId);
           getDocumentDetails(userRes?.data?.result?.docId);
-          contactBookId = userRes?.data?.result?.contactId || "";
+          const contactId = userRes.data.result?.contactId;
+          setSignerObjectId(contactId);
         }
       } else {
         console.log("error in public-sign to create user details");

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -1121,7 +1121,7 @@ function PlaceHolderSign() {
             receiver_phone: signerMail[i]?.Phone || "",
             expiry_date: localExpireDate,
             company_name: orgName,
-            signing_url: `<a href=${signPdf}>Sign here</a>`
+            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
           };
           replaceVar = replaceMailVaribles(
             requestSubject,
@@ -1155,7 +1155,7 @@ function PlaceHolderSign() {
               orgName +
               "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expire on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
               localExpireDate +
-              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
               signPdf +
               "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
               senderEmail +

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -711,7 +711,7 @@ const ReportTable = (props) => {
       receiver_phone: userDetails?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf}>Sign here</a>`
+      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
     };
     const res = replaceMailVaribles(subject, "", variables);
 
@@ -740,7 +740,7 @@ const ReportTable = (props) => {
       receiver_phone: userDetails?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf}>Sign here</a>`
+      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
     };
     const res = replaceMailVaribles("", body, variables);
 
@@ -781,7 +781,7 @@ const ReportTable = (props) => {
       receiver_phone: user?.signerPtr?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc?.ExtUserPtr?.Company || "",
-      signing_url: `<a href=${signPdf}>Sign here</a>`
+      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
     };
 
     const subject =

apps/OpenSignServer/cloud/customRoute/autoReminder.js

@@ -53,7 +53,7 @@ async function sendMail(doc, signer) {
     receiver_phone: signer?.Phone || '',
     expiry_date: localExpireDate,
     company_name: doc?.ExtUserPtr?.Company || '',
-    signing_url: `<a href=${signPdf}>Sign here</a>`,
+    signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
   };
   const mail = replaceMailVaribles(subject, body, variables);
 

apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js

@@ -269,7 +269,7 @@ export default async function createDocumentWithTemplate(request, response) {
                         orgName +
                         "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
                         localExpireDate +
-                        "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+                        "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
                         signPdf +
                         "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
                         sender +

apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js

@@ -325,7 +325,7 @@ export default async function createDocumentwithCoordinate(request, response) {
                     orgName +
                     "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
                     localExpireDate +
-                    "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+                    "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
                     signPdf +
                     "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
                     sender +

apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js

@@ -86,7 +86,7 @@ export default async function resendMail(request, response) {
               orgName +
               "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
               localExpireDate +
-              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
               signPdf +
               "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
               sender +

apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js

@@ -168,7 +168,7 @@ const sendMailToAllSigners = async docId => {
                   receiver_phone: signerMail[i]?.Phone || '',
                   expiry_date: localExpireDate,
                   company_name: orgName,
-                  signing_url: `<a href=${signPdf}>Sign here</a>`,
+                  signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
                 };
                 replaceVar = replaceMailVaribles(requestSubject, htmlReqBody, variables);
               }

apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js

@@ -95,7 +95,7 @@ async function sendMail(document, sessionToken) {
           orgName +
           "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
           localExpireDate +
-          "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+          "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
           signPdf +
           "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
           sender +