From cfd8be0eee4d937cdf0e7f7d96c8bf8371d37150 Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Mon, 15 Apr 2024 18:42:03 +0530
Subject: [PATCH] fix: add delete button to delete signers list in request send
 flow

---
 .../src/components/pdf/RecipientList.js       |  4 ++-
 apps/OpenSign/src/components/pdf/RenderPdf.js |  8 +++--
 .../src/components/pdf/WidgetComponent.js     |  4 +--
 .../components/shared/fields/SelectSigners.js | 16 +++++++--
 apps/OpenSign/src/pages/PlaceHolderSign.js    | 36 +++++++++++++++----
 apps/OpenSign/src/primitives/LinkUserModal.js |  1 +
 6 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/apps/OpenSign/src/components/pdf/RecipientList.js b/apps/OpenSign/src/components/pdf/RecipientList.js
index ba9b5166c..f31dda61b 100644
--- a/apps/OpenSign/src/components/pdf/RecipientList.js
+++ b/apps/OpenSign/src/components/pdf/RecipientList.js
@@ -230,7 +230,9 @@ const RecipientList = (props) => {
                       </span>
                     </>
                   )}
-                  {obj.Name && <span className={"useEmail"}>{obj.Role}</span>}
+                  {obj.Name && (
+                    <span className={"useEmail"}>{obj?.Role || obj.Email}</span>
+                  )}
                 </div>
               </div>
               {isMobile && props.sendInOrder && (
diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
index 8d656d383..a8298d019 100644
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -296,9 +296,11 @@ function RenderPdf({
             {type && (
               <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
             )}
-            <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
-              {`(${Role})`}
-            </div>
+            {Role && (
+              <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+                {`(${Role})`}
+              </div>
+            )}
           </>
         );
       } else {
diff --git a/apps/OpenSign/src/components/pdf/WidgetComponent.js b/apps/OpenSign/src/components/pdf/WidgetComponent.js
index 9b0ba807f..957ea9536 100644
--- a/apps/OpenSign/src/components/pdf/WidgetComponent.js
+++ b/apps/OpenSign/src/components/pdf/WidgetComponent.js
@@ -406,7 +406,7 @@ function WidgetComponent({
       )}
       {isSignersModal && (
         <ModalUi
-          title={"Roles"}
+          title={title ? title : "Recipients"}
           isOpen={isSignersModal}
           handleClose={handleModal}
         >
@@ -439,7 +439,7 @@ function WidgetComponent({
                 textAlign: "center"
               }}
             >
-              Please add a role
+              Please add a {title ? title : "recipients"}
             </div>
           )}
         </ModalUi>
diff --git a/apps/OpenSign/src/components/shared/fields/SelectSigners.js b/apps/OpenSign/src/components/shared/fields/SelectSigners.js
index f598b9265..24c24ec85 100644
--- a/apps/OpenSign/src/components/shared/fields/SelectSigners.js
+++ b/apps/OpenSign/src/components/shared/fields/SelectSigners.js
@@ -53,9 +53,19 @@ const SelectSigners = (props) => {
       const contactRes = await contactbook.find();
       if (contactRes) {
         const res = JSON.parse(JSON.stringify(contactRes));
-        // console.log("userList ", res);
-        setUserList(res);
-        return await res.map((item) => ({
+        const compareArrays = (res, signerObj) => {
+          return res.filter(
+            (item1) =>
+              !signerObj.find((item2) => item2.objectId === item1.objectId)
+          );
+        };
+
+        const updateSignersList =
+          props?.signersData && compareArrays(res, props?.signersData);
+
+        const result = updateSignersList ? updateSignersList : res;
+        setUserList(result);
+        return await result.map((item) => ({
           label: item.Email,
           value: item.objectId
         }));
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index 0c29ef4d4..15e3410ec 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -353,7 +353,7 @@ function PlaceHolderSign() {
           const updatedSigners = documentData[0].Signers.map((x, index) => ({
             ...x,
             Id: randomId(),
-            Role: "User " + (index + 1),
+            // Role: "User " + (index + 1),
             blockColor: color[index % color.length]
           }));
           setSignersData(updatedSigners);
@@ -361,7 +361,7 @@ function PlaceHolderSign() {
           setBlockColor(updatedSigners[0].blockColor);
         }
       } else {
-        setRoleName("User 1");
+        // setRoleName("User 1");
         if (
           documentData[0].Placeholders &&
           documentData[0].Placeholders.length > 0
@@ -1531,19 +1531,15 @@ function PlaceHolderSign() {
   //function to add new signer in document signers list
   const handleAddNewRecipients = (data) => {
     const newId = randomId();
-    const newRole = `User ${signersdata?.length + 1} `;
-
     signersdata.push({
       ...data,
       className: "contracts_Contactbook",
       Id: newId,
-      Role: newRole,
       blockColor: color[signersdata.length]
     });
     setUniqueId(newId);
     setIsSelectId(signersdata.length - 1);
     setBlockColor(color[signersdata.length]);
-    setRoleName(newRole);
     setContractName("contracts_Contactbook");
     setSignerObjId(data.objectId);
   };
@@ -1570,6 +1566,30 @@ function PlaceHolderSign() {
       style: { fontSize: "13px" }
     }
   ];
+
+  // `handleDeleteUser` function is used to delete record and placeholder when user click on delete which is place next user name in recipients list
+  const handleDeleteUser = (Id) => {
+    const updateSigner = signersdata
+      .filter((x) => x.Id !== Id)
+      .map((x, i) => ({ ...x, blockColor: color[i] }));
+    setSignersData(updateSigner);
+    const updatePlaceholderUser = signerPos
+      .filter((x) => x.Id !== Id)
+      .map((x, i) => ({ ...x, blockColor: color[i] }));
+    const index = signersdata.findIndex((x) => x.Id === Id);
+    if (index === signersdata.length - 1) {
+      setUniqueId(updateSigner[updateSigner.length - 1]?.Id || "");
+      setIsSelectId(index - 1 || 0);
+      setBlockColor(color[index - 1 || 0]);
+    } else {
+      setUniqueId(updateSigner[index]?.Id || "");
+      setIsSelectId(index);
+      setBlockColor(color[index]);
+    }
+
+    setSignerPos(updatePlaceholderUser);
+    setIsMailSend(false);
+  };
   return (
     <>
       <Title title={state?.title ? state.title : "New Document"} />
@@ -2007,6 +2027,7 @@ function PlaceHolderSign() {
                   blockColor={blockColor}
                   setBlockColor={setBlockColor}
                   setIsAddSigner={setIsAddSigner}
+                  handleDeleteUser={handleDeleteUser}
                 />
               </div>
             ) : (
@@ -2033,6 +2054,8 @@ function PlaceHolderSign() {
                       setBlockColor={setBlockColor}
                       isMailSend={isMailSend}
                       setIsAddSigner={setIsAddSigner}
+                      handleDeleteUser={handleDeleteUser}
+                      roleName={roleName}
                       // handleAddSigner={handleAddSigner}
                     />
                     <div data-tut="reactourSecond">
@@ -2097,6 +2120,7 @@ function PlaceHolderSign() {
           handleAddUser={handleAddNewRecipients}
           isAddSigner={isAddSigner}
           closePopup={closePopup}
+          signersData={signersdata}
         />
         <WidgetNameModal
           widgetName={widgetName}
diff --git a/apps/OpenSign/src/primitives/LinkUserModal.js b/apps/OpenSign/src/primitives/LinkUserModal.js
index b33ffa63b..a8caa61b2 100644
--- a/apps/OpenSign/src/primitives/LinkUserModal.js
+++ b/apps/OpenSign/src/primitives/LinkUserModal.js
@@ -16,6 +16,7 @@ const LinkUserModal = (props) => {
       <SelectSigners
         details={props.handleAddUser}
         closePopup={props.closePopup}
+        signersData={props?.signersData}
       />
       <div
         style={{