Skip to content

🔥 The free & Open Source DocuSign alternative

Fix: issues in quick send

prafull-opensignlabsc491595fc8e6
diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.js b/apps/OpenSign/src/components/pdf/PdfHeader.js
index 4d6a280f9..ad230f29d 100644
--- a/apps/OpenSign/src/components/pdf/PdfHeader.js
+++ b/apps/OpenSign/src/components/pdf/PdfHeader.js
@@ -40,7 +40,7 @@ function Header({
signerPos && signerPos?.filter((data) => data.Role !== "prefill");
const isMobile = window.innerWidth < 767;
const navigate = useNavigate();
- const [isCertificate, setIsCertificate] = useState(false);
+ const [isDownloading, setIsDownloading] = useState("");
const isGuestSigner = localStorage.getItem("isGuestSigner");
//for go to previous page
function previousPage() {
@@ -62,7 +62,7 @@ function Header({
//function for print digital sign pdf
const handleToPrint = async (event) => {
event.preventDefault();
-
+ setIsDownloading("pdf");
try {
// const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
const axiosRes = await axios.post(
@@ -93,10 +93,13 @@ function Header({
const blob = new Blob([byteArray], { type: "application/pdf" });
const blobUrl = URL.createObjectURL(blob);
window.open(blobUrl, "_blank");
+ setIsDownloading("");
} else {
printModule({ printable: pdf, type: "pdf", base64: true });
+ setIsDownloading("");
}
} catch (err) {
+ setIsDownloading("");
console.log("err in getsignedurl", err);
alert("something went wrong, please try again later.");
}
@@ -104,6 +107,7 @@ function Header({
//handle download signed pdf
const handleDownloadPdf = async () => {
+ setIsDownloading("pdf");
const pdfName = pdfDetails[0] && pdfDetails[0].Name;
try {
// const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
@@ -120,8 +124,10 @@ function Header({
);
const url = axiosRes.data.result;
saveAs(url, `${sanitizeFileName(pdfName)}_signed_by_OpenSignâ„¢.pdf`);
+ setIsDownloading("");
} catch (err) {
console.log("err in getsignedurl", err);
+ setIsDownloading("");
alert("something went wrong, please try again later.");
}
};
@@ -142,7 +148,7 @@ function Header({
console.log("err in download in certificate", err);
}
} else {
- setIsCertificate(true);
+ setIsDownloading("certificate");
try {
const data = {
docId: pdfDetails[0]?.objectId
@@ -164,12 +170,13 @@ function Header({
await fetch(doc?.CertificateUrl);
const certificateUrl = doc?.CertificateUrl;
saveAs(certificateUrl, `Certificate_signed_by_OpenSignâ„¢.pdf`);
- setIsCertificate(false);
+ setIsDownloading("");
} else {
- setIsCertificate(true);
+ setIsDownloading("certificate");
}
}
} catch (err) {
+ setIsDownloading("");
console.log("err in download in certificate", err);
alert("something went wrong, please try again later.");
}
@@ -628,12 +635,25 @@ function Header({
)}
</div>
)}
+ {isDownloading === "pdf" && (
+ <div className="fixed z-[200] inset-0 flex justify-center items-center bg-black bg-opacity-30">
+ <div
+ style={{ fontSize: "45px", color: "#3dd3e0" }}
+ className="loader-37"
+ ></div>
+ </div>
+ )}
<ModalUi
- isOpen={isCertificate}
- title={"Generating certificate"}
- handleClose={() => setIsCertificate(false)}
+ isOpen={isDownloading === "certificate"}
+ title={
+ isDownloading === "certificate"
+ ? "Generating certificate"
+ : "PDF Download"
+ }
+ handleClose={() => setIsDownloading("")}
>
<div className="p-3 md:p-5 text-[13px] md:text-base text-center">
+ {isDownloading === "certificate"}{" "}
<p>
Your completion certificate is being generated. Please wait
momentarily.
diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js
index 705ce8fb9..e0cceda69 100644
--- a/apps/OpenSign/src/json/ReportJson.js
+++ b/apps/OpenSign/src/json/ReportJson.js
@@ -3,7 +3,7 @@ export default function reportJson(id) {
const head = ["Sr.No", "Title", "Note", "Folder", "File", "Owner", "Signers"];
const contactbook = ["Sr.No", "Title", "Email", "Phone"];
const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
- const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
+ const templateReport = ["Sr.No", "Title", "File", "Owner", "Roles"];
switch (id) {
// draft documents report
case "ByHuevtCFY":
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 0cc5fb9c2..2b3a3f976 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -783,7 +783,10 @@ function PdfRequestFiles() {
(x) => x.Email === jsonSender.email
);
const newIndex = index + 1;
- const user = pdfDetails?.[0].Signers[newIndex];
+ const usermail = {
+ Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
+ };
+ const user = usermail || pdfDetails?.[0]?.Signers[newIndex];
if (sendmail !== "false" && sendInOrder) {
const requestBody = pdfDetails?.[0]?.RequestBody;
const requestSubject = pdfDetails?.[0]?.RequestSubject;
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index 88cb44c97..412cb6550 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -43,7 +43,7 @@ const ReportTable = (props) => {
const [templateDeatils, setTemplateDetails] = useState({});
const [placeholders, setPlaceholders] = useState([]);
const [isLoader, setIsLoader] = useState({});
-
+ const [isViewShare, setIsViewShare] = useState({});
const startIndex = (currentPage - 1) * props.docPerPage;
const { isMoreDocs, setIsNextRecord } = props;
// For loop is used to calculate page numbers visible below table
@@ -340,9 +340,9 @@ const ReportTable = (props) => {
await axios
.put(
- `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
- "_appName"
- )}_Document/${item.objectId}`,
+ `${localStorage.getItem("baseUrl")}classes/contracts_Document/${
+ item.objectId
+ }`,
data,
{
headers: {
@@ -578,9 +578,15 @@ const ReportTable = (props) => {
};
try {
const res = await axios.post(url, params, { headers: headers });
- if (res) {
+ if (res?.data?.result?.status === "success") {
setIsAlert(true);
setAlertMsg({ type: "success", message: "Mail sent successfully." });
+ } else {
+ setIsAlert(true);
+ setAlertMsg({
+ type: "danger",
+ message: "Something went wrong, please try again later!"
+ });
}
} catch (err) {
console.log("err in sendmail", err);
@@ -681,6 +687,9 @@ const ReportTable = (props) => {
setTimeout(() => setIsAlert(false), 1500);
}
};
+ const handleViewSigners = (item) => {
+ setIsViewShare({ [item.objectId]: true });
+ };
return (
<div className="relative">
{Object.keys(actLoader)?.length > 0 && (
@@ -835,7 +844,17 @@ const ReportTable = (props) => {
{formatRow(item?.ExtUserPtr)}
</td>
<td className="px-4 py-2">
- {item?.Signers ? formatRow(item?.Signers) : "-"}
+ {/* {item?.Signers ? formatRow(item?.Signers) : "-"} */}
+ {item?.Placeholders ? (
+ <button
+ onClick={() => handleViewSigners(item)}
+ className="text-[blue] hover:underline focus:outline-none"
+ >
+ View
+ </button>
+ ) : (
+ "-"
+ )}
</td>
<td className="px-2 py-2 text-white flex flex-row gap-x-2 gap-y-1 justify-center items-center">
{props.actions?.length > 0 &&
@@ -865,19 +884,21 @@ const ReportTable = (props) => {
)}
{isOption[item.objectId] &&
act.action === "option" && (
- <div className="absolute -right-2 top-5 bg-white text-nowrap rounded shadow z-[20] overflow-hidden">
+ <div className="absolute -right-2 top-5 p-1.5 bg-white text-nowrap rounded shadow-md z-[20] overflow-hidden">
{act.subaction?.map((subact) => (
<div
key={subact.btnId}
- className="hover:bg-gray-300 cursor-pointer px-2 py-1.5 flex justify-start items-center text-black"
+ className="hover:bg-gray-300 rounded cursor-pointer px-2 py-1.5 flex justify-start items-center text-black"
onClick={() =>
handleActionBtn(subact, item)
}
title={subact.hoverLabel}
>
- <i className={subact.btnIcon}></i>
+ <i
+ className={`${subact.btnIcon} mr-1.5`}
+ ></i>
{subact.btnLabel && (
- <span className="ml-[4px] text-xs capitalize">
+ <span className="ml-[4px] text-[13px] capitalize font-medium">
{subact.btnLabel}
</span>
)}
@@ -887,6 +908,48 @@ const ReportTable = (props) => {
)}
</button>
))}
+ {isViewShare[item.objectId] && (
+ <div className="fixed z-[999] inset-0 w-full h-full bg-black bg-opacity-[75%]">
+ <div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[400px] overflow-y-auto max-h-[340px] md:max-h-[400px] hide-scrollbar">
+ <div
+ className="cursor-pointer absolute text-white text-[22px] font-medium rounded-full z-50 top-1 right-3"
+ onClick={() => setIsViewShare({})}
+ >
+ &times;
+ </div>
+
+ <table className="table-auto w-full">
+ <thead className="text-white h-[38px] sticky top-0 bg-[#32a3ac]">
+ <tr>
+ {props.ReportName === "Templates" && (
+ <th className="p-2">Roles</th>
+ )}
+ <th className="p-2">Signers</th>
+ </tr>
+ </thead>
+ <tbody>
+ {item.Placeholders.map((x, i) => (
+ <tr
+ key={i}
+ className="text-sm font-normal text-black odd:bg-white even:bg-gray-200"
+ >
+ {props.ReportName === "Templates" && (
+ <td className="text-[13px] md:text-sm font-semibold p-2 ">
+ {x.Role && x.Role}
+ </td>
+ )}
+ <td className="text-[13px] md:text-sm p-2 break-all">
+ {x.email
+ ? x.email
+ : x?.signerPtr?.Email || "-"}
+ </td>
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ )}
{isDeleteModal[item.objectId] && (
<ModalUi
isOpen
diff --git a/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js b/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js
index 5b0f03442..ddc7be964 100644
--- a/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js
+++ b/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js
@@ -99,8 +99,8 @@ export default async function linkContactToDoc(req) {
};
updateDoc.set('Placeholders', Placeholders);
const Acl = docRes.getACL();
- Acl.setReadAccess(existContact.get('CreatedBy').id, true);
- Acl.setWriteAccess(existContact.get('CreatedBy').id, true);
+ Acl.setReadAccess(existContact.get('UserId').id, true);
+ Acl.setWriteAccess(existContact.get('UserId').id, true);
updateDoc.setACL(Acl);
// const parseData = JSON.parse(JSON.stringify(res));
const resDoc = await updateDoc.save(null, { useMasterKey: true });
diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
index 229d0b64c..64c5cf522 100644
--- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
+++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
@@ -27,6 +27,7 @@ export default function reportJson(id, userId) {
'Signers.Name',
'Signers.Email',
'Signers.Phone',
+ 'Placeholders',
],
};
@@ -67,6 +68,7 @@ export default function reportJson(id, userId) {
'Signers.Phone',
'Signers.UserId',
'AuditTrail',
+ 'Placeholders',
],
};
// In progess report
@@ -131,6 +133,7 @@ export default function reportJson(id, userId) {
'Signers.Email',
'Signers.Phone',
'TimeToCompleteDays',
+ 'Placeholders',
],
};
@@ -158,6 +161,7 @@ export default function reportJson(id, userId) {
'Signers.Name',
'Signers.Email',
'Signers.Phone',
+ 'Placeholders',
],
};
// Expired Documents report
@@ -188,6 +192,7 @@ export default function reportJson(id, userId) {
'Signers.Name',
'Signers.Email',
'Signers.Phone',
+ 'Placeholders',
],
};
// Recently sent for signatures report show on dashboard
@@ -259,6 +264,7 @@ export default function reportJson(id, userId) {
'AuditTrail',
'Signers.Email',
'Signers.Phone',
+ 'Placeholders',
],
};
// Drafts report show on dashboard
@@ -286,6 +292,7 @@ export default function reportJson(id, userId) {
'Signers.Name',
'Signers.Email',
'Signers.Phone',
+ 'Placeholders',
],
};
// contact book report
diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.js
index 1b459fc3b..9f7ab88ac 100644
--- a/apps/OpenSignServer/index.js
+++ b/apps/OpenSignServer/index.js
@@ -101,7 +101,7 @@ export const config = {
masterKey: process.env.MASTER_KEY, //Add your master key here. Keep it secret!
masterKeyIps: ['0.0.0.0/0', '::/0'], // '::1'
serverURL: 'http://localhost:8080/app', // Don't forget to change to https if needed
- verifyUserEmails: isMailAdapter === true ? true : false,
+ verifyUserEmails: false,
publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app',
// Your apps name. This will appear in the subject and body of the emails that are sent.
appName: 'Opensign',