From d5853e6fc3bb1a8c6d9c3edec032272074dde580 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Tue, 12 Dec 2023 19:23:21 +0530 Subject: [PATCH] fix: placeholder block issue for select multisigners --- .../SignDocuments/public/index.html | 2 +- .../src/Component/component/emailComponent.js | 8 +++-- .../src/Component/component/renderPdf.js | 8 ++--- .../src/Component/placeHolderSign.js | 32 +++++++++++++++---- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/microfrontends/SignDocuments/public/index.html b/microfrontends/SignDocuments/public/index.html index bf27a008e..b3ac89822 100644 --- a/microfrontends/SignDocuments/public/index.html +++ b/microfrontends/SignDocuments/public/index.html @@ -47,7 +47,7 @@ href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" /> - OpenSign App + OpenSign™ diff --git a/microfrontends/SignDocuments/src/Component/component/emailComponent.js b/microfrontends/SignDocuments/src/Component/component/emailComponent.js index 5d7691e68..cccf897f0 100644 --- a/microfrontends/SignDocuments/src/Component/component/emailComponent.js +++ b/microfrontends/SignDocuments/src/Component/component/emailComponent.js @@ -39,7 +39,7 @@ function EmailComponent({ "X-Parse-Application-Id": localStorage.getItem("parseAppId"), sessionToken: localStorage.getItem("accesstoken") }; - + const openSignUrl = "https://www.opensignlabs.com/"; const themeBGcolor = themeColor(); let params = { pdfName: pdfName, @@ -54,9 +54,11 @@ function EmailComponent({ themeBGcolor + ";'>

Document Copy

A copy of the document " + pdfName + - " Standard is attached to this email. Kindly download the document from the attachment.

This is an automated email from Open Sign. For any queries regarding this email, please contact the sender " + + " Standard is attached to this email. Kindly download the document from the attachment.

This is an automated email from OpenSign. For any queries regarding this email, please contact the sender " + sender.email + - " directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign here.

" + " directly. If you think this email is inappropriate or spam, you may file a complaint with OpenSign here

" }; sendMail = await axios.post(url, params, { headers: headers }); } catch (error) { diff --git a/microfrontends/SignDocuments/src/Component/component/renderPdf.js b/microfrontends/SignDocuments/src/Component/component/renderPdf.js index a3990fe61..629bc0a66 100644 --- a/microfrontends/SignDocuments/src/Component/component/renderPdf.js +++ b/microfrontends/SignDocuments/src/Component/component/renderPdf.js @@ -453,8 +453,8 @@ function RenderPdf({ className="placeholderBlock" onDrag={() => handleTabDrag( - pos.key, - data.signerObjId + pos.key + // data.signerObjId ) } size={{ @@ -872,8 +872,8 @@ function RenderPdf({ className="placeholderBlock" onDrag={() => handleTabDrag( - pos.key, - data.signerObjId + pos.key + // data.signerObjId ) } size={{ diff --git a/microfrontends/SignDocuments/src/Component/placeHolderSign.js b/microfrontends/SignDocuments/src/Component/placeHolderSign.js index 8d1eb8a54..923b43d2e 100644 --- a/microfrontends/SignDocuments/src/Component/placeHolderSign.js +++ b/microfrontends/SignDocuments/src/Component/placeHolderSign.js @@ -274,6 +274,7 @@ function PlaceHolderSign() { let xyPos = {}; if (item === "onclick") { const dropObj = { + //onclick put placeholder center on pdf xPosition: window.innerWidth / 2 - 100, yPosition: window.innerHeight / 2 - 60, isStamp: monitor, @@ -321,7 +322,6 @@ function PlaceHolderSign() { xyPosArr.push(xyPos); } - //add signers objId first inseretion if (filterSignerPos.length > 0) { const colorIndex = signerPos @@ -355,8 +355,15 @@ function PlaceHolderSign() { objectId: signerObjId } }; + // signerPos.splice(colorIndex, 1, placeHolderPos); + const newArry = [placeHolderPos]; + const newArray = [ + ...signerPos.slice(0, colorIndex), + ...newArry, + ...signerPos.slice(colorIndex + 1) + ]; - signerPos.splice(colorIndex, 1, placeHolderPos); + setSignerPos(newArray); } else { const newSignPoss = getPlaceHolder.concat(xyPosArr[0]); @@ -371,7 +378,15 @@ function PlaceHolderSign() { } }; - signerPos.splice(colorIndex, 1, placeHolderPos); + // signerPos.splice(colorIndex, 1, placeHolderPos); + const newArry = [placeHolderPos]; + const newArray = [ + ...signerPos.slice(0, colorIndex), + ...newArry, + ...signerPos.slice(colorIndex + 1) + ]; + + setSignerPos(newArray); } } else { let placeHolderPos = { @@ -400,10 +415,11 @@ function PlaceHolderSign() { setPdfOriginalWidth(pageWidth); }); }; + //function for save x and y position and show signature tab on that position const handleTabDrag = (key, signerId) => { setDragKey(key); - setSignerObjId(signerId); + // setSignerObjId(signerId); }; //function for set and update x and y postion after drag and drop signature tab @@ -610,7 +626,7 @@ function PlaceHolderSign() { const hostUrl = window.location.origin + "/loadmf/signmicroapp"; let signPdf = `${hostUrl}/login/${signersdata.objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`; - + const openSignUrl = "https://www.opensignlabs.com/"; const themeBGcolor = themeColor(); let params = { recipient: signerMail[i].Email, @@ -632,9 +648,11 @@ function PlaceHolderSign() { localExpireDate + "

This is an automated email from Open Sign. For any queries regarding this email, please contact the sender " + + ">

This is an automated email from OpenSign. For any queries regarding this email, please contact the sender " + sender + - " directly.If you think this email is inappropriate or spam, you may file a complaint with Open Sign here.

" + " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign here.

" }; sendMail = await axios.post(url, params, { headers: headers }); } catch (error) {