🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
Merge pull request #1137 from nxglabs/signers_completed_main
prafull-opensignlabse8577245026a
diff --git a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsxindex 4beff6010..58fbbadae 100644--- a/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx+++ b/apps/OpenSign/src/components/pdf/WidgetsValueModal.jsx@@ -551,8 +551,8 @@ function WidgetsValueModal(props) {// below code is used to save or update default signature, initials, stamptry {const signCls = new Parse.Object("contracts_Signature");- if (props?.saveSignCheckbox?.signId) {- signCls.id = props.saveSignCheckbox.signId;+ if (saveSignCheckbox?.signId) {+ signCls.id = saveSignCheckbox.signId;}if (currWidgetsDetails?.type === "initials") {signCls.set("Initials", imageUrl);diff --git a/apps/OpenSign/src/constant/Utils.jsx b/apps/OpenSign/src/constant/Utils.jsxindex 2db56cedb..a960454ab 100644--- a/apps/OpenSign/src/constant/Utils.jsx+++ b/apps/OpenSign/src/constant/Utils.jsx@@ -3729,4 +3729,3 @@ export function convertJpegToPng(base64Image, filename) {});}}-diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.jsx b/apps/OpenSign/src/pages/PdfRequestFiles.jsxindex bd59c5ee0..c7e7804f9 100644--- a/apps/OpenSign/src/pages/PdfRequestFiles.jsx+++ b/apps/OpenSign/src/pages/PdfRequestFiles.jsx@@ -75,9 +75,6 @@ function PdfRequestFiles(const { t } = useTranslation();const dispatch = useDispatch();const isShowModal = useSelector((state) => state.widget.isShowModal);- const saveSignCheckbox = useSelector(- (state) => state.widget.saveSignCheckbox- );const defaultSignImg = useSelector((state) => state.widget.defaultSignImg);const myInitial = useSelector((state) => state.widget.myInitial);const appName =@@ -484,12 +481,7 @@ function PdfRequestFiles(} else {setRequestSignTour(false);}- dispatch(- setSaveSignCheckbox({- ...saveSignCheckbox,- isVisible: true- })- );+//function to get default signatur of current user from `contracts_Signature` classconst defaultSignRes = await getDefaultSignature(jsonSender?.objectId@@ -497,7 +489,6 @@ function PdfRequestFiles(if (defaultSignRes?.status === "success") {dispatch(setSaveSignCheckbox({- ...saveSignCheckbox,isVisible: true,signId: defaultSignRes?.res?.id})@@ -506,6 +497,8 @@ function PdfRequestFiles(const initials = defaultSignRes?.res?.defaultInitial || "";dispatch(setDefaultSignImg(sign));dispatch(setMyInitial(initials));+ } else {+ dispatch(setSaveSignCheckbox({ isVisible: true }));}} else if (res?.length === 0) {const res = await contactBook(currUserId);@@ -642,7 +635,7 @@ function PdfRequestFiles((data) => data.signerObjId === signerObjectId);if (checkUser && checkUser.length > 0) {- const status = handleCheckResponse(checkUser,setminRequiredCount)+ const status = handleCheckResponse(checkUser, setminRequiredCount);if (status?.showAlert) {setUnSignedWidgetId(status?.widgetKey);setPageNumber(status?.tourPageNumber);@@ -1377,7 +1370,7 @@ function PdfRequestFiles(setIsUiLoading(false);alert(t("expiry-date-error"));}- };+ };// `handleRedirectCancel` is used to cancel redirecting to redirectUrlconst handleRedirectCancel = () => {setIsredirectCanceled(true);diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.jsx b/apps/OpenSign/src/pages/SignyourselfPdf.jsxindex 81971123d..6da6ab0c0 100644--- a/apps/OpenSign/src/pages/SignyourselfPdf.jsx+++ b/apps/OpenSign/src/pages/SignyourselfPdf.jsx@@ -77,9 +77,6 @@ function SignYourSelf() {const { docId } = useParams();const dispatch = useDispatch();const isShowModal = useSelector((state) => state.widget.isShowModal);- const saveSignCheckbox = useSelector(- (state) => state.widget.saveSignCheckbox- );const appName ="OpenSignâ„¢";const divRef = useRef(null);@@ -268,13 +265,14 @@ function SignYourSelf() {if (defaultSignRes?.status === "success") {dispatch(setSaveSignCheckbox({- ...saveSignCheckbox,isVisible: true,signId: defaultSignRes?.res?.id}));dispatch(setDefaultSignImg(defaultSignRes?.res?.defaultSignature));dispatch(setMyInitial(defaultSignRes?.res?.defaultInitial));+ } else {+ dispatch(setSaveSignCheckbox({ isVisible: true }));}const contractUsersRes = await contractUsers();if (contractUsersRes === "Error: Something went wrong!") {@@ -283,8 +281,6 @@ function SignYourSelf() {} else if (contractUsersRes[0] && contractUsersRes.length > 0) {setContractName("_Users");setSignerUserId(contractUsersRes[0].objectId);- dispatch(setSaveSignCheckbox({ ...saveSignCheckbox, isVisible: true }));-const tourstatuss =contractUsersRes[0].TourStatus && contractUsersRes[0].TourStatus;if (tourstatuss && tourstatuss.length > 0 && !isCompleted) {@@ -1046,12 +1042,18 @@ function SignYourSelf() {const setCellCount = (key, newCount) => {setXyPosition((prev) => {- const getPageNumer = prev.filter((data) => data.pageNumber === pageNumber);+ const getPageNumer = prev.filter(+ (data) => data.pageNumber === pageNumber+ );if (getPageNumer.length > 0) {const updatePos = getPageNumer[0].pos.map((p) =>- p.key === key ? { ...p, options: { ...p.options, cellCount: newCount } } : p+ p.key === key+ ? { ...p, options: { ...p.options, cellCount: newCount } }+ : p+ );+ return prev.map((obj, ind) =>+ ind === index ? { ...obj, pos: updatePos } : obj);- return prev.map((obj, ind) => (ind === index ? { ...obj, pos: updatePos } : obj));}return prev;});@@ -1082,7 +1084,8 @@ function SignYourSelf() {cellCount: count,defaultValue: (defaultdata?.defaultValue || "").slice(0, count),fontSize: newFontSize || position.options?.fontSize || 12,- fontColor: newFontColor || position.options?.fontColor || "black"+ fontColor:+ newFontColor || position.options?.fontColor || "black"}};} else {diff --git a/apps/OpenSign/src/pages/UserProfile.jsx b/apps/OpenSign/src/pages/UserProfile.jsxindex 17f286a3f..a3e2670a1 100644--- a/apps/OpenSign/src/pages/UserProfile.jsx+++ b/apps/OpenSign/src/pages/UserProfile.jsx@@ -286,7 +286,9 @@ function UserProfile() {style={{ width: `${percentage}%` }}></div></div>- <span className="text-base-contentk text-sm">{percentage}%</span>+ <span className="text-base-contentk text-sm">+ {percentage}%+ </span></div>)}<div className="text-base font-semibold pt-4">