WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-24 00:22:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1088 from OpenSignLabs/validation

Browse Source 
feat: add download btn in expired document
This commit is contained in:
Raktima
2024-08-23 13:08:36 +05:30
committed by GitHub
parent 5fa8a76219 669ba9e8cb
commit b2352877b9
2 changed files with 50 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/pages/PdfRequestFiles.js
+33 -67
View File
@@ -34,7 +34,8 @@ import {
openInNewTab,
getDefaultSignature,
onClickZoomIn,
onClickZoomOut
onClickZoomOut,
fetchUrl
} from "../constant/Utils";
import LoaderWithMsg from "../primitives/LoaderWithMsg";
import HandleError from "../primitives/HandleError";
@@ -340,23 +341,17 @@ function PdfRequestFiles(props) {
}
setUnSignedSigners(placeholdersOrSigners);
setPdfDetails(documentData);
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
} else if (
documentData === "Error: Something went wrong!" ||
(documentData.result && documentData.result.error)
) {
console.log("err in get template details ");
setHandleError(t("something-went-wrong-mssg"));
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
} else {
setHandleError(t("no-data"));
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
}
} catch (err) {
console.log("err in get template details ", err);
@@ -424,16 +419,11 @@ function PdfRequestFiles(props) {
}
if (isCompleted) {
setIsSigned(true);
const data = {
isCertificate: true,
isModal: true
};
const data = { isCertificate: true, isModal: true };
setAlreadySign(true);
setIsCompleted(data);
setIsCelebration(true);
setTimeout(() => {
setIsCelebration(false);
}, 5000);
setTimeout(() => setIsCelebration(false), 5000);
} else if (declined) {
const currentDecline = {
currnt: "another",
@@ -449,9 +439,7 @@ function PdfRequestFiles(props) {
} // Check if the current signer is not a last signer and handle the complete message.
else if (isNextUser) {
setIsCelebration(true);
setTimeout(() => {
setIsCelebration(false);
}, 5000);
setTimeout(() => setIsCelebration(false), 5000);
setIsCompleted({
isModal: true,
message: t("document-signed-alert-1")
@@ -478,7 +466,8 @@ function PdfRequestFiles(props) {
documentData[0].AuditTrail.length > 0 &&
documentData[0].AuditTrail.filter(
(data) =>
data.UserPtr.objectId === currUserId && data.Activity === "Signed"
data.UserPtr?.objectId === currUserId &&
data.Activity === "Signed"
);
if (
checkAlreadySign &&
@@ -558,15 +547,15 @@ function PdfRequestFiles(props) {
for (const item of placeholdersOrSigners) {
const checkEmail = item?.email;
//if email exist then compare user signed by using email else signers objectId
const emailOrId = checkEmail ? item.email : item.objectId;
const emailOrId = checkEmail ? item.email : item?.objectId;
//`isSignedSignature` variable to handle break loop whenever it get true
let isSignedSignature = false;
//checking the signer who signed the document by using audit trail details.
//and save signedSigners and unsignedSigners details
for (const doc of audittrailData) {
const signedExist = checkEmail
? doc?.UserPtr.Email
: doc?.UserPtr.objectId;
? doc?.UserPtr?.Email
: doc?.UserPtr?.objectId;
if (emailOrId === signedExist) {
signers.push({ ...item });
@@ -644,15 +633,11 @@ function PdfRequestFiles(props) {
(documentData.result && documentData.result.error)
) {
setHandleError(t("something-went-wrong-mssg"));
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
console.log("err in getDocument cloud function ");
} else {
setHandleError(t("no-data"));
setIsUiLoading({
isLoad: false
});
setIsUiLoading({ isLoad: false });
}
//function to get default signatur eof current user from `contracts_Signature` class
const defaultSignRes = await getDefaultSignature(jsonSender.objectId);
@@ -662,15 +647,11 @@ function PdfRequestFiles(props) {
} else if (defaultSignRes?.status === "error") {
setHandleError("Error: Something went wrong!");
}
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
} catch (err) {
console.log("Error: error in getDocumentDetails", err);
setHandleError("Error: Something went wrong!");
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
}
};
//function for embed signature or image url in pdf
@@ -1028,9 +1009,7 @@ function PdfRequestFiles(props) {
openSignUrl +
" target=_blank>here</a>.</p> </div></div></body> </html>"
};
await axios.post(url, params, {
headers: headers
});
await axios.post(url, params, { headers: headers });
} catch (error) {
console.log("error", error);
}
@@ -1193,10 +1172,7 @@ function PdfRequestFiles(props) {
const img = new Image();
img.src = defaultSignImg;
if (img.complete) {
imgWH = {
width: img.width,
height: img.height
};
imgWH = { width: img.width, height: img.height };
}
}
//get current signer placeholder position data
@@ -1256,10 +1232,7 @@ function PdfRequestFiles(props) {
.then(async (result) => {
const res = result.data;
if (res) {
const currentDecline = {
currnt: "YouDeclined",
isDeclined: true
};
const currentDecline = { currnt: "YouDeclined", isDeclined: true };
setIsDecline(currentDecline);
setIsUiLoading(false);
const params = {
@@ -1318,10 +1291,7 @@ function PdfRequestFiles(props) {
x.signerObjId === signerObjectId ? { ...x, placeHolder: updatePlace } : x
);
setSignerPos(updatesignerPos);
setDefaultSignAlert({
isShow: false,
alertMessage: ""
});
setDefaultSignAlert({ isShow: false, alertMessage: "" });
};
const handleDontShow = (isChecked) => {
setIsDontShow(isChecked);
@@ -1502,7 +1472,6 @@ function PdfRequestFiles(props) {
const SendOtp = async () => {
try {
const params = { email: contact.email, docId: res.docId };
const Otp = await axios.post(
`${localStorage.getItem("baseUrl")}/functions/SendOTPMailV1`,
params,
@@ -1540,10 +1509,7 @@ function PdfRequestFiles(props) {
"Content-Type": "application/json",
"X-Parse-Application-Id": parseId
};
let body = {
email: contact.email,
otp: otp
};
let body = { email: contact.email, otp: otp };
let user = await axios.post(url, body, { headers: headers });
if (user.data.result === "Invalid Otp") {
alert(t("invalid-otp"));
@@ -1575,9 +1541,7 @@ function PdfRequestFiles(props) {
// document.getElementById("my_modal").close();
setIsPublicContact(false);
setIsPublicTemplate(false);
setIsLoading({
isLoad: false
});
setIsLoading({ isLoad: false });
setDocumentId(res?.docId);
getDocumentDetails(res?.docId);
}
@@ -1593,11 +1557,7 @@ function PdfRequestFiles(props) {
setLoading(false);
setIsOtp(false);
setOtp();
setContact({
name: "",
email: "",
phone: ""
});
setContact({ name: "", email: "", phone: "" });
};
const clickOnZoomIn = () => {
@@ -1606,6 +1566,11 @@ function PdfRequestFiles(props) {
const clickOnZoomOut = () => {
onClickZoomOut(zoomPercent, scale, setZoomPercent, setScale);
};
const handleDownloadBtn = async () => {
const url = pdfDetails?.[0]?.SignedUrl || pdfDetails?.[0]?.URL;
const name = pdfDetails?.[0]?.Name;
await fetchUrl(url, name);
};
return (
<DndProvider backend={HTML5Backend}>
<Title title={props.templateId ? "Public Sign" : "Request Sign"} />
@@ -1696,9 +1661,9 @@ function PdfRequestFiles(props) {
headMsg={t("document-decline")}
bodyMssg={
isDecline.currnt === "Sure"
? t("decline-alert-2")
? t("decline-alert-1")
: isDecline.currnt === "YouDeclined"
? t("decline-alert-1")
? t("decline-alert-2")
: isDecline.currnt === "another" && t("decline-alert-3")
}
footerMessage={isDecline.currnt === "Sure"}
@@ -1710,6 +1675,8 @@ function PdfRequestFiles(props) {
show={isExpired}
headMsg={t("expired-doc-title")}
bodyMssg={t("expired-on-mssg", { expiredDate })}
isDownloadBtn={true}
handleDownloadBtn={handleDownloadBtn}
/>
{!isEmailVerified && (
<VerifyEmail
@@ -1723,7 +1690,6 @@ function PdfRequestFiles(props) {
handleResend={handleResend}
/>
)}
<ModalUi
isOpen={isPublicContact}
title={isOtp ? t("verify-email-1") : t("contact-details")}
apps/OpenSign/src/primitives/PdfDeclineModal.js
+17 -15
View File
@@ -2,27 +2,30 @@ import React, { useState } from "react";
import "../styles/signature.css";
import { useTranslation } from "react-i18next";
function CustomModal({
show,
headMsg,
bodyMssg,
footerMessage,
declineDoc,
setIsDecline
}) {
function CustomModal(props) {
const { t } = useTranslation();
const [reason, setReason] = useState("");
return (
show && (
props.show && (
<dialog className="op-modal op-modal-open absolute z-[448]">
<div className="w-[95%] md:w-[60%] lg:w-[40%] op-modal-box p-0 overflow-y-auto hide-scrollbar text-sm">
<h3 className="text-base-content font-bold text-lg pt-[15px] px-[20px]">
{headMsg && headMsg}
{props?.headMsg && props?.headMsg}
</h3>
<div className="p-[10px] px-[20px]">
<p className="text-[15px]">{bodyMssg && bodyMssg}</p>
<p className="text-[15px]">{props.bodyMssg && props.bodyMssg}</p>
</div>
{footerMessage && (
{props.isDownloadBtn && (
<div className="flex justify-start w-full ml-[20px] mb-3 mt-1">
<button
className="op-btn op-btn-primary "
onClick={() => props.handleDownloadBtn()}
>
Download
</button>
</div>
)}
{props.footerMessage && (
<>
<div className="mx-3">
<textarea
@@ -33,14 +36,13 @@ function CustomModal({
onChange={(e) => setReason(e.target.value)}
></textarea>
</div>
{/* <div className="h-[1px] bg-[#9f9f9f] w-full"></div> */}
<div className="m-[15px]">
<button
className="op-btn op-btn-primary mr-2 px-6"
type="button"
onClick={() => {
setReason("");
declineDoc(reason);
props.declineDoc(reason);
}}
>
{t("yes")}
@@ -50,7 +52,7 @@ function CustomModal({
className="op-btn op-btn-secondary"
onClick={() => {
setReason("");
setIsDecline({ isDeclined: false });
props.setIsDecline({ isDeclined: false });
}}
>
{t("close")}