🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: redirect wrong route of draft docment issue in openSign-drive
RaktimaNXG72431b2c8214
diff --git a/microfrontends/SignDocuments/src/Component/DraftDocument.js b/microfrontends/SignDocuments/src/Component/DraftDocument.jsindex 95ab370b9..570271efa 100644--- a/microfrontends/SignDocuments/src/Component/DraftDocument.js+++ b/microfrontends/SignDocuments/src/Component/DraftDocument.js@@ -47,65 +47,51 @@ function DraftDocument() {//check document type and render on signyour self and placeholder routeconst handleDraftDoc = () => {const data = pdfDetails[0];- const checkSignerExist =- pdfDetails[0] && pdfDetails[0].Signers && pdfDetails[0].Signers;- const isPlaceholder =- pdfDetails[0].Placeholders && pdfDetails[0].Placeholders;- const isDecline = data.IsDeclined && data.IsDeclined;- const signUrl = data.SignedUrl && data.SignedUrl;- const expireDate =- pdfDetails[0] &&- pdfDetails[0].ExpiryDate.iso &&- pdfDetails[0].ExpiryDate.iso;+ const hostUrl = getHostUrl();+ const expireDate = data.ExpiryDate.iso;const expireUpdateDate = new Date(expireDate).getTime();const currDate = new Date().getTime();- const hostUrl = getHostUrl();+ const signerExist = data.Signers && data.Signers;+ const signUrl = data.SignedUrl && data.SignedUrl;+ const isDecline = data.IsDeclined && data.IsDeclined;+ const isPlaceholder = data.Placeholders && data.Placeholders;- //checking document is completed and signer exist then navigate to pdfRequestFiles file- if (data.IsCompleted && checkSignerExist) {- navigate(`${hostUrl}pdfRequestFiles`);+ let isExpire = false;+ if (currDate > expireUpdateDate) {+ isExpire = true;}- //checking document is completed and signer does not exist then navigate to recipientSignPdf file- else if (data.IsCompleted && !checkSignerExist) {- navigate(`${hostUrl}signaturePdf`);+ //checking if document has completed+ if (data?.IsCompleted && signerExist?.length > 0) {+ navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);+ } else if (data?.IsCompleted && signerExist?.length === 0) {+ navigate(`${hostUrl}signaturePdf/${data.objectId}`);}- //checking document is declined by someone then navigate to pdfRequestFiles file+ //checking if document has declined by someoneelse if (isDecline) {- navigate(`${hostUrl}pdfRequestFiles`);- }- //checking document has expired and signers exist and placeholder does not set yet then navigate to pdfRequestFiles file- //draft type request sign document- else if (- currDate > expireUpdateDate &&- checkSignerExist &&- !isPlaceholder- ) {- navigate(`${hostUrl}placeHolderSign`);- }- //checking document has expired and signers does not exist and document not signed yet then navigate to pdfRequestFiles file- //draft type signyouselfdocument- else if (- currDate > expireUpdateDate &&- !checkSignerExist &&- !isPlaceholder &&+ navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);+ //checking draft type document+ } else if (+ isExpire &&+ signerExist?.length === 0 &&+ isPlaceholder?.length === 0 &&!signUrl) {- // window.location.hash = `/signaturePdf`;- navigate(`${hostUrl}signaturePdf`);- }- //checking document has expired and signers exist and document then navigate to pdfRequestFiles file- else if (currDate > expireUpdateDate) {- // window.location.hash = `/pdfRequestFiles`;- navigate(`${hostUrl}pdfRequestFiles`);+ navigate(`${hostUrl}signaturePdf/${data.objectId}`);+ } else if (+ (isExpire || !isExpire) &&+ isPlaceholder?.length > 0 &&+ signerExist?.length > 0+ ) {+ navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);+ } else if (signerExist?.length > 0 && isPlaceholder?.length === 0) {+ navigate(`${hostUrl}placeHolderSign/${data.objectId}`);+ //checking draft type document+ } else if (signerExist?.length === 0 && isPlaceholder?.length > 0) {+ navigate(`${hostUrl}placeHolderSign/${data.objectId}`);}- //checking document has expired not been expired yet and signers exist and placeholder does not set yet then navigate to pdfRequestFiles file- //draft type request sign document- else if (!signUrl && checkSignerExist) {- navigate(`${hostUrl}placeHolderSign`);- // window.location.hash = `/placeHolderSign`;- } else {- // window.location.hash = `/signaturePdf/`;- navigate(`${hostUrl}signaturePdf`);+ //checking document is draft and signyourself type then user can sign document+ else {+ navigate(`${hostUrl}signaturePdf/${data.objectId}`);}};diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js b/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.jsindex 39f4211d0..4520262df 100644--- a/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js@@ -28,7 +28,7 @@ function PdfFileComponent({const [isOpenMoveModal, setIsOpenMoveModal] = useState(false);const [selectDoc, setSelectDoc] = useState();const [isDeleteDoc, setIsDeleteDoc] = useState(false);- const contextMenu = ["Download", "Rename", "Delete", "Move"];+ const contextMenu = ["Download", "Rename", "Move", "Delete"];const navigate = useNavigate();//to focus input box on press rename to change doc name@@ -113,56 +113,45 @@ function PdfFileComponent({const signUrl = data.SignedUrl && data.SignedUrl;const isDecline = data.IsDeclined && data.IsDeclined;const isPlaceholder = data.Placeholders && data.Placeholders;- //checking and navigate to signyouself page- const checkPlaceHolder = data.Placeholders;++ let isExpire = false;+ if (currDate > expireUpdateDate) {+ isExpire = true;+ }//checking if document has completed- if (data.IsCompleted && signerExist) {+ if (data?.IsCompleted && signerExist?.length > 0) {navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);// window.location.hash = `/pdfRequestFiles/${data.objectId}`;- } else if (data.IsCompleted && !signerExist) {+ } else if (data?.IsCompleted && signerExist?.length === 0) {navigate(`${hostUrl}signaturePdf/${data.objectId}`);}//checking if document has declined by someoneelse if (isDecline) {navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);- // window.location.hash = `/pdfRequestFiles/${data.objectId}`;- } else if (currDate > expireUpdateDate && signerExist && !isPlaceholder) {- // window.location.hash = `/placeHolderSign/${data.objectId}`;- navigate(`${hostUrl}placeHolderSign/${data.objectId}`);+ //checking draft type document} else if (- currDate > expireUpdateDate &&- !signerExist &&- !isPlaceholder &&+ isExpire &&+ signerExist?.length === 0 &&+ isPlaceholder?.length === 0 &&!signUrl) {navigate(`${hostUrl}signaturePdf/${data.objectId}`);- // window.location.hash = `/signaturePdf/${data.objectId}`;- }- //checking if document has expired- else if (currDate > expireUpdateDate) {- navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);- // window.location.hash = `/pdfRequestFiles/${data.objectId}`;- } //checking if document is draft signers type and signers placeholder does not placed yet- else if (!signUrl && signerExist) {- // window.location.hash = `/placeHolderSign/${data.objectId}`;- navigate(`${hostUrl}placeHolderSign/${data.objectId}`);- }- //checking if document is request type and signers placeholder exist and does not completed yet- //then user can check progress of document and sign also- else if (- checkPlaceHolder &&- checkPlaceHolder.length > 0 &&- !data.IsCompleted+ } else if (+ (isExpire || !isExpire) &&+ isPlaceholder?.length > 0 &&+ signerExist?.length > 0) {navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);- // window.location.hash = `/pdfRequestFiles/${data.objectId}`;+ } else if (signerExist?.length > 0 && isPlaceholder?.length === 0) {+ navigate(`${hostUrl}placeHolderSign/${data.objectId}`);+ //checking draft type document+ } else if (signerExist?.length === 0 && isPlaceholder?.length > 0) {+ navigate(`${hostUrl}placeHolderSign/${data.objectId}`);}//checking document is draft and signyourself type then user can sign documentelse {navigate(`${hostUrl}signaturePdf/${data.objectId}`);- // navigate(`/signaturePdf/${data.objectId}`);- // window.location.hash = `/signaturePdf/${data.objectId}`;}};@@ -189,6 +178,7 @@ function PdfFileComponent({};//function for delete documentconst handleDeleteDocument = async (docData) => {+ setIsDeleteDoc(false);const docId = docData.objectId;const data = {IsArchive: true@@ -302,7 +292,6 @@ function PdfFileComponent({status,isDecline,signerExist,- isExpire,isComplete,signUrl,isPlaceholder;@@ -317,28 +306,40 @@ function PdfFileComponent({signUrl = data.SignedUrl && data.SignedUrl;const expireUpdateDate = new Date(expireDate).getTime();const currDate = new Date().getTime();-+ let isExpire = false;if (currDate > expireUpdateDate) {isExpire = true;- } else {- isExpire = false;}+if (isComplete) {status = "Completed";} else if (isDecline) {status = "Declined";- } else if (isExpire && !isPlaceholder && signerExist) {- // status = "Expired";+ } else if (+ !isExpire &&+ isPlaceholder?.length === 0 &&+ signerExist?.length > 0+ ) {status = "Draft";- } else if (isExpire && !isPlaceholder && !signerExist && !signUrl) {- // status = "Expired";+ } else if (+ !isExpire &&+ isPlaceholder?.length > 0 &&+ signerExist?.length === 0+ ) {+ status = "Draft";+ } else if (+ !isExpire &&+ isPlaceholder?.length === 0 &&+ signerExist?.length > 0 &&+ !signUrl+ ) {status = "Draft";} else if (isExpire) {status = "Expired";} else if (!signUrl) {status = "Draft";} else {- status = "InComplete";+ status = "In Progress";}}@@ -346,7 +347,14 @@ function PdfFileComponent({const getSignersName = signerExist.map((data) => data.Name);const signerName = getSignersName.join(",");- return <span className="statusSpan">{signerName} </span>;+ return (+ <span+ className="statusSpan"+ style={{ width: "90%", wordWrap: "break-word" }}+ >+ {signerName}{" "}+ </span>+ );};return listType === "table" ? (data.Type === "Folder" ? (@@ -598,7 +606,7 @@ function PdfFileComponent({<i className="fa fa-file"></i></div>) : (- status === "InComplete" && (+ status === "In Progress" && (<div className="status-badge in-progress"><i className="fa fa-paper-plane"></i></div>@@ -646,9 +654,11 @@ function PdfFileComponent({{signerExist && (<><strong style={{ fontSize: "13px" }}>Signers: </strong>+ {/* <span className="statusSpan">kjefjjnejkfnkbjs bbfjkdsbjbfjkbjk kscbjkbjkb</span> */}{signersName()}</>)}+<HoverCard.Arrow className="HoverCardArrow" /></HoverCard.Content></HoverCard.Portal>@@ -732,22 +742,21 @@ function PdfFileComponent({color: "white"}}type="button"- className="docDeleteBtn"+ className="finishBtn">- YES+ Yes</button><buttononClick={() => {setIsDeleteDoc(false);}}style={{- background: "rgb(24 138 226)",- marginLeft: "10px"+ color: "black"}}type="button"- className="docDeleteBtn"+ className="finishBtn">- NO+ No</button></div></ModalUi>diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.css b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.cssindex 0266b29e4..1d8e4149d 100644--- a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.css+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.css@@ -396,6 +396,7 @@ a {will-change: transform, opacity;text-align: center;align-items: center;+}.HoverCardContent[data-side='top'] {diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.jsindex 5f04b38ed..21d6a9e4c 100644--- a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js@@ -403,20 +403,19 @@ function PdfFile() {background: themeColor()}}type="button"- className="docDeleteBtn"+ className="finishBtn">- ADD+ Add</button><button- type="submit"style={{- background: "rgb(24 138 226)",- marginLeft: "10px"+ color: "black"}}- className="docDeleteBtn"+ type="button"+ className="finishBtn"onClick={() => setIsFolder(false)}>- CLOSE+ Close</button></div></div>diff --git a/microfrontends/SignDocuments/src/Component/component/CustomModal.js b/microfrontends/SignDocuments/src/Component/component/CustomModal.jsindex eee88a834..5b91cf932 100644--- a/microfrontends/SignDocuments/src/Component/component/CustomModal.js+++ b/microfrontends/SignDocuments/src/Component/component/CustomModal.js@@ -25,39 +25,41 @@ function CustomModal({<div className="modalHeadDiv bg-danger">{headMsg && headMsg}</div><div className="modalBodyDIv"><p className="pTagBody">{bodyMssg && bodyMssg}</p>- <div- style={{- height: "1px",- backgroundColor: "#9f9f9f",- width: "100%",- marginTop: "15px",- marginBottom: "15px"- }}- ></div>{footerMessage && (- <div className="modalFooterDiv">- <button+ <>+ <divstyle={{- background: "#de4337"+ height: "1px",+ backgroundColor: "#9f9f9f",+ width: "100%",+ marginTop: "15px",+ marginBottom: "15px"}}- type="button"- className="finishBtn"- onClick={() => declineDoc()}- >- Yes- </button>- <button- style={{- color: "black"- }}- type="button"- className="finishBtn"- onClick={() => setIsDecline({ isDeclined: false })}- >- Close- </button>- </div>+ ></div>+ <div className="modalFooterDiv">+ <button+ style={{+ background: "#de4337"+ }}+ type="button"+ className="finishBtn"+ onClick={() => declineDoc()}+ >+ Yes+ </button>+ <button+ style={{+ color: "black"+ }}+ type="button"+ className="finishBtn"+ onClick={() => setIsDecline({ isDeclined: false })}+ >+ Close+ </button>+ </div>+ </>)}</div></div>