Skip to content

Commit 148ae40

Browse files
raktima-opensignlabsraktima-opensignlabs
committed
extend expire date of expired draft document
1 parent 9cb0ced commit 148ae40

File tree

4 files changed

+52
-101
lines changed

4 files changed

+52
-101
lines changed

‎microfrontends/SignDocuments/src/Component/DraftDocument.js‎

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -48,62 +48,33 @@ function DraftDocument() {
4848
const handleDraftDoc = () => {
4949
const data = pdfDetails[0];
5050
const hostUrl = getHostUrl();
51-
const expireDate = data.ExpiryDate.iso;
52-
const expireUpdateDate = new Date(expireDate).getTime();
53-
const currDate = new Date().getTime();
5451
const signerExist = data.Signers && data.Signers;
55-
const signUrl = data.SignedUrl && data.SignedUrl;
5652
const isDecline = data.IsDeclined && data.IsDeclined;
5753
const isPlaceholder = data.Placeholders && data.Placeholders;
5854

59-
let isExpire = false;
60-
if (currDate > expireUpdateDate) {
61-
isExpire = true;
62-
}
63-
//checking if document has completed
64-
//checking if document has completed
55+
//checking if document has completed and request signature flow
6556
if (data?.IsCompleted && signerExist?.length > 0) {
6657
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
67-
68-
// window.location.hash = `/pdfRequestFiles/${data.objectId}`;
69-
} else if (data?.IsCompleted && signerExist?.length === 0) {
58+
}
59+
//checking if document has completed and signyour-self flow
60+
else if (!signerExist && !isPlaceholder) {
7061
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
7162
}
7263
//checking if document has declined by someone
7364
else if (isDecline) {
7465
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
7566
//checking draft type document
76-
} else if (
77-
(isExpire || !isExpire) &&
78-
!signerExist &&
79-
!isPlaceholder &&
80-
!signUrl
81-
) {
82-
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
83-
} else if (
84-
(isExpire || !isExpire) &&
85-
isPlaceholder &&
86-
signerExist?.length > 0
87-
) {
67+
}
68+
//Inprogress document
69+
else if (isPlaceholder?.length > 0 && signerExist?.length > 0) {
8870
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
89-
} else if (
90-
(isExpire || !isExpire) &&
91-
signerExist?.length > 0 &&
92-
!isPlaceholder
93-
) {
94-
navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
95-
//checking draft type document
96-
} else if (
97-
(isExpire || !isExpire) &&
98-
signerExist?.length === 0 &&
99-
isPlaceholder
71+
} //placeholder draft document
72+
else if (
73+
(signerExist?.length > 0 && !isPlaceholder) ||
74+
(!signerExist && isPlaceholder?.length > 0)
10075
) {
10176
navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
10277
}
103-
//checking document is draft and signyourself type then user can sign document
104-
else {
105-
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
106-
}
10778
};
10879

10980
return (

‎microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js‎

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -111,60 +111,33 @@ function PdfFileComponent({
111111
//function for navigate user to microapp-signature component
112112
const checkPdfStatus = async (data) => {
113113
const hostUrl = getHostUrl();
114-
const expireDate = data.ExpiryDate.iso;
115-
const expireUpdateDate = new Date(expireDate).getTime();
116-
const currDate = new Date().getTime();
114+
117115
const signerExist = data.Signers && data.Signers;
118-
const signUrl = data.SignedUrl && data.SignedUrl;
119116
const isDecline = data.IsDeclined && data.IsDeclined;
120117
const isPlaceholder = data.Placeholders && data.Placeholders;
121-
let isExpire = false;
122-
if (currDate > expireUpdateDate) {
123-
isExpire = true;
124-
}
125118

126-
//checking if document has completed
119+
//checking if document has completed and request signature flow
127120
if (data?.IsCompleted && signerExist?.length > 0) {
128121
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
129-
130-
// window.location.hash = `/pdfRequestFiles/${data.objectId}`;
131-
} else if (data?.IsCompleted && signerExist?.length === 0) {
122+
}
123+
//checking if document has completed and signyour-self flow
124+
else if (!signerExist && !isPlaceholder) {
132125
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
133126
}
134127
//checking if document has declined by someone
135128
else if (isDecline) {
136129
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
137130
//checking draft type document
138-
} else if (
139-
(isExpire || !isExpire) &&
140-
!signerExist &&
141-
!isPlaceholder &&
142-
!signUrl
143-
) {
144-
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
145-
} else if (
146-
(isExpire || !isExpire) &&
147-
isPlaceholder &&
148-
signerExist?.length > 0
149-
) {
131+
}
132+
//Inprogress document
133+
else if (isPlaceholder?.length > 0 && signerExist?.length > 0) {
150134
navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
151-
} else if (
152-
(isExpire || !isExpire) &&
153-
signerExist?.length > 0 &&
154-
!isPlaceholder
135+
} //placeholder draft document
136+
else if (
137+
(signerExist?.length > 0 && !isPlaceholder) ||
138+
(!signerExist && isPlaceholder?.length > 0)
155139
) {
156140
navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
157-
//checking draft type document
158-
} else if (
159-
(isExpire || !isExpire) &&
160-
signerExist?.length === 0 &&
161-
isPlaceholder
162-
) {
163-
navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
164-
}
165-
//checking document is draft and signyourself type then user can sign document
166-
else {
167-
navigate(`${hostUrl}signaturePdf/${data.objectId}`);
168141
}
169142
};
170143

@@ -329,29 +302,15 @@ function PdfFileComponent({
329302
status = "Completed";
330303
} else if (isDecline) {
331304
status = "Declined";
332-
} else if (
333-
!isExpire &&
334-
isPlaceholder?.length === 0 &&
335-
signerExist?.length > 0
336-
) {
305+
} else if (!signerExist || signerExist?.length === 0) {
337306
status = "Draft";
338307
} else if (
339-
!isExpire &&
340-
isPlaceholder?.length > 0 &&
341-
signerExist?.length === 0
342-
) {
343-
status = "Draft";
344-
} else if (
345-
!isExpire &&
346-
isPlaceholder?.length === 0 &&
347308
signerExist?.length > 0 &&
348-
!signUrl
309+
(!isPlaceholder || isPlaceholder?.length === 0)
349310
) {
350311
status = "Draft";
351312
} else if (isExpire) {
352313
status = "Expired";
353-
} else if (!signUrl) {
354-
status = "Draft";
355314
} else {
356315
status = "In Progress";
357316
}

‎microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ function PdfFile() {
294294
const handleFolderTab = (folderData, isMove) => {
295295
return folderData.map((data, id) => {
296296
return (
297-
<React.Fragment>
297+
<React.Fragment key={id}>
298298
<span
299299
onClick={() => handleRoute(id)}
300300
style={{

‎microfrontends/SignDocuments/src/Component/placeHolderSign.js‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ function PlaceHolderSign() {
639639
setIsSendAlert(alert);
640640
}
641641
};
642+
642643
const sendEmailToSigners = async () => {
643644
const loadObj = {
644645
isLoad: true,
@@ -723,12 +724,32 @@ function PlaceHolderSign() {
723724
const currentUser = signersdata.find((x) => x.Email === currentId);
724725
setCurrentId(currentUser?.objectId);
725726

727+
const expiryTime = new Date(expireDate).getTime();
728+
const currDate = new Date().getTime();
729+
let updateExpiryDate, data;
730+
if (currDate > expiryTime) {
731+
updateExpiryDate = new Date(expireDate);
732+
updateExpiryDate.setDate(updateExpiryDate.getDate() + 15);
733+
}
734+
726735
try {
727-
const data = {
728-
Placeholders: signerPos,
729-
SignedUrl: pdfDetails[0].URL,
730-
Signers: signers
731-
};
736+
if (updateExpiryDate) {
737+
data = {
738+
Placeholders: signerPos,
739+
SignedUrl: pdfDetails[0].URL,
740+
Signers: signers,
741+
ExpiryDate: {
742+
iso: updateExpiryDate,
743+
__type: "Date"
744+
}
745+
};
746+
} else {
747+
data = {
748+
Placeholders: signerPos,
749+
SignedUrl: pdfDetails[0].URL,
750+
Signers: signers
751+
};
752+
}
732753

733754
await axios
734755
.put(

0 commit comments

Comments
 (0)