From 1198460c979e1ea2ee8d79c392a67ecdba54b8de Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Sat, 6 Jul 2024 17:32:40 +0530 Subject: [PATCH] fix: remove unncessary localstorage variables --- apps/OpenSign/src/App.js | 2 -- apps/OpenSign/src/components/AddSigner.js | 4 +-- apps/OpenSign/src/components/Header.js | 6 ---- apps/OpenSign/src/components/LoginGoogle.js | 16 ---------- .../src/components/opensigndrive/DriveBody.js | 18 +++++------- apps/OpenSign/src/constant/Utils.js | 10 +++---- apps/OpenSign/src/constant/appinfo.js | 4 +-- apps/OpenSign/src/layout/HomeLayout.js | 6 +--- apps/OpenSign/src/pages/ForgetPassword.js | 3 -- apps/OpenSign/src/pages/GuestLogin.js | 2 -- apps/OpenSign/src/pages/Login.js | 13 ++------- apps/OpenSign/src/pages/Managesign.js | 6 ++-- apps/OpenSign/src/pages/Opensigndrive.js | 2 +- apps/OpenSign/src/pages/PdfRequestFiles.js | 12 ++++---- apps/OpenSign/src/pages/Pgsignup.js | 21 +++----------- apps/OpenSign/src/pages/PlaceHolderSign.js | 12 ++++---- apps/OpenSign/src/pages/SSOVerify.js | 4 +-- apps/OpenSign/src/pages/Signup.js | 29 +++---------------- apps/OpenSign/src/pages/SignyourselfPdf.js | 12 ++++---- apps/OpenSign/src/primitives/AddContact.js | 4 +-- .../src/primitives/GetReportDisplay.js | 4 +-- .../src/redux/reducers/infoReducer.js | 3 -- 22 files changed, 53 insertions(+), 140 deletions(-) diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 40b6801b6..107fea475 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -54,11 +54,9 @@ function App() { const baseurl = process.env.REACT_APP_SERVERURL ? process.env.REACT_APP_SERVERURL : window.location.origin + "/api/app"; - const appName = "contracts"; try { localStorage.setItem("baseUrl", `${baseurl}/`); localStorage.setItem("parseAppId", appId); - localStorage.setItem("domain", appName); setIsLoading(false); } catch (error) { console.log("err ", error); diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.js index f5143eb93..a906504b9 100644 --- a/apps/OpenSign/src/components/AddSigner.js +++ b/apps/OpenSign/src/components/AddSigner.js @@ -92,7 +92,7 @@ const AddSigner = (props) => { sessionToken: localStorage.getItem("accesstoken") }; const body = { - appName: localStorage.getItem("_appName"), + appName: "contracts", roleName: "contracts_Guest", userId: user.id }; @@ -147,7 +147,7 @@ const AddSigner = (props) => { sessionToken: localStorage.getItem("accesstoken") }; const body = { - appName: localStorage.getItem("_appName"), + appName: "contracts", roleName: "contracts_Guest", userId: userRes.id }; diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index c2b6bd162..ec025b2e8 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -53,22 +53,16 @@ const Header = ({ showSidebar }) => { } let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); - let appName = localStorage.getItem("appName"); let defaultmenuid = localStorage.getItem("defaultmenuid"); let PageLanding = localStorage.getItem("PageLanding"); - let domain = localStorage.getItem("domain"); - let _appName = localStorage.getItem("_appName"); let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); localStorage.clear(); localStorage.setItem("appLogo", applogo); - localStorage.setItem("appName", appName); - localStorage.setItem("_appName", _appName); localStorage.setItem("defaultmenuid", defaultmenuid); localStorage.setItem("PageLanding", PageLanding); - localStorage.setItem("domain", domain); localStorage.setItem("userSettings", appdata); localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js index 69180540d..94a778e84 100644 --- a/apps/OpenSign/src/components/LoginGoogle.js +++ b/apps/OpenSign/src/components/LoginGoogle.js @@ -51,14 +51,9 @@ const GoogleSignInBtn = ({ let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); let applogo = localStorage.getItem("appLogo"); - let domain = localStorage.getItem("domain"); - let appversion = localStorage.getItem("appVersion"); - let appTitle = localStorage.getItem("appTitle"); let defaultmenuid = localStorage.getItem("defaultmenuid"); let PageLanding = localStorage.getItem("PageLanding"); - let _appName = localStorage.getItem("_appName"); let _app_objectId = localStorage.getItem("_app_objectId"); - let appName = localStorage.getItem("appName"); let userSettings = localStorage.getItem("userSettings"); localStorage.clear(); @@ -66,14 +61,9 @@ const GoogleSignInBtn = ({ localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); localStorage.setItem("appLogo", applogo); - localStorage.setItem("domain", domain); - localStorage.setItem("appversion", appversion); - localStorage.setItem("appTitle", appTitle); localStorage.setItem("defaultmenuid", defaultmenuid); localStorage.setItem("PageLanding", PageLanding); - localStorage.setItem("_appName", _appName); localStorage.setItem("_app_objectId", _app_objectId); - localStorage.setItem("appName", appName); localStorage.setItem("userSettings", userSettings); localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); @@ -186,22 +176,16 @@ const GoogleSignInBtn = ({ let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); - let appName = localStorage.getItem("appName"); let defaultmenuid = localStorage.getItem("defaultmenuid"); let PageLanding = localStorage.getItem("PageLanding"); - let domain = localStorage.getItem("domain"); - let _appName = localStorage.getItem("_appName"); let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); localStorage.clear(); localStorage.setItem("appLogo", applogo); - localStorage.setItem("appName", appName); - localStorage.setItem("_appName", _appName); localStorage.setItem("defaultmenuid", defaultmenuid); localStorage.setItem("PageLanding", PageLanding); - localStorage.setItem("domain", domain); localStorage.setItem("userSettings", appdata); localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js index 216a35124..628dedb6b 100644 --- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js +++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js @@ -70,9 +70,9 @@ function DriveBody(props) { props.sortingData(null, null, updatedData); await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document/${docId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Document/${docId}`, updateName, { headers: { @@ -170,9 +170,7 @@ function DriveBody(props) { await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document/${docId}`, + `${localStorage.getItem("baseUrl")}classes/contracts_Document/${docId}`, data, { headers: { @@ -219,7 +217,7 @@ function DriveBody(props) { updateData = { Folder: { __type: "Pointer", - className: `${localStorage.getItem("_appName")}_Document`, + className: "contracts_Document", objectId: moveFolderId } }; @@ -231,9 +229,9 @@ function DriveBody(props) { await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document/${updateDocId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Document/${updateDocId}`, updateData, { headers: { diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index beefad8e6..dfc9ffdea 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/apps/OpenSign/src/constant/Utils.js @@ -691,9 +691,7 @@ export const createDocument = async (template, placeholders, signerData) => { try { const res = await axios.post( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document`, + `${localStorage.getItem("baseUrl")}classes/contracts_Document`, data, { headers: { @@ -1640,9 +1638,9 @@ export const placeholderHeight = (pos) => { export const contactBook = async (objectId) => { const result = await axios .get( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Contactbook?where={"objectId":"${objectId}"}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Contactbook?where={"objectId":"${objectId}"}`, { headers: { "Content-Type": "application/json", diff --git a/apps/OpenSign/src/constant/appinfo.js b/apps/OpenSign/src/constant/appinfo.js index 474501e20..f3bc10fb5 100644 --- a/apps/OpenSign/src/constant/appinfo.js +++ b/apps/OpenSign/src/constant/appinfo.js @@ -1,6 +1,5 @@ import logo from "../assets/images/logo.png"; export const appInfo = { - appTitle: "contracts", applogo: logo, appname: "contracts", appId: process.env.REACT_APP_APPID ? process.env.REACT_APP_APPID : "opensign", @@ -48,6 +47,5 @@ export const appInfo = { pageId: "35KBoSgoAK", extended_class: "contracts_Users" } - ], - version: "0.1" + ] }; diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 7c3073048..4bcab07f2 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -109,11 +109,7 @@ const HomeLayout = () => { }, [width]); useEffect(() => { - if ( - localStorage.getItem("domain") === "contracts" && - arr && - arr.length > 0 - ) { + if (arr && arr.length > 0) { handleDynamicSteps(); } else { setIsTour(false); diff --git a/apps/OpenSign/src/pages/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.js index 810c4d6a6..32b34724e 100644 --- a/apps/OpenSign/src/pages/ForgetPassword.js +++ b/apps/OpenSign/src/pages/ForgetPassword.js @@ -36,9 +36,6 @@ function ForgotPassword() { const handleSubmit = async (event) => { event.preventDefault(); localStorage.setItem("appLogo", appInfo.applogo); - localStorage.setItem("appName", appInfo.appname); - // localStorage.setItem("defaultmenuid", props.appInfo.defaultmenuid); - // localStorage.setItem("PageLanding", props.appInfo.LandingPageId); localStorage.setItem("userSettings", JSON.stringify(appInfo.settings)); if (state.email) { const username = state.email; diff --git a/apps/OpenSign/src/pages/GuestLogin.js b/apps/OpenSign/src/pages/GuestLogin.js index 403eb6fab..eaa53ea99 100644 --- a/apps/OpenSign/src/pages/GuestLogin.js +++ b/apps/OpenSign/src/pages/GuestLogin.js @@ -42,10 +42,8 @@ function GuestLogin() { localStorage.clear(); const parseId = appInfo.appId; const newServer = `${appInfo.baseUrl}/`; - const appName = appInfo.appname; localStorage.setItem("baseUrl", newServer); localStorage.setItem("parseAppId", parseId); - localStorage.setItem("_appName", appName); //this condition is used decode base64 to string and get userEmail,documentId, contactBoookId data. if (!id) { //`atob` function is used to decode base64 diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index 809dc0a43..eadc3b9ff 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -81,7 +81,6 @@ function Login() { let baseUrl = localStorage.getItem("baseUrl"); let parseAppId = localStorage.getItem("parseAppId"); localStorage.setItem("appLogo", appInfo.applogo); - localStorage.setItem("appName", appInfo.appname); // Pass the username and password to logIn function await Parse.User.logIn(email, password) .then(async (user) => { @@ -398,9 +397,7 @@ function Login() { sessionToken: _user.sessionToken }; - let body = { - appname: localStorage.getItem("_appName") - }; + let body = { appname: "contracts" }; await axios .post(url, JSON.stringify(body), { headers: headers }) .then((axiosRes) => { @@ -699,7 +696,7 @@ function Login() { let SettingsUser = userSettings; SettingsUser.forEach(async (item) => { if (item.role === _currentRole) { - let _role = _currentRole.replace(`${appInfo.appname}_`, ""); + let _role = _currentRole.replace("contracts_", ""); localStorage.setItem("_user_role", _role); // Get TenentID from Extendend Class localStorage.setItem("extended_class", item.extended_class); @@ -942,22 +939,16 @@ function Login() { } let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); - let appName = localStorage.getItem("appName"); let defaultmenuid = localStorage.getItem("defaultmenuid"); let PageLanding = localStorage.getItem("PageLanding"); - let domain = localStorage.getItem("domain"); - let _appName = localStorage.getItem("_appName"); let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); localStorage.clear(); localStorage.setItem("appLogo", applogo); - localStorage.setItem("appName", appName); - localStorage.setItem("_appName", _appName); localStorage.setItem("defaultmenuid", defaultmenuid); localStorage.setItem("PageLanding", PageLanding); - localStorage.setItem("domain", domain); localStorage.setItem("userSettings", appdata); localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); diff --git a/apps/OpenSign/src/pages/Managesign.js b/apps/OpenSign/src/pages/Managesign.js index 8b90fb14e..ba540ad1a 100644 --- a/apps/OpenSign/src/pages/Managesign.js +++ b/apps/OpenSign/src/pages/Managesign.js @@ -4,12 +4,10 @@ import "../styles/managesign.css"; import "../styles/signature.css"; import { toDataUrl } from "../constant/Utils"; import Parse from "parse"; -import { appInfo } from "../constant/appinfo"; import { SaveFileSize } from "../constant/saveFileSize"; import Alert from "../primitives/Alert"; import Loader from "../primitives/Loader"; const ManageSign = () => { - const appName = appInfo.appname; const [penColor, setPenColor] = useState("blue"); const [initialPen, setInitialPen] = useState("blue"); const [image, setImage] = useState(); @@ -39,7 +37,7 @@ const ManageSign = () => { objectId: User.id }; try { - const signCls = `${appName}_Signature`; + const signCls = "contracts_Signature"; const signQuery = new Parse.Query(signCls); signQuery.equalTo("UserId", userId); const signRes = await signQuery.first(); @@ -174,7 +172,7 @@ const ManageSign = () => { }; const saveEntry = async (obj) => { - const signCls = `${appName}_Signature`; + const signCls = "contracts_Signature"; const User = Parse.User.current().id; const userId = { __type: "Pointer", className: "_User", objectId: User }; if (id) { diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index d4c2ce30d..9f150da75 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -272,7 +272,7 @@ function Opensigndrive() { setIsFolderLoader(true); const getParentObjId = folderName[folderName.length - 1]; const parentId = getParentObjId && getParentObjId.objectId; - const foldercls = `${localStorage.getItem("_appName")}_Document`; + const foldercls = "contracts_Document"; const folderPtr = { __type: "Pointer", className: foldercls, diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 0c9b5b812..526a751f3 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -553,9 +553,9 @@ function PdfRequestFiles() { } await axios .get( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${ + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${ jsonSender?.objectId }"}}`, { @@ -1255,9 +1255,9 @@ function PdfRequestFiles() { } try { await axios.put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}${contractName}/${signerUserId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts${contractName}/${signerUserId}`, { TourStatus: updatedTourStatus }, diff --git a/apps/OpenSign/src/pages/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.js index 67b8172d6..32aaab4f5 100644 --- a/apps/OpenSign/src/pages/Pgsignup.js +++ b/apps/OpenSign/src/pages/Pgsignup.js @@ -107,8 +107,6 @@ const PgSignUp = () => { } }; const saveUser = async (obj) => { - // const domain = localStorage.getItem("domain"); - // console.log("domain", domain) try { const zohoRes = await axios.post( parseBaseUrl + "functions/zohodetails", @@ -232,9 +230,7 @@ const PgSignUp = () => { sessionToken: _user.sessionToken }; - let body = { - appname: localStorage.getItem("_appName") - }; + let body = { appname: "contracts" }; await axios .post(url, JSON.stringify(body), { headers: headers }) .then((roles) => { @@ -242,10 +238,7 @@ const PgSignUp = () => { userRoles = roles.data.result; let _currentRole = ""; if (userRoles.length > 1) { - if ( - userRoles[0] === - `${localStorage.getItem("_appName")}_appeditor` - ) { + if (userRoles[0] === "contracts_appeditor") { _currentRole = userRoles[1]; } else { _currentRole = userRoles[0]; @@ -253,16 +246,10 @@ const PgSignUp = () => { } else { _currentRole = userRoles[0]; } - if ( - _currentRole !== - `${localStorage.getItem("_appName")}_appeditor` - ) { + if (_currentRole !== "contracts_appeditor") { userSettings.forEach(async (element) => { if (element.role === _currentRole) { - let _role = _currentRole.replace( - `${localStorage.getItem("_appName")}_`, - "" - ); + let _role = _currentRole.replace("contracts_", ""); localStorage.setItem("_user_role", _role); // Get TenentID from Extendend Class localStorage.setItem( diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 2998c2ba9..f42f706d4 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1007,9 +1007,9 @@ function PlaceHolderSign() { } await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document/${documentId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Document/${documentId}`, data, { headers: { @@ -1237,9 +1237,9 @@ function PlaceHolderSign() { await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Document/${documentId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Document/${documentId}`, data, { headers: { diff --git a/apps/OpenSign/src/pages/SSOVerify.js b/apps/OpenSign/src/pages/SSOVerify.js index e974a74d6..51c3a0b64 100644 --- a/apps/OpenSign/src/pages/SSOVerify.js +++ b/apps/OpenSign/src/pages/SSOVerify.js @@ -160,7 +160,7 @@ const SSOVerify = () => { "X-Parse-Application-Id": parseAppId, sessionToken: _user.sessionToken }; - const body = { appname: appInfo.appname }; + const body = { appname: "contracts" }; const UserGroupsRes = await axios.post(url, JSON.stringify(body), { headers: headers }); @@ -184,7 +184,7 @@ const SSOVerify = () => { const redirectUrl = location?.state?.from || `/${roleSetting.pageType}/${roleSetting.pageId}`; - const _role = _currentRole.replace(`${appInfo.appname}_`, ""); + const _role = _currentRole.replace("contracts_", ""); localStorage.setItem("_user_role", _role); // Get TenentID from Extendend Class localStorage.setItem( diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.js index 7bdb33eae..8bd55117f 100644 --- a/apps/OpenSign/src/pages/Signup.js +++ b/apps/OpenSign/src/pages/Signup.js @@ -44,14 +44,9 @@ const Signup = () => { let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); let applogo = localStorage.getItem("appLogo"); - let domain = localStorage.getItem("domain"); - let appversion = localStorage.getItem("appVersion"); - let appTitle = localStorage.getItem("appTitle"); let defaultmenuid = localStorage.getItem("defaultmenuid"); let PageLanding = localStorage.getItem("PageLanding"); - let _appName = localStorage.getItem("_appName"); let _app_objectId = localStorage.getItem("_app_objectId"); - let appName = localStorage.getItem("appName"); let userSettings = localStorage.getItem("userSettings"); localStorage.clear(); @@ -59,14 +54,9 @@ const Signup = () => { localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); localStorage.setItem("appLogo", applogo); - localStorage.setItem("domain", domain); - localStorage.setItem("appversion", appversion); - localStorage.setItem("appTitle", appTitle); localStorage.setItem("defaultmenuid", defaultmenuid); localStorage.setItem("PageLanding", PageLanding); - localStorage.setItem("_appName", _appName); localStorage.setItem("_app_objectId", _app_objectId); - localStorage.setItem("appName", appName); localStorage.setItem("userSettings", userSettings); localStorage.setItem("baseUrl", baseUrl); localStorage.setItem("parseAppId", appid); @@ -217,9 +207,7 @@ const Signup = () => { sessionToken: _user.sessionToken }; - let body = { - appname: localStorage.getItem("_appName") - }; + let body = { appname: "contracts" }; await axios .post(url, JSON.stringify(body), { headers: headers }) .then((roles) => { @@ -227,10 +215,7 @@ const Signup = () => { userRoles = roles.data.result; let _currentRole = ""; if (userRoles.length > 1) { - if ( - userRoles[0] === - `${localStorage.getItem("_appName")}_appeditor` - ) { + if (userRoles[0] === "contracts_appeditor") { _currentRole = userRoles[1]; } else { _currentRole = userRoles[0]; @@ -238,16 +223,10 @@ const Signup = () => { } else { _currentRole = userRoles[0]; } - if ( - _currentRole !== - `${localStorage.getItem("_appName")}_appeditor` - ) { + if (_currentRole !== "contracts_appeditor") { userSettings.forEach(async (element) => { if (element.role === _currentRole) { - let _role = _currentRole.replace( - `${localStorage.getItem("_appName")}_`, - "" - ); + let _role = _currentRole.replace("contracts_", ""); localStorage.setItem("_user_role", _role); // Get TenentID from Extendend Class localStorage.setItem( diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js index 89387c37f..44d7643ff 100644 --- a/apps/OpenSign/src/pages/SignyourselfPdf.js +++ b/apps/OpenSign/src/pages/SignyourselfPdf.js @@ -264,9 +264,9 @@ function SignYourSelf() { } await axios .get( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${ + `${localStorage.getItem( + "baseUrl" + )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${ jsonSender.objectId }"}}`, { @@ -1030,9 +1030,9 @@ function SignYourSelf() { } await axios .put( - `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( - "_appName" - )}${contractName}/${signerUserId}`, + `${localStorage.getItem( + "baseUrl" + )}classes/contracts${contractName}/${signerUserId}`, { TourStatus: updatedTourStatus }, diff --git a/apps/OpenSign/src/primitives/AddContact.js b/apps/OpenSign/src/primitives/AddContact.js index a852eb1e6..16b031aea 100644 --- a/apps/OpenSign/src/primitives/AddContact.js +++ b/apps/OpenSign/src/primitives/AddContact.js @@ -84,7 +84,7 @@ const AddContact = (props) => { sessionToken: localStorage.getItem("accesstoken") }; const body = { - appName: localStorage.getItem("_appName"), + appName: "contracts", roleName: "contracts_Guest", userId: user.id }; @@ -131,7 +131,7 @@ const AddContact = (props) => { sessionToken: localStorage.getItem("accesstoken") }; const body = { - appName: localStorage.getItem("_appName"), + appName: "contracts", roleName: "contracts_Guest", userId: userRes.id }; diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index e55a08f63..04293e86c 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1354,7 +1354,7 @@ const ReportTable = (props) => { {props.actions?.length > 0 && props.actions.map((act, index) => props.ReportName === "Templates" ? ( - <> + {(item.ExtUserPtr?.objectId === extClass?.[0]?.objectId || act.btnLabel === "Use") && ( @@ -1412,7 +1412,7 @@ const ReportTable = (props) => { )} )} - + ) : (
{ - localStorage.setItem("_appName", appInfo.appname); localStorage.setItem("_app_objectId", appInfo.objectId); localStorage.setItem("baseUrl", `${appInfo.baseUrl}/`); localStorage.setItem("parseAppId", appInfo.appId); localStorage.setItem("appLogo", appInfo.applogo); - localStorage.setItem("appVersion", appInfo.version); localStorage.removeItem("userSettings"); localStorage.setItem("userSettings", JSON.stringify(appInfo.settings)); - localStorage.setItem("appTitle", appInfo.appTitle); localStorage.setItem("fev_Icon", appInfo.fev_Icon); return appInfo; }