{
setPrefillSigner([utils?.prefillObj()]);
}
setSignersData(updatedSigners);
- setUniqueId(updatedSigners[0].Id);
- setBlockColor(updatedSigners[0].blockColor);
+ setUniqueId(updatedSigners[0]?.Id);
+ setBlockColor(updatedSigners[0]?.blockColor);
setIsSelectId(0);
} else {
const updatedSigners = documentData[0].Signers.map((x, index) => ({
@@ -358,8 +358,8 @@ const TemplatePlaceholder = () => {
Role: "Role " + (index + 1)
}));
setSignersData(updatedSigners);
- setUniqueId(updatedSigners[0].Id);
- setBlockColor(updatedSigners[0].blockColor);
+ setUniqueId(updatedSigners[0]?.Id);
+ setBlockColor(updatedSigners[0]?.blockColor);
setPrefillSigner([utils?.prefillObj()]);
}
} else {
@@ -437,7 +437,6 @@ const TemplatePlaceholder = () => {
const addPositionOfSignature = (item, monitor) => {
getSignerPos(item, monitor);
};
-
// `getSignerPos` is used to get placeholder position when user place it and save it in array
const getSignerPos = (item, monitor) => {
if (uniqueId) {
@@ -483,7 +482,8 @@ const TemplatePlaceholder = () => {
options: addWidgetOptions(
dragTypeValue,
owner,
- filterSignerPos?.placeHolder
+ filterSignerPos?.placeHolder,
+ roleName
),
Width: widgetWidth / (containerScale * scale),
Height: widgetHeight / (containerScale * scale)
@@ -517,7 +517,8 @@ const TemplatePlaceholder = () => {
options: addWidgetOptions(
dragTypeValue,
owner,
- filterSignerPos?.placeHolder
+ filterSignerPos?.placeHolder,
+ roleName
),
Width: widgetWidth / (containerScale * scale),
Height: widgetHeight / (containerScale * scale)
@@ -614,7 +615,6 @@ const TemplatePlaceholder = () => {
setIsAddRole(true);
}
};
-
const tourAddRole = [
{
selector: '[data-tut="reactourAddbtn"]',
@@ -1774,12 +1774,12 @@ const TemplatePlaceholder = () => {
setSignBtnPosition={setSignBtnPosition}
pageNumber={pageNumber}
pdfBase64Url={pdfBase64Url}
- signedUrl={pdfDetails?.[0]?.SignedUrl || ""}
setPdfArrayBuffer={setPdfArrayBuffer}
setPdfBase64Url={setPdfBase64Url}
setIsUploadPdf={setIsUploadPdf}
pdfArrayBuffer={pdfArrayBuffer}
isMergePdfBtn={true}
+ pdfDetails={pdfDetails}
/>
{/* pdf render view */}
@@ -1799,6 +1799,7 @@ const TemplatePlaceholder = () => {
allPages={allPages}
setAllPages={setAllPages}
setPageNumber={setPageNumber}
+ pdfDetails={pdfDetails}
/>
{
const width = reduceWidth;
const isBottom = position === "bottom" ? "items-end pb-2 !bg-black/10" : "";
+ const crossBtnColor = crossColor ?? "text-base-content";
return (
<>
{isOpen && (
@@ -38,7 +40,7 @@ const ModalUi = ({
)}
{showClose && (
handleClose && handleClose()}
>
✕
diff --git a/apps/OpenSign/src/reports/document/DocumentsReport.jsx b/apps/OpenSign/src/reports/document/DocumentsReport.jsx
index 712c6e4c0..cce0f5330 100644
--- a/apps/OpenSign/src/reports/document/DocumentsReport.jsx
+++ b/apps/OpenSign/src/reports/document/DocumentsReport.jsx
@@ -330,6 +330,8 @@ const DocumentsReport = (props) => {
setIsModal({ [`extendexpiry_${item.objectId}`]: true });
}
};
+
+
// Get current list
const indexOfLastDoc = currentPage * props.docPerPage;
const indexOfFirstDoc = indexOfLastDoc - props.docPerPage;
@@ -792,6 +794,7 @@ const DocumentsReport = (props) => {
};
const handleCloseModal = () => {
+ setError("");
setIsModal({});
};
const handleSaveAsTemplate = async (doc) => {
diff --git a/apps/OpenSign/src/reports/template/TemplatesReport.jsx b/apps/OpenSign/src/reports/template/TemplatesReport.jsx
index 3744bb74b..5b14cb437 100644
--- a/apps/OpenSign/src/reports/template/TemplatesReport.jsx
+++ b/apps/OpenSign/src/reports/template/TemplatesReport.jsx
@@ -30,7 +30,7 @@ import "../../styles/quill.css";
import BulkSendUi from "../../components/BulkSendUi";
import Loader from "../../primitives/Loader";
import { serverUrl_fn } from "../../constant/appinfo";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
import { useElSize } from "../../hook/useElSize";
import LottieWithLoader from "../../primitives/DotLottieReact";
import PrefillWidgetModal from "../../components/pdf/PrefillWidgetsModal";
@@ -67,7 +67,7 @@ const TemplatesReport = (props) => {
const [userDetails, setUserDetails] = useState({});
const [isNextStep, setIsNextStep] = useState({});
const [isBulkSend, setIsBulkSend] = useState({});
- const [templateDeatils, setTemplateDetails] = useState({});
+ const [templateDetails, setTemplateDetails] = useState({});
const [placeholders, setPlaceholders] = useState([]);
const [isLoader, setIsLoader] = useState({});
const [isShareWith, setIsShareWith] = useState({});
@@ -239,9 +239,8 @@ const TemplatesReport = (props) => {
);
if (checkIsSignatureExist) {
setActLoader({ [`${item.objectId}_${act.btnId}`]: true });
- const templateDeatils = await fetchTemplate(item.objectId);
- const templateData =
- templateDeatils.data && templateDeatils.data.result;
+ const template = await fetchTemplate(item.objectId);
+ const templateData = template.data && template.data.result;
if (!templateData.error) {
setXyPosition(templateData?.Placeholders);
const signer = utils.handleSignersList(templateData);
@@ -284,7 +283,7 @@ const TemplatesReport = (props) => {
}
}
);
- if (axiosRes) {
+ if (axiosRes?.data) {
return axiosRes;
}
} catch (e) {
@@ -297,10 +296,10 @@ const TemplatesReport = (props) => {
const navigatePageToDoc = async (templateRes, placeholder, signer) => {
setIsPrefillModal({});
const res = await createDocument(
- [templateRes || templateDeatils],
+ [templateRes || templateDetails],
placeholder || xyPosition,
signer || signerList,
- templateRes?.URL || templateDeatils?.URL
+ templateRes?.URL || templateDetails?.URL
);
if (res.status === "success") {
navigate(`/placeHolderSign/${res.id}`, {
@@ -879,8 +878,8 @@ const TemplatesReport = (props) => {
signerList,
setIsPrefillModal,
scale,
- templateDeatils?.URL,
- [templateDeatils],
+ templateDetails?.URL,
+ [templateDetails],
prefillImg,
extClass?.[0]?.UserId?.objectId,
);
@@ -1332,7 +1331,7 @@ const TemplatesReport = (props) => {
) : (