This is an automated email from " + appName + ". For any queries regarding this email, please contact the sender " + @@ -3161,3 +3166,22 @@ export const checkRegularExpress = (validateType, setValidatePlaceholder) => { setValidatePlaceholder("please enter value"); } }; + //function to use unlink signer from widgets + export const handleUnlinkSigner = (signerPos,setSignerPos,signersdata,setSignersData,uniqueId) => { + //remove existing signer's details from 'signerPos' array + const updatePlaceHolder = signerPos.map((x) => { + if (x.Id === uniqueId) { + return { ...x, signerPtr: {}, signerObjId: "" }; + } + return { ...x }; + }); + setSignerPos(updatePlaceHolder); + //remove existing signer's details from 'signersdata' array and keep role and id + const updateSigner = signersdata.map((item) => { + if (item.Id == uniqueId) { + return { Role: item.Role, Id: item.Id, blockColor: item.blockColor }; + } + return item; + }); + setSignersData(updateSigner); + }; diff --git a/apps/OpenSign/src/constant/appinfo.js b/apps/OpenSign/src/constant/appinfo.js index a41cff14c..f8e615f5b 100644 --- a/apps/OpenSign/src/constant/appinfo.js +++ b/apps/OpenSign/src/constant/appinfo.js @@ -1,9 +1,12 @@ import logo from "../assets/images/logo.png"; +import { getEnv } from "./Utils"; export function serverUrl_fn() { - let baseUrl = process.env.REACT_APP_SERVERURL - ? process.env.REACT_APP_SERVERURL - : window.location.origin + "/api/app"; + const env = getEnv(); + const serverurl = env?.REACT_APP_SERVERURL + ? env.REACT_APP_SERVERURL // env.REACT_APP_SERVERURL is used for prod + : process.env.REACT_APP_SERVERURL; // process.env.REACT_APP_SERVERURL is used for dev (locally) + let baseUrl = serverurl ? serverurl : window.location.origin + "/api/app"; return baseUrl; } export const appInfo = { diff --git a/apps/OpenSign/src/json/menuJson.js b/apps/OpenSign/src/json/menuJson.js index f6801c6b0..340e11978 100644 --- a/apps/OpenSign/src/json/menuJson.js +++ b/apps/OpenSign/src/json/menuJson.js @@ -1,3 +1,13 @@ +const userssetting = [ + { + icon: "fa-light fa-users fa-fw", + title: "Users", + target: "_self", + pageType: "", + description: "", + objectId: "users" + } +]; export const subSetting = [ { icon: "fa-light fa-sliders", @@ -7,14 +17,7 @@ export const subSetting = [ description: "", objectId: "preferences" }, - { - icon: "fa-light fa-users fa-fw", - title: "Users", - target: "_self", - pageType: "", - description: "", - objectId: "users" - } + ...userssetting ]; const sidebarList = [ @@ -65,7 +68,7 @@ const sidebarList = [ pageType: "report", description: "", objectId: "6TeaPr321t" - }, + } ] }, { diff --git a/apps/OpenSign/src/pages/Login.jsx b/apps/OpenSign/src/pages/Login.jsx index a77af3336..554033ea4 100644 --- a/apps/OpenSign/src/pages/Login.jsx +++ b/apps/OpenSign/src/pages/Login.jsx @@ -68,6 +68,7 @@ function Login() { setState({ ...state, loading: false, alertType: type, alertMsg: msg }); setTimeout(() => setState({ ...state, alertMsg: "" }), 2000); }; + const checkUserExt = async () => { const app = await getAppLogo(); if (app?.error === "invalid_json") { @@ -82,11 +83,11 @@ function Login() { } else { setImage(appInfo?.applogo || undefined); } + dispatch(fetchAppInfo()); if (localStorage.getItem("accesstoken")) { setState({ ...state, loading: true }); GetLoginData(); } - dispatch(fetchAppInfo()); }; const handleChange = (event) => { let { name, value } = event.target; @@ -96,20 +97,15 @@ function Login() { setState({ ...state, [name]: value }); }; - const handleSubmit = async (event) => { - localStorage.removeItem("accesstoken"); - event.preventDefault(); + const handleLogin = async ( + ) => { + const email = state?.email + const password = state?.password - if (!emailRegex.test(state.email)) { - alert("Please enter a valid email address."); - return; - } - - const { email, password } = state; if (!email || !password) { return; } - + localStorage.removeItem("accesstoken"); try { setState({ ...state, loading: true }); localStorage.setItem("appLogo", appInfo.applogo); @@ -132,6 +128,14 @@ function Login() { showToast("danger", "Invalid username/password or region"); } }; + const handleLoginBtn = async (event) => { + event.preventDefault(); + if (!emailRegex.test(state.email)) { + alert("Please enter a valid email address."); + return; + } + await handleLogin(); + }; const setThirdpartyLoader = (value) => { setState({ ...state, thirdpartyLoader: value }); @@ -275,7 +279,6 @@ function Login() { const userInformation = JSON.parse( localStorage.getItem("UserInformation") ); - // console.log("payload ", payload); if (payload && payload.sessionToken) { const params = { userDetails: { @@ -289,7 +292,6 @@ function Login() { } }; const userSignUp = await Parse.Cloud.run("usersignup", params); - // console.log("userSignUp ", userSignUp); if (userSignUp && userSignUp.sessionToken) { const LocalUserDetails = { name: userInformation.name, @@ -430,7 +432,7 @@ function Login() {