fix: add validation of signature widgetat in quick send flow, update SentToOthers field when document is in inProgress , resolve resend nonexist email issue

Author: raktima-opensignlabs

apps/OpenSign/src/components/BulkSendUi.js

@@ -9,7 +9,22 @@ const BulkSendUi = (props) => {
   const [scrollOnNextUpdate, setScrollOnNextUpdate] = useState(false);
   const [isSubmit, setIsSubmit] = useState(false);
   const [allowedForm, setAllowedForm] = useState(0);
+  const [isSignatureExist, setIsSignatureExist] = useState();
   const allowedSigners = 50;
+  useEffect(() => {
+    signatureExist();
+  }, []);
+
+  //function to check atleast one signature field exist
+  const signatureExist = () => {
+    const getPlaceholder = props.item?.Placeholders;
+    const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
+      placeholderObj?.placeHolder?.some((holder) =>
+        holder?.pos?.some((posItem) => posItem?.type === "signature")
+      )
+    );
+    setIsSignatureExist(checkIsSignatureExistt);
+  };
   useEffect(() => {
     if (scrollOnNextUpdate && formRef.current) {
       formRef.current.scrollIntoView({
@@ -165,65 +180,73 @@ const BulkSendUi = (props) => {
         </div>
       )}
       {props.Placeholders?.length > 0 ? (
-        <>
-          {props.Placeholders?.some((x) => !x.signerObjId) ? (
-            <form onSubmit={handleSubmit}>
-              <div className=" min-h-max max-h-[250px] overflow-y-auto">
-                {forms?.map((form, index) => (
-                  <div
-                    key={form.Id}
-                    className="p-3 rounded-xl border-[1px] border-gray-400 m-4 bg-white text-black grid grid-cols-1 md:grid-cols-2 gap-2 relative"
+        isSignatureExist ? (
+          <>
+            {props.Placeholders?.some((x) => !x.signerObjId) ? (
+              <form onSubmit={handleSubmit}>
+                <div className=" min-h-max max-h-[250px] overflow-y-auto">
+                  {forms?.map((form, index) => (
+                    <div
+                      key={form.Id}
+                      className="p-3 rounded-xl border-[1px] border-gray-400 m-4 bg-white text-black grid grid-cols-1 md:grid-cols-2 gap-2 relative"
+                    >
+                      {form?.fields?.map((field, fieldIndex) => (
+                        <div className="flex flex-col " key={field.fieldId}>
+                          <label>{field.label}</label>
+                          <SuggestionInput
+                            required
+                            type="email"
+                            value={field.value}
+                            index={fieldIndex}
+                            onChange={(signer) =>
+                              handleInputChange(index, signer, fieldIndex)
+                            }
+                          />
+                        </div>
+                      ))}
+                      {forms?.length > 1 && (
+                        <button
+                          onClick={() => handleRemoveForm(index)}
+                          className="absolute right-3 top-1 border border-gray-300 rounded-lg px-2 py-1"
+                        >
+                          <i className="fa-solid fa-trash"></i>
+                        </button>
+                      )}
+                      <div ref={formRef}></div>
+                    </div>
+                  ))}
+                </div>
+                <div className="flex flex-col mx-4 mb-4 gap-3">
+                  <button
+                    onClick={handleAddForm}
+                    className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
                   >
-                    {form?.fields?.map((field, fieldIndex) => (
-                      <div className="flex flex-col " key={field.fieldId}>
-                        <label>{field.label}</label>
-                        <SuggestionInput
-                          required
-                          type="email"
-                          value={field.value}
-                          index={fieldIndex}
-                          onChange={(signer) =>
-                            handleInputChange(index, signer, fieldIndex)
-                          }
-                        />
-                      </div>
-                    ))}
-                    {forms?.length > 1 && (
-                      <button
-                        onClick={() => handleRemoveForm(index)}
-                        className="absolute right-3 top-1 border border-gray-300 rounded-lg px-2 py-1"
-                      >
-                        <i className="fa-solid fa-trash"></i>
-                      </button>
-                    )}
-                    <div ref={formRef}></div>
-                  </div>
-                ))}
-              </div>
-              <div className="flex flex-col mx-4 mb-4 gap-3">
-                <button
-                  onClick={handleAddForm}
-                  className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
-                >
-                  <i className="fa-solid fa-plus"></i> <span>Add new</span>
-                </button>
-                <button
-                  type="submit"
-                  className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
-                >
-                  <i className="fa-solid fa-paper-plane"></i> <span>Send</span>
-                </button>
+                    <i className="fa-solid fa-plus"></i> <span>Add new</span>
+                  </button>
+                  <button
+                    type="submit"
+                    className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
+                  >
+                    <i className="fa-solid fa-paper-plane"></i>{" "}
+                    <span>Send</span>
+                  </button>
+                </div>
+              </form>
+            ) : (
+              <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
+                All roles in this document are currently linked to contacts. To
+                &apos;quick send&apos; copies of this template to multiple
+                signers, please ensure that at least one role is not linked to
+                any contact.
               </div>
-            </form>
-          ) : (
-            <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
-              All roles in this document are currently linked to contacts. To
-              &apos;quick send&apos; copies of this template to multiple
-              signers, please ensure that at least one role is not linked to any
-              contact.
-            </div>
-          )}
-        </>
+            )}
+          </>
+        ) : (
+          <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
+            Please ensure there&#39;s at least one signature widget added for
+            all recipients.
+          </div>
+        )
       ) : (
         <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
           Please add at least one role to this template in order to &apos;quick

apps/OpenSign/src/components/pdf/RenderPdf.js

@@ -206,13 +206,9 @@ function RenderPdf({
   const checkSignedSignes = (data) => {
     let checkSign = [];
     //condition to handle quick send flow and using normal request sign flow
-    if (signedSigners[0]?.Id) {
-      checkSign = signedSigners.filter((sign) => sign.Id === data.Id);
-    } else {
-      checkSign = signedSigners.filter(
-        (sign) => sign.objectId === data.signerObjId
-      );
-    }
+    checkSign = signedSigners.filter(
+      (sign) => sign?.Id === data?.Id || sign?.objectId === data?.signerObjId
+    );
     if (data.signerObjId === signerObjectId) {
       setCurrentSigner(true);
     }

apps/OpenSign/src/constant/Utils.js

@@ -669,6 +669,7 @@ export const createDocument = async (template, placeholders, signerData) => {
       Name: Doc.Name,
       URL: Doc.URL,
       SignedUrl: Doc.SignedUrl,
+      SentToOthers: Doc.SentToOthers,
       Description: Doc.Description,
       Note: Doc.Note,
       Placeholders: placeholdersArr,

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -403,25 +403,34 @@ function PdfRequestFiles() {
 
       let signers = [];
       let unSignedSigner = [];
-      //`emailExist` variable to handle condition for quick send flow and show unsigned signers list
-      const emailExist = documentData[0].Placeholders[0]?.email;
 
+      const placeholdersOrSigners = [];
+      for (const placeholder of documentData[0].Placeholders) {
+        //`emailExist` variable to handle condition for quick send flow and show unsigned signers list
+        const emailExist = placeholder?.email;
+        if (emailExist) {
+          placeholdersOrSigners.push(placeholder);
+        } else {
+          const getSignerData = documentData[0].Signers.filter(
+            (data) => data.objectId === placeholder?.signerObjId
+          );
+          placeholdersOrSigners.push(getSignerData[0]);
+        }
+      }
       //condition to check already signed document by someone
       if (audittrailData && audittrailData.length > 0) {
         setIsDocId(true);
-        const placeholdersOrSigners = emailExist
-          ? documentData[0].Placeholders
-          : documentData[0].Signers;
 
         for (const item of placeholdersOrSigners) {
+          const checkEmail = item?.email;
           //if email exist then compare user signed by using email else signers objectId
-          const emailOrId = emailExist ? item.email : item.objectId;
+          const emailOrId = checkEmail ? item.email : item.objectId;
           //`isSignedSignature` variable to handle break loop whenever it get true
           let isSignedSignature = false;
           //checking the signer who signed the document by using audit trail details.
           //and save signedSigners and unsignedSigners details
           for (const doc of audittrailData) {
-            const signedExist = emailExist
+            const signedExist = checkEmail
               ? doc?.UserPtr.Email
               : doc?.UserPtr.objectId;
 
@@ -441,12 +450,7 @@ function PdfRequestFiles() {
       } else {
         //else condition is show there are no details in audit trail then direct push all signers details
         //in unsignedsigners array
-        let unsigned = [];
-        const placeholdersOrSigners = emailExist
-          ? documentData[0].Placeholders
-          : documentData[0].Signers;
-        unsigned.push(placeholdersOrSigners);
-        setUnSignedSigners(unsigned[0]);
+        setUnSignedSigners(placeholdersOrSigners);
         setSignerPos(documentData[0].Placeholders);
       }
       setPdfDetails(documentData);
@@ -1000,8 +1004,10 @@ function PdfRequestFiles() {
   }
 
   const getFirstLetter = (name) => {
-    const firstLetter = name.charAt(0);
-    return firstLetter;
+    if (name) {
+      const firstLetter = name.charAt(0);
+      return firstLetter;
+    }
   };
   //function for image upload or update
   const onImageChange = (event) => {
@@ -1123,8 +1129,12 @@ function PdfRequestFiles() {
   };
   const checkUserNameColor = (obj) => {
     const getBackColor = checkSignerBackColor(obj);
-    const color = darkenColor(getBackColor, 0.4);
-    return color;
+    if (getBackColor) {
+      const color = darkenColor(getBackColor, 0.4);
+      return color;
+    } else {
+      return "#abd1d0";
+    }
   };
 
   //function for set decline true on press decline button

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -936,6 +936,7 @@ function PlaceHolderSign() {
           Placeholders: filterPrefill,
           SignedUrl: pdfUrl,
           Signers: signers,
+          SentToOthers: true,
           ExpiryDate: {
             iso: updateExpiryDate,
             __type: "Date"
@@ -945,7 +946,8 @@ function PlaceHolderSign() {
         data = {
           Placeholders: filterPrefill,
           SignedUrl: pdfUrl,
-          Signers: signers
+          Signers: signers,
+          SentToOthers: true
         };
       }
       await axios