From 0072e3e5ba5bd305d2b7bd654d57b3bed1a648b4 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Fri, 9 Aug 2024 13:43:39 +0530 Subject: [PATCH] refactor code --- apps/OpenSign/src/components/AddSigner.js | 4 ++- apps/OpenSign/src/components/AddUser.js | 5 ++- .../src/components/pdf/EmailComponent.js | 2 +- apps/OpenSign/src/constant/Utils.js | 32 ++++++++----------- apps/OpenSign/src/layout/HomeLayout.js | 1 + apps/OpenSign/src/pages/AddAdmin.js | 6 +++- apps/OpenSign/src/pages/ForgetPassword.js | 5 ++- apps/OpenSign/src/pages/Login.js | 5 ++- apps/OpenSign/src/pages/PdfRequestFiles.js | 8 +++-- apps/OpenSign/src/pages/Report.js | 1 - apps/OpenSign/src/pages/Signup.js | 4 ++- .../src/pages/UpdateExistUserAdmin.js | 4 ++- apps/OpenSign/src/primitives/AddContact.js | 4 ++- .../src/primitives/GetReportDisplay.js | 3 +- .../cloud/parsefunction/GetPublicTemplate.js | 5 ++- 15 files changed, 55 insertions(+), 34 deletions(-) diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.js index 8f4eb528d..24e73de24 100644 --- a/apps/OpenSign/src/components/AddSigner.js +++ b/apps/OpenSign/src/components/AddSigner.js @@ -247,7 +247,9 @@ const AddSigner = (props) => { type="email" id="email" value={email} - onChange={(e) => setEmail(e.target.value?.toLowerCase())} + onChange={(e) => + setEmail(e.target.value?.toLowerCase?.replace(/\s/g, "")) + } required onInvalid={(e) => e.target.setCustomValidity(t("input-required"))} onInput={(e) => e.target.setCustomValidity("")} diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 4eee75af4..4bf1f335a 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -241,7 +241,10 @@ const AddUser = (props) => { } }; const handleChange = (e) => { - setFormdata((prev) => ({ ...prev, [e.target.name]: e.target.value })); + setFormdata((prev) => ({ + ...prev, + [e.target.name]: e.target.value?.toLowerCase()?.replace(/\s/g, "") + })); }; const copytoclipboard = (text) => { diff --git a/apps/OpenSign/src/components/pdf/EmailComponent.js b/apps/OpenSign/src/components/pdf/EmailComponent.js index 7f9afd162..948f58994 100644 --- a/apps/OpenSign/src/components/pdf/EmailComponent.js +++ b/apps/OpenSign/src/components/pdf/EmailComponent.js @@ -113,7 +113,7 @@ function EmailComponent({ }; //function for get email value const handleEmailValue = (e) => { - const value = e.target.value; + const value = e.target.value?.toLowerCase()?.replace(/\s/g, ""); setEmailErr(false); setEmailValue(value); }; diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index 3321d35e1..d12927fe5 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/apps/OpenSign/src/constant/Utils.js @@ -2237,25 +2237,21 @@ export const saveLanguageInLocal = (i18n) => { //function to get default signatur eof current user from `contracts_Signature` class export const getDefaultSignature = async (objectId) => { try { - const result = await axios.get( - `${localStorage.getItem( - "baseUrl" - )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${objectId}"}}`, - { - headers: { - "Content-Type": "application/json", - "X-Parse-Application-Id": localStorage.getItem("parseAppId"), - "X-Parse-Session-Token": localStorage.getItem("accesstoken") - } - } - ); - const res = result.data?.results; - if (res[0] && res.length > 0) { - const defaultSignature = res[0]?.ImageURL - ? await getBase64FromUrl(res[0]?.ImageURL, true) + const query = new Parse.Query("contracts_Signature"); + query.equalTo("UserId", { + __type: "Pointer", + className: "_User", + objectId: objectId + }); + + const result = await query.first(); + if (result) { + const res = JSON.parse(JSON.stringify(result)); + const defaultSignature = res?.ImageURL + ? await getBase64FromUrl(res?.ImageURL, true) : ""; - const defaultInitial = res[0]?.Initials - ? await getBase64FromUrl(res[0]?.Initials, true) + const defaultInitial = res?.Initials + ? await getBase64FromUrl(res?.Initials, true) : ""; return { diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index a9cb67e5e..7c7fca29c 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -38,6 +38,7 @@ const HomeLayout = () => { useEffect(() => { const language = localStorage.getItem("i18nextLng"); i18n.changeLanguage(language); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); useEffect(() => { diff --git a/apps/OpenSign/src/pages/AddAdmin.js b/apps/OpenSign/src/pages/AddAdmin.js index 82c5da286..5214109b4 100644 --- a/apps/OpenSign/src/pages/AddAdmin.js +++ b/apps/OpenSign/src/pages/AddAdmin.js @@ -310,7 +310,11 @@ const AddAdmin = () => { type="email" className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" value={email} - onChange={(e) => setEmail(e.target.value?.toLowerCase())} + onChange={(e) => + setEmail( + e.target.value?.toLowerCase()?.replace(/\s/g, "") + ) + } onInvalid={(e) => e.target.setCustomValidity(t("input-required")) } diff --git a/apps/OpenSign/src/pages/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.js index 0bab81f53..5591df965 100644 --- a/apps/OpenSign/src/pages/ForgetPassword.js +++ b/apps/OpenSign/src/pages/ForgetPassword.js @@ -24,7 +24,10 @@ function ForgotPassword() { const [image, setImage] = useState(); const handleChange = (event) => { - const { name, value } = event.target; + let { name, value } = event.target; + if (name === "email") { + value = value?.toLowerCase()?.replace(/\s/g, ""); + } setState({ ...state, [name]: value }); }; diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index 43f085a19..04a0887d5 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -74,7 +74,10 @@ function Login() { dispatch(fetchAppInfo()); }; const handleChange = (event) => { - const { name, value } = event.target; + let { name, value } = event.target; + if (name === "email") { + value = value?.toLowerCase()?.replace(/\s/g, ""); + } setState({ ...state, [name]: value }); }; diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index b2fedc8fd..fbded6bce 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -1473,7 +1473,11 @@ function PdfRequestFiles(props) { }; const handleInputChange = (e) => { - setContact((prev) => ({ ...prev, [e.target.name]: e.target.value })); + let { name, value } = e.target; + if (name === "email") { + value = value?.toLowerCase()?.replace(/\s/g, ""); + } + setContact({ ...contact, [name]: value }); }; const SendOtp = async () => { @@ -1781,7 +1785,7 @@ function PdfRequestFiles(props) { { json.actions.map((data) => { const newConfig = { selector: `[data-tut="${data?.selector}"]`, - content: () => ( { className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" value={email} onChange={(e) => - setEmail(e.target.value?.toLowerCase()) + setEmail( + e.target.value?.toLowerCase()?.replace(/\s/g, "") + ) } onInvalid={(e) => e.target.setCustomValidity(t("input-required")) diff --git a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js b/apps/OpenSign/src/pages/UpdateExistUserAdmin.js index 50b104c99..dac0a6fe5 100644 --- a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js +++ b/apps/OpenSign/src/pages/UpdateExistUserAdmin.js @@ -119,7 +119,9 @@ const UpdateExistUserAdmin = () => { onChange={(e) => setFormdata((prev) => ({ ...prev, - email: e.target.value?.toLowerCase() + email: e.target.value + ?.toLowerCase() + ?.replace(/\s/g, "") })) } onInvalid={(e) => diff --git a/apps/OpenSign/src/primitives/AddContact.js b/apps/OpenSign/src/primitives/AddContact.js index 73c9b7d2a..46155a5c3 100644 --- a/apps/OpenSign/src/primitives/AddContact.js +++ b/apps/OpenSign/src/primitives/AddContact.js @@ -222,7 +222,9 @@ const AddContact = (props) => { type="email" id="email" value={email} - onChange={(e) => setEmail(e.target.value?.toLowerCase())} + onChange={(e) => + setEmail(e.target.value?.toLowerCase()?.replace(/\s/g, "")) + } onInvalid={(e) => e.target.setCustomValidity(t("input-required"))} onInput={(e) => e.target.setCustomValidity("")} required diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index ac17cb183..2890ce043 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1198,7 +1198,8 @@ const ReportTable = (props) => { )} {props.heading.includes("Folder") && ( - {item?.Folder?.Name || t("OpenSign™ Drive")} + {item?.Folder?.Name || + t("sidebar.OpenSign™ Drive")} )} diff --git a/apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js b/apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js index a33d04bc0..9233981ec 100644 --- a/apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js +++ b/apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js @@ -21,12 +21,11 @@ async function GetPublicTemplate(request) { templatQuery.equalTo('IsPublic', true); templatQuery.notEqualTo('IsArchive', true); const getTemplate = await templatQuery.find({ useMasterKey: true }); - const extcls = new Parse.Query('contracts_Users'); - extcls.equalTo('email', user.get('email')); + extcls.equalTo('Email', user.get('email')); const res = await extcls.first({ useMasterKey: true }); if (res) { - const _res = JSON.parse(JSON.stringify(_res)); + const _res = JSON.parse(JSON.stringify(res)); return { template: getTemplate, user: user,