Merge pull request #813 from OpenSignLabs/raktima-opensignlabs-patch-9

fix: display the list of unsigned signers in the 'Yet to Sign' panel using the QuickSend flow.
OpenSignLabs · Jun 7, 2024 · a90e679 · a90e679
2 parents 302f38d + 90b5e3c
commit a90e679
Show file tree

Hide file tree

Showing 10 changed files with 423 additions and 323 deletions.
diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js
@@ -9,7 +9,23 @@ 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();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  //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 +181,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

diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -204,8 +204,10 @@ function RenderPdf({
   };
   //function for render placeholder block over pdf document
   const checkSignedSignes = (data) => {
-    const checkSign = signedSigners.filter(
-      (sign) => sign.objectId === data.signerObjId
+    let checkSign = [];
+    //condition to handle quick send flow and using normal request sign flow
+    checkSign = signedSigners.filter(
+      (sign) => sign?.Id === data?.Id || sign?.objectId === data?.signerObjId
     );
     if (data.signerObjId === signerObjectId) {
       setCurrentSigner(true);

diff --git a/apps/OpenSign/src/constant/Utils.js b/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,