From 62005ad7df180ad1ada7288677f9d6a5a916bbda Mon Sep 17 00:00:00 2001 From: prafullnavkar-nxg Date: Mon, 30 Oct 2023 17:42:47 +0530 Subject: [PATCH] resolve all warnings --- apps/OpenSign/.eslintrc.json | 5 +- .../src/components/AppendFormInForm.js | 39 +- apps/OpenSign/src/components/ErrorBoundary.js | 2 +- apps/OpenSign/src/components/LoginFacebook.js | 38 +- apps/OpenSign/src/components/TreeEditForm.js | 14 +- apps/OpenSign/src/components/TreeWidget.js | 16 +- .../src/components/dashboard/GetDashboard.js | 53 +- .../src/components/fields/FileUpload.js | 7 +- .../src/components/fields/HiddenField.js | 8 +- .../src/components/fields/Level1Dropdown.js | 5 +- .../src/components/fields/MultiSelectField.js | 548 +++++++++--------- .../src/components/sidebar/Sidebar.js | 2 +- apps/OpenSign/src/constant/saveFileSize.js | 6 +- apps/OpenSign/src/constant/searchQuery.js | 44 +- apps/OpenSign/src/hook/useWindowSize.js | 2 - .../src/microappComponent/DragElement.js | 2 +- apps/OpenSign/src/redux/actions/index.js | 6 +- apps/OpenSign/src/routes/ChangePassword.js | 8 +- apps/OpenSign/src/routes/ForgetPassword.js | 5 +- apps/OpenSign/src/routes/Form.js | 42 +- apps/OpenSign/src/routes/Login.js | 9 +- apps/OpenSign/src/routes/Pgsignup.js | 6 +- apps/OpenSign/src/routes/PlanSubscriptions.js | 4 - apps/OpenSign/src/routes/Signup.js | 137 ++--- 24 files changed, 478 insertions(+), 530 deletions(-) diff --git a/apps/OpenSign/.eslintrc.json b/apps/OpenSign/.eslintrc.json index bf978415d..afdfec072 100644 --- a/apps/OpenSign/.eslintrc.json +++ b/apps/OpenSign/.eslintrc.json @@ -18,10 +18,7 @@ "plugins": ["react"], "rules": { "react/prop-types": 0, - "no-unused-vars": 0, - "no-empty": 0, - "no-case-declarations": 0, - "react/no-deprecated": 0, + "no-unused-vars": 1, "no-undef": 0 }, "ignorePatterns": ["**/build/**", "**/*.config.js"], diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js index 0522479bb..31c8415dd 100644 --- a/apps/OpenSign/src/components/AppendFormInForm.js +++ b/apps/OpenSign/src/components/AppendFormInForm.js @@ -77,9 +77,7 @@ class AppendFormInForm extends Component { userSchema: resultjson.userSchema }); } - for (let [key, value] of Object.entries( - resultjson.jsonSchema.properties - )) { + for (let [value] of Object.entries(resultjson.jsonSchema.properties)) { if (typeof value === "object") { for (let [k, v] of Object.entries(value)) { if (k === "format" && v === "date") { @@ -401,8 +399,7 @@ class AppendFormInForm extends Component { RowData[k] = newDate; } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = undefined; if (_dd[k].data.savePointerClass) { if (RowData[k]) { @@ -502,7 +499,7 @@ class AppendFormInForm extends Component { roleName: RoleField, userId: u.id }; - axios.post(roleurl, body, { headers: headers }).then((res) => { + axios.post(roleurl, body, { headers: headers }).then(() => { const currentUser = Parse.User.current(); let _fname = this.state.title; var forms = Parse.Object.extend(_fname); @@ -634,7 +631,7 @@ class AppendFormInForm extends Component { }; await axios .post(roleurl, body, { headers: headers }) - .then((res) => { + .then(() => { const currentUser = Parse.User.current(); let _fname = this.state.title; var forms = Parse.Object.extend(_fname); @@ -670,7 +667,7 @@ class AppendFormInForm extends Component { form.setACL(new Parse.ACL(ACL)); } form.save(RowData).then( - (form) => { + () => { let filtered = {}; if (this.state.redirect_type === "clearData") { if ( @@ -725,12 +722,6 @@ class AppendFormInForm extends Component { } ); }); - - const x = document.getElementById("snackbar"); - x.className = "show"; - setTimeout(function () { - x.className = x.className.replace("show", ""); - }, 2000); } catch (error) { this.setState({ loading: false, @@ -793,8 +784,7 @@ class AppendFormInForm extends Component { RowData[k] = RowData[k].trim(); } if (val.properties[k].data !== undefined) { - if (Array.isArray(val.properties[k].data)) { - } else if (val.properties[k].data.isPointer) { + if (val.properties[k].data.isPointer) { let pointer = undefined; if (val.properties[k].data.savePointerClass) { if (RowData[k]) { @@ -916,8 +906,7 @@ class AppendFormInForm extends Component { } } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = undefined; if (RowData[k] && RowData[k] !== "Select") { if (_dd[k].type === "array") { @@ -1018,16 +1007,10 @@ class AppendFormInForm extends Component { const qu = new Parse.Query(Agent); qu.equalTo("objectId", l.objectId); qu.include(new_arr[1]); - await qu.first().then( - (results) => {}, - (error) => { - console.error( - "Error while fetching Agent", - error.massage - ); - } - ); - } catch (err) {} + await qu.first(); + } catch (err) { + console.log("Error while fetching Agent", err.massage); + } } } if (key.startsWith("role")) { diff --git a/apps/OpenSign/src/components/ErrorBoundary.js b/apps/OpenSign/src/components/ErrorBoundary.js index 9ba83c067..e15a818df 100644 --- a/apps/OpenSign/src/components/ErrorBoundary.js +++ b/apps/OpenSign/src/components/ErrorBoundary.js @@ -6,7 +6,7 @@ export class ErrorBoundary extends Component { this.state = { hasError: false }; } - static getDerivedStateFromError(error) { + static getDerivedStateFromError() { return { hasError: true }; diff --git a/apps/OpenSign/src/components/LoginFacebook.js b/apps/OpenSign/src/components/LoginFacebook.js index 54b65c1b1..e6b77eed3 100644 --- a/apps/OpenSign/src/components/LoginFacebook.js +++ b/apps/OpenSign/src/components/LoginFacebook.js @@ -21,25 +21,25 @@ const LoginFacebook = ({ Name: "", Email: "" }); - // const responseFacebook = async (response) => { - // // console.log("response ", response); - // if (response.userID) { - // setThirdpartyLoader(true); - // const details = { - // Email: response.email, - // Name: response.name, - // }; - // setUserDetails({ ...userDetails, ...details }); - // const fDetails = { - // Id: response.userID, - // AccessToken: response.accessToken, - // Name: response.name, - // Email: response.email, - // }; - // setFBDetails({ ...fBDetails, ...fDetails }); - // const res = await checkExtUser(fDetails); - // } - // }; + const responseFacebook = async (response) => { + // console.log("response ", response); + if (response.userID) { + setThirdpartyLoader(true); + const details = { + Email: response.email, + Name: response.name, + }; + setUserDetails({ ...userDetails, ...details }); + const fDetails = { + Id: response.userID, + AccessToken: response.accessToken, + Name: response.name, + Email: response.email, + }; + setFBDetails({ ...fBDetails, ...fDetails }); + const res = await checkExtUser(fDetails); + } + }; const checkExtUser = async (details) => { const extUser = new Parse.Query("contracts_Users"); diff --git a/apps/OpenSign/src/components/TreeEditForm.js b/apps/OpenSign/src/components/TreeEditForm.js index 215acd948..3574a03df 100644 --- a/apps/OpenSign/src/components/TreeEditForm.js +++ b/apps/OpenSign/src/components/TreeEditForm.js @@ -74,6 +74,7 @@ const TreeEditForm = (props) => { } }, (error) => { + console.log("err", error); setloading(false); } ); @@ -155,8 +156,7 @@ const TreeEditForm = (props) => { RowData[k] = RowData[k].trim(); } if (val.properties[k].data !== undefined) { - if (Array.isArray(val.properties[k].data)) { - } else if (val.properties[k].data.isPointer) { + if (val.properties[k].data.isPointer) { let pointer = undefined; if (val.properties[k].data.class) { if (RowData[k]) { @@ -243,8 +243,7 @@ const TreeEditForm = (props) => { } } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = undefined; if (typeof RowData[k] === "object") { if (RowData[k]) { @@ -322,15 +321,20 @@ const TreeEditForm = (props) => { props.HideView(false); setloading(false); setactive(true); - } catch (error) {} + } catch (error) { + console.log("err", error); + } }, (error) => { + console.log("err", error); setloading(false); setactive(true); } ); }); } catch (error) { + console.log("err", error); + alert(error.message); setloading(false); setactive(true); diff --git a/apps/OpenSign/src/components/TreeWidget.js b/apps/OpenSign/src/components/TreeWidget.js index 9565b3722..70550e14b 100644 --- a/apps/OpenSign/src/components/TreeWidget.js +++ b/apps/OpenSign/src/components/TreeWidget.js @@ -106,7 +106,9 @@ const TreeWidget = (props) => { return; } } - } catch (error) {} + } catch (error) { + console.log("error ", error); + } } else { Parse.serverURL = parseBaseUrl; Parse.initialize(parseAppId); @@ -280,6 +282,7 @@ const TreeWidget = (props) => { ); }, (error) => { + console.log("error ", error); // The object was not retrieved successfully. setLoader(false); } @@ -304,7 +307,7 @@ const TreeWidget = (props) => { }); props.onChange(tabList[len]["objectId"]); let url = "Folders"; - tabList.forEach((t, i) => { + tabList.forEach((t) => { url = url + " / " + t[`${props.schema.data.FolderNameField}`]; }); setTabURL(url); @@ -325,7 +328,6 @@ const TreeWidget = (props) => { try { let objectId = formData.objectId; let className = formData.className; - let condition = false; Parse.serverURL = parseBaseUrl; Parse.initialize(parseAppId); const fldr = Parse.Object.extend(className); @@ -410,8 +412,7 @@ const TreeWidget = (props) => { } } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = {}; if (RowData[k] && RowData[k] !== "Select") { if (_dd[k].data.class) { @@ -495,6 +496,7 @@ const TreeWidget = (props) => { } }, (error) => { + console.log("error ", error); setLoader(false); } ); @@ -671,7 +673,7 @@ const TreeWidget = (props) => { }} > { + onClick={() => { setTabList([]); setIsAddField(false); setDefaultState(true); @@ -785,7 +787,7 @@ const TreeWidget = (props) => { marginLeft: "4px", cursor: "pointer" }} - onClick={(e) => { + onClick={() => { setTabList((tabs) => tabs.concat(fldr)); selectedItemList(fldr); }} diff --git a/apps/OpenSign/src/components/dashboard/GetDashboard.js b/apps/OpenSign/src/components/dashboard/GetDashboard.js index f68edf637..8133f6f59 100644 --- a/apps/OpenSign/src/components/dashboard/GetDashboard.js +++ b/apps/OpenSign/src/components/dashboard/GetDashboard.js @@ -14,7 +14,7 @@ const GetDashboard = (props) => { let _search = e.target.value; localStorage.setItem("DashboardDefaultFilter", _search); switch (_search) { - case "Today": + case "Today": { let d = new Date(); let formDate = new Date( Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0) @@ -26,7 +26,8 @@ const GetDashboard = (props) => { setfilter(Query); setoption(_search); break; - case "Yesterday": + } + case "Yesterday": { let d1 = new Date(); d1.setDate(d1.getDate() - 1); let yesFrDate = new Date( @@ -40,7 +41,8 @@ const GetDashboard = (props) => { setfilter(Query1); setoption(_search); break; - case "This week": + } + case "This week": { let oneDay = 24 * 60 * 60 * 1000; let curr = new Date(); // get current date let first = curr.getDate() - curr.getDay(); // First day is the day of the month - the day of the week @@ -90,7 +92,8 @@ const GetDashboard = (props) => { setfilter(Query2); setoption(_search); break; - case "Last 7 days": + } + case "Last 7 days": { let d7 = new Date(); let d7l = new Date(); d7.setDate(d7.getDate() - 7); @@ -104,7 +107,8 @@ const GetDashboard = (props) => { setfilter(Query7); setoption(_search); break; - case "Last 14 days": + } + case "Last 14 days": { let d14 = new Date(); let d14l = new Date(); let l14t = new Date( @@ -126,7 +130,8 @@ const GetDashboard = (props) => { setfilter(Query14); setoption(_search); break; - case "Last 30 days": + } + case "Last 30 days": { let d30 = new Date(); let d30l = new Date(); let l30t = new Date( @@ -147,21 +152,23 @@ const GetDashboard = (props) => { setfilter(Query30); setoption(_search); break; - case "Last week": + } + case "Last week": { const from_date = moment().startOf("week").subtract(7, "days"); const to_date = moment().endOf("week").subtract(7, "days"); let Queryl = `'$gte':'${from_date.toISOString()}','$lte':'${to_date.toISOString()}'`; setfilter(Queryl); setoption(_search); break; - case "This month": - var tdate = new Date(); - var tfirstDay = new Date( + } + case "This month": { + const tdate = new Date(); + let tfirstDay = new Date( tdate.getFullYear(), tdate.getMonth(), 1 ).toISOString(); - var tlastDay = new Date( + let tlastDay = new Date( tdate.getFullYear(), tdate.getMonth() + 1, 0 @@ -170,8 +177,9 @@ const GetDashboard = (props) => { setfilter(Querylt); setoption(_search); break; - case "Last month": - var ldate = new Date(); + } + case "Last month": { + const ldate = new Date(); var lfirstDay = new Date( ldate.getFullYear(), ldate.getMonth() - 1, @@ -186,7 +194,8 @@ const GetDashboard = (props) => { setfilter(Queryltl); setoption(_search); break; - case "All": + } + case "All": { let fall = new Date( new Date().getFullYear() - 100, 0, @@ -199,7 +208,8 @@ const GetDashboard = (props) => { setfilter(fall_year); setoption(_search); break; - case "This year": + } + case "This year": { let fcy = new Date( new Date().getFullYear(), 0, @@ -220,7 +230,8 @@ const GetDashboard = (props) => { setfilter(cur_year); setoption(_search); break; - case "Last year": + } + case "Last year": { let fly = new Date( new Date().getFullYear() - 1, 0, @@ -241,9 +252,11 @@ const GetDashboard = (props) => { setfilter(last_year); setoption(_search); break; - default: + } + default: { setoption(_search); break; + } } }; const renderSwitchWithTour = (col) => { @@ -305,7 +318,7 @@ const GetDashboard = (props) => { {col.widget.label} ); - case "report": + case "report": { let _filter = `${col.widget.filterKey}:${filter}`; return (
@@ -316,6 +329,7 @@ const GetDashboard = (props) => {
); + } default: return null; } @@ -377,7 +391,7 @@ const GetDashboard = (props) => { {col.widget.label} ); - case "report": + case "report": { let _filter = `${col.widget.filterKey}:${filter}`; return ( please wait}> @@ -386,6 +400,7 @@ const GetDashboard = (props) => { ); + } default: return null; } diff --git a/apps/OpenSign/src/components/fields/FileUpload.js b/apps/OpenSign/src/components/fields/FileUpload.js index e983847cc..bd9c72eec 100644 --- a/apps/OpenSign/src/components/fields/FileUpload.js +++ b/apps/OpenSign/src/components/fields/FileUpload.js @@ -34,6 +34,7 @@ const FileUpload = (props) => { let Extensions = props.schema.filetypes.map((x) => x.toLowerCase()); let arr = Extensions.filter((x) => x === fileNameExt); if (arr.length > 0) { + console.log("multiple type"); } else { alert( "Only these file types are accepted : " + Extensions.join(", ") @@ -41,12 +42,11 @@ const FileUpload = (props) => { } } if (props.schema.maxfilesizeKB && props.schema.maxfilesizeKB !== "") { - console.log(Math.round(files[0].size / 1024)); + // console.log(Math.round(files[0].size / 1024)); if ( - Math.round(Number(files[0].size) / 1024) <= + Math.round(Number(files[0].size) / 1024) >= props.schema.maxfilesizeKB ) { - } else { alert( `The selected file size is too large. Please select a file less than ${Math.round( props.schema.maxfilesizeKB / 1024 @@ -72,7 +72,6 @@ const FileUpload = (props) => { const size = file.size; // console.log("file ", file) setfileload(true); - const tenant = localStorage.getItem("TenetId"); const pdfFile = file; const parseFile = new Parse.File(pdfFile.name, pdfFile); diff --git a/apps/OpenSign/src/components/fields/HiddenField.js b/apps/OpenSign/src/components/fields/HiddenField.js index dc0cadc8c..20b16d453 100644 --- a/apps/OpenSign/src/components/fields/HiddenField.js +++ b/apps/OpenSign/src/components/fields/HiddenField.js @@ -60,15 +60,15 @@ export class HiddenField extends Component { }); } } - } catch (error) {} + } catch (error) { + console.log('err', error) + } } }; componentDidMount() { this.loadData(); } - /* componentWillReceiveProps() { - this.loadData(); - } */ + render() { return ( { setTimeout(function () { x.className = x.className.replace("show", ""); }, 5000); - } catch (error) {} + } catch (error) { + console.log("Err", error) + } } }; useEffect(() => { Level1DropdownData(); - // eslint-disable-next-line }, []); diff --git a/apps/OpenSign/src/components/fields/MultiSelectField.js b/apps/OpenSign/src/components/fields/MultiSelectField.js index c942fd56f..7ccba7c73 100644 --- a/apps/OpenSign/src/components/fields/MultiSelectField.js +++ b/apps/OpenSign/src/components/fields/MultiSelectField.js @@ -22,7 +22,7 @@ const MultiSelectField = (props) => { const [parseBaseUrl] = useState(localStorage.getItem("baseUrl")); const [parseAppId] = useState(localStorage.getItem("parseAppId")); const [state, setState] = useState(undefined); - const [editFormData, setEditFormData] = useState([]); + // const [editFormData, setEditFormData] = useState([]); const [selected, setSelected] = React.useState([]); const [isModal, setIsModel] = useState(false); const onChange = (selectedOptions) => setSelected(selectedOptions); @@ -146,7 +146,9 @@ const MultiSelectField = (props) => { setSelected(_selected); } }); - } catch (error) {} + } catch (error) { + console.log("err", error); + } }; const handleCheckChieldElement = (event) => { @@ -164,271 +166,271 @@ const MultiSelectField = (props) => { setState({ [`${props.name}_DD`]: SelectLists }); }; - const Level1CheckList = async (id) => { - try { - let response = []; - // eslint-disable-next-line - let reg = /(\#.*?\#)/gi; - let _query = props.schema.data.query; - let output = _query.match(reg); - if (output.length === 2) { - let res; - if (localStorage.getItem("Extand_Class")) { - let data = JSON.parse(localStorage.getItem("Extand_Class")); - res = data[0]; - } - output = output.filter((x) => x !== "#queryString#"); - if (output.length === 1) { - _query = _query.replace("#queryString#", id); - output = output.join(); - output = output.substring(1, output.length - 1); - output = output.split("."); - if (output.length > 0) { - _query = _query.replace(reg, res[output[0]][output[1]]); - } else { - _query = _query.replace(reg, res[output[0]]); - } - } - } else { - _query = props.schema.data.query.replace(reg, id); - } + // const Level1CheckList = async (id) => { + // try { + // let response = []; + // // eslint-disable-next-line + // let reg = /(\#.*?\#)/gi; + // let _query = props.schema.data.query; + // let output = _query.match(reg); + // if (output.length === 2) { + // let res; + // if (localStorage.getItem("Extand_Class")) { + // let data = JSON.parse(localStorage.getItem("Extand_Class")); + // res = data[0]; + // } + // output = output.filter((x) => x !== "#queryString#"); + // if (output.length === 1) { + // _query = _query.replace("#queryString#", id); + // output = output.join(); + // output = output.substring(1, output.length - 1); + // output = output.split("."); + // if (output.length > 0) { + // _query = _query.replace(reg, res[output[0]][output[1]]); + // } else { + // _query = _query.replace(reg, res[output[0]]); + // } + // } + // } else { + // _query = props.schema.data.query.replace(reg, id); + // } - let url = `${parseBaseUrl}classes/${props.schema.data.class}?${_query}`; - const headers = { - "Content-Type": "application/json", - "X-Parse-Application-Id": parseAppId, - "X-Parse-Session-Token": localStorage.getItem("accesstoken") - }; - await axios.get(url, { headers: headers }).then(async (res) => { - let temp = []; - let formArray = []; - let _selected = []; - if (editFormData.length > 0) { - editFormData.forEach((x) => { - if (typeof x === "object") { - formArray.push(x.objectId); - } else { - formArray.push(x); - } - }); - } else if ( - props.schema.selectedData && - Object.keys(props.schema.selectedData).length !== 0 && - props.schema.selectedData.constructor === Object - ) { - try { - let selectedDataQuery = props.schema.selectedData.query.replace( - reg, - id - ); - let selectedDataUrl = `${parseBaseUrl}classes/${props.schema.selectedData.class}?${selectedDataQuery}`; + // let url = `${parseBaseUrl}classes/${props.schema.data.class}?${_query}`; + // const headers = { + // "Content-Type": "application/json", + // "X-Parse-Application-Id": parseAppId, + // "X-Parse-Session-Token": localStorage.getItem("accesstoken") + // }; + // await axios.get(url, { headers: headers }).then(async (res) => { + // let temp = []; + // let formArray = []; + // let _selected = []; + // if (editFormData.length > 0) { + // editFormData.forEach((x) => { + // if (typeof x === "object") { + // formArray.push(x.objectId); + // } else { + // formArray.push(x); + // } + // }); + // } else if ( + // props.schema.selectedData && + // Object.keys(props.schema.selectedData).length !== 0 && + // props.schema.selectedData.constructor === Object + // ) { + // try { + // let selectedDataQuery = props.schema.selectedData.query.replace( + // reg, + // id + // ); + // let selectedDataUrl = `${parseBaseUrl}classes/${props.schema.selectedData.class}?${selectedDataQuery}`; - await axios.get(selectedDataUrl, { headers }).then((sltres) => { - let sltData = sltres.data.results; - sltData.forEach((x) => { - if (props.schema.selectedData.valueKey.includes(".")) { - let sltArr = props.schema.selectedData.valueKey.split("."); + // await axios.get(selectedDataUrl, { headers }).then((sltres) => { + // let sltData = sltres.data.results; + // sltData.forEach((x) => { + // if (props.schema.selectedData.valueKey.includes(".")) { + // let sltArr = props.schema.selectedData.valueKey.split("."); - if (Array.isArray(x[sltArr[0]])) { - x[sltArr[0]].forEach((l) => { - formArray.push(l[sltArr[1]]); - }); - } else { - formArray.push(x[sltArr[0][sltArr[1]]]); - } - } else { - formArray.push(x[props.schema.selectedData.valueKey]); - } - }); - }); - } catch (error) {} - } - res.data.results.forEach((x) => { - let obj = {}; - if (props.schema.data.valueKey.includes(".")) { - let newArr = props.schema.data.valueKey.split("."); - if (Array.isArray(x[newArr[0]])) { - if (props.schema.data.displayKey.includes(".")) { - let _dis = props.schema.data.displayKey.split("."); - x[newArr[0]].forEach((l) => { - if (formArray.includes(l[newArr[1]])) { - obj = { - label: l[_dis[1]], - value: l[newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: l[_dis[1]], - value: l[newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: l[_dis[1]], - value: l[newArr[1]], - isChecked: false - }; - } - } - temp.push(obj); - }); - } else { - x[newArr[0]].forEach((l) => { - if (formArray.includes(l[newArr[1]])) { - obj = { - label: x[props.schema.data.displayKey], - value: l[newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: x[props.schema.data.displayKey], - value: l[newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: x[props.schema.data.displayKey], - value: l[newArr[1]], - isChecked: false - }; - } - } - temp.push(obj); - }); - } - } else { - if (props.schema.data.displayKey.includes(".")) { - let disArr = props.schema.data.displayKey.split("."); - if (formArray.includes(x[newArr[0]][newArr[1]])) { - obj = { - label: x[disArr[0]][disArr[1]], - value: x[newArr[0]][newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: x[disArr[0]][disArr[1]], - value: x[newArr[0]][newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: x[disArr[0]][disArr[1]], - value: x[newArr[0]][newArr[1]], - isChecked: false - }; - } - } - } else { - if (formArray.includes(x[newArr[0]][newArr[1]])) { - obj = { - label: x[props.schema.data.displayKey], - value: x[newArr[0]][newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: x[props.schema.data.displayKey], - value: x[newArr[0]][newArr[1]], - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: x[props.schema.data.displayKey], - value: x[newArr[0]][newArr[1]], - isChecked: false - }; - } - } - } - } - } else { - if (Array.isArray(x[props.schema.data.valueKey])) { - x[props.schema.data.valueKey].forEach((t) => { - if (formArray.includes(t)) { - obj = { - label: t, - value: t, - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: t, - value: t, - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: t, - value: t, - isChecked: false - }; - } - } - temp.push(obj); - }); - } else if (formArray.includes(x[props.schema.data.valueKey])) { - obj = { - label: x[props.schema.data.displayKey], - value: x[props.schema.data.valueKey], - isChecked: true - }; - _selected.push(obj); - } else { - if (props.schema.selectAll) { - obj = { - label: x[props.schema.data.displayKey], - value: x[props.schema.data.valueKey], - isChecked: true - }; - _selected.push(obj); - } else { - obj = { - label: x[props.schema.data.displayKey], - value: x[props.schema.data.valueKey], - isChecked: false - }; - } - } - temp.push(obj); - } - }); - response = temp; - if (props.schema.uiLayout === "MultiDropdownList") { - if (editFormData) { - let checkData = []; - response.forEach((x) => { - if (x.isChecked) { - checkData.push(x.value); - } - }); - setSelected(checkData); - } - setState({ [`${props.name}_DD`]: response }); - } else { - setState({ [`${props.name}_DD`]: response }); - setSelected(_selected); - } - }); - } catch (error) {} - }; + // if (Array.isArray(x[sltArr[0]])) { + // x[sltArr[0]].forEach((l) => { + // formArray.push(l[sltArr[1]]); + // }); + // } else { + // formArray.push(x[sltArr[0][sltArr[1]]]); + // } + // } else { + // formArray.push(x[props.schema.selectedData.valueKey]); + // } + // }); + // }); + // } catch (error) {} + // } + // res.data.results.forEach((x) => { + // let obj = {}; + // if (props.schema.data.valueKey.includes(".")) { + // let newArr = props.schema.data.valueKey.split("."); + // if (Array.isArray(x[newArr[0]])) { + // if (props.schema.data.displayKey.includes(".")) { + // let _dis = props.schema.data.displayKey.split("."); + // x[newArr[0]].forEach((l) => { + // if (formArray.includes(l[newArr[1]])) { + // obj = { + // label: l[_dis[1]], + // value: l[newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: l[_dis[1]], + // value: l[newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: l[_dis[1]], + // value: l[newArr[1]], + // isChecked: false + // }; + // } + // } + // temp.push(obj); + // }); + // } else { + // x[newArr[0]].forEach((l) => { + // if (formArray.includes(l[newArr[1]])) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: l[newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: l[newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: x[props.schema.data.displayKey], + // value: l[newArr[1]], + // isChecked: false + // }; + // } + // } + // temp.push(obj); + // }); + // } + // } else { + // if (props.schema.data.displayKey.includes(".")) { + // let disArr = props.schema.data.displayKey.split("."); + // if (formArray.includes(x[newArr[0]][newArr[1]])) { + // obj = { + // label: x[disArr[0]][disArr[1]], + // value: x[newArr[0]][newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: x[disArr[0]][disArr[1]], + // value: x[newArr[0]][newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: x[disArr[0]][disArr[1]], + // value: x[newArr[0]][newArr[1]], + // isChecked: false + // }; + // } + // } + // } else { + // if (formArray.includes(x[newArr[0]][newArr[1]])) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[newArr[0]][newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[newArr[0]][newArr[1]], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[newArr[0]][newArr[1]], + // isChecked: false + // }; + // } + // } + // } + // } + // } else { + // if (Array.isArray(x[props.schema.data.valueKey])) { + // x[props.schema.data.valueKey].forEach((t) => { + // if (formArray.includes(t)) { + // obj = { + // label: t, + // value: t, + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: t, + // value: t, + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: t, + // value: t, + // isChecked: false + // }; + // } + // } + // temp.push(obj); + // }); + // } else if (formArray.includes(x[props.schema.data.valueKey])) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[props.schema.data.valueKey], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // if (props.schema.selectAll) { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[props.schema.data.valueKey], + // isChecked: true + // }; + // _selected.push(obj); + // } else { + // obj = { + // label: x[props.schema.data.displayKey], + // value: x[props.schema.data.valueKey], + // isChecked: false + // }; + // } + // } + // temp.push(obj); + // } + // }); + // response = temp; + // if (props.schema.uiLayout === "MultiDropdownList") { + // if (editFormData) { + // let checkData = []; + // response.forEach((x) => { + // if (x.isChecked) { + // checkData.push(x.value); + // } + // }); + // setSelected(checkData); + // } + // setState({ [`${props.name}_DD`]: response }); + // } else { + // setState({ [`${props.name}_DD`]: response }); + // setSelected(_selected); + // } + // }); + // } catch (error) {} + // }; const dragProps = { onDragEnd(fromIndex, toIndex) { @@ -469,15 +471,15 @@ const MultiSelectField = (props) => { // eslint-disable-next-line }, [selected]); - useState(() => { - if (props.formData) { - if (props.formData === "Select") { - } else { - setEditFormData(props.formData); - } - } - // eslint-disable-next-line - }, [props.formData]); + // useState(() => { + // if (props.formData) { + // if (props.formData === "Select") { + // } else { + // setEditFormData(props.formData); + // } + // } + // // eslint-disable-next-line + // }, [props.formData]); const handleModalCloseClick = () => { setIsModel(false); diff --git a/apps/OpenSign/src/components/sidebar/Sidebar.js b/apps/OpenSign/src/components/sidebar/Sidebar.js index b88094154..1d0ff7ed8 100644 --- a/apps/OpenSign/src/components/sidebar/Sidebar.js +++ b/apps/OpenSign/src/components/sidebar/Sidebar.js @@ -23,7 +23,7 @@ const Sidebar = ({ isOpen, closeSidebar }) => { var sideMenu = Parse.Object.extend("w_menu"); var query = new Parse.Query(sideMenu); query.equalTo("objectId", localStorage.getItem("defaultmenuid")); - // query.equalTo("objectId", "46X9z6lAv2"); + const results = await query.first(); const resultjson = results.toJSON(); // console.log("resultjson ", resultjson); diff --git a/apps/OpenSign/src/constant/saveFileSize.js b/apps/OpenSign/src/constant/saveFileSize.js index 007b52d14..8fd678da1 100644 --- a/apps/OpenSign/src/constant/saveFileSize.js +++ b/apps/OpenSign/src/constant/saveFileSize.js @@ -44,7 +44,7 @@ export const SaveFileSize = async (size, imageUrl) => { } } ) - .then((result) => { + .then(() => { // const res = result.data; // console.log("save res", res); }) @@ -62,7 +62,7 @@ export const SaveFileSize = async (size, imageUrl) => { "X-Parse-Application-Id": parseAppId } }) - .then((result) => { + .then(() => { // const res = result.data; // console.log("res", res); }) @@ -91,7 +91,7 @@ const saveDataFile = async (size, imageUrl) => { "X-Parse-Application-Id": parseAppId } }) - .then((result) => { + .then(() => { // const res = result.data; // console.log("res", res); }) diff --git a/apps/OpenSign/src/constant/searchQuery.js b/apps/OpenSign/src/constant/searchQuery.js index d5f279bf9..d9d5531bf 100644 --- a/apps/OpenSign/src/constant/searchQuery.js +++ b/apps/OpenSign/src/constant/searchQuery.js @@ -2,7 +2,7 @@ import moment from "moment"; export default function onSearchFilter(_search) { switch (_search) { - case "Today": + case "Today": { let d = new Date(); let formDate = new Date( Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0) @@ -12,7 +12,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let Query = `'$gte':'${formDate}','$lte':'${Todate}'`; return Query; - case "Yesterday": + } + case "Yesterday": { let d1 = new Date(); d1.setDate(d1.getDate() - 1); let yesFrDate = new Date( @@ -24,8 +25,9 @@ export default function onSearchFilter(_search) { ).toISOString(); let Query1 = `'$gte':'${yesFrDate}','$lte':'${YesTodate}'`; return Query1; + } - case "This week": + case "This week": { let oneDay = 24 * 60 * 60 * 1000; let curr = new Date(); // get current date let first = curr.getDate() - curr.getDay(); // First day is the day of the month - the day of the week @@ -66,8 +68,9 @@ export default function onSearchFilter(_search) { ).toISOString(); let Query2 = `'$gte':'${firstday}','$lte':'${lastday}'`; return Query2; + } - case "Last 7 days": + case "Last 7 days": { let d7 = new Date(); let d7l = new Date(); d7.setDate(d7.getDate() - 7); @@ -79,8 +82,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let Query7 = `'$gte':'${date7}','$lte':'${l7t}'`; return Query7; - - case "Last 14 days": + } + case "Last 14 days": { let d14 = new Date(); let d14l = new Date(); let l14t = new Date( @@ -100,8 +103,9 @@ export default function onSearchFilter(_search) { let Query14 = `'$gte':'${date14}','$lte':'${l14t}'`; return Query14; + } - case "Last 30 days": + case "Last 30 days": { let d30 = new Date(); let d30l = new Date(); let l30t = new Date( @@ -119,13 +123,13 @@ export default function onSearchFilter(_search) { Date.UTC(d30.getFullYear(), d30.getMonth(), d30.getDate(), 0, 0, 0) ).toISOString(); return `'$gte':'${date30}','$lte':'${l30t}'`; - - case "Last week": + } + case "Last week": { const from_date = moment().startOf("week").subtract(7, "days"); const to_date = moment().endOf("week").subtract(7, "days"); return `'$gte':'${from_date.toISOString()}','$lte':'${to_date.toISOString()}'`; - - case "This month": + } + case "This month": { var tdate = new Date(); var tfirstDay = new Date( tdate.getFullYear(), @@ -139,8 +143,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let Querylt = `'$gte':'${tfirstDay}','$lte':'${tlastDay}'`; return Querylt; - - case "Last month": + } + case "Last month": { var ldate = new Date(); var lfirstDay = new Date( ldate.getFullYear(), @@ -154,8 +158,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let Queryltl = `'$gte':'${lfirstDay}','$lte':'${llastDay}'`; return Queryltl; - - case "All": + } + case "All": { let fall = new Date( new Date().getFullYear() - 100, 0, @@ -166,8 +170,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let fall_year = `'$gte':'${fall}'`; return fall_year; - - case "This year": + } + case "This year": { let fcy = new Date(new Date().getFullYear(), 0, 1, 0, 0, 0).toISOString(); let lcy = new Date( new Date().getFullYear(), @@ -179,8 +183,8 @@ export default function onSearchFilter(_search) { ).toISOString(); let cur_year = `'$gte':'${fcy}','$lte':'${lcy}'`; return cur_year; - - case "Last year": + } + case "Last year": { let fly = new Date( new Date().getFullYear() - 1, 0, @@ -199,7 +203,7 @@ export default function onSearchFilter(_search) { ).toISOString(); let last_year = `'$gte':'${fly}','$lte':'${lly}'`; return last_year; - + } default: return ""; } diff --git a/apps/OpenSign/src/hook/useWindowSize.js b/apps/OpenSign/src/hook/useWindowSize.js index 4551ff1b8..0c84d6f13 100644 --- a/apps/OpenSign/src/hook/useWindowSize.js +++ b/apps/OpenSign/src/hook/useWindowSize.js @@ -15,9 +15,7 @@ export function useWindowSize() { useEffect(() => { onResize(); - window.addEventListener("resize", onResize); - return () => { window.removeEventListener("resize", onResize); }; diff --git a/apps/OpenSign/src/microappComponent/DragElement.js b/apps/OpenSign/src/microappComponent/DragElement.js index 3edef8346..2c8b5cb9d 100644 --- a/apps/OpenSign/src/microappComponent/DragElement.js +++ b/apps/OpenSign/src/microappComponent/DragElement.js @@ -3,7 +3,7 @@ import stamp from "./stamp2.png"; import sign from "./sign3.png"; import { themeColor } from "./IconColor.js"; -function DragElement({ type, id }) { +function DragElement({ id }) { const selectedId = id; return ( diff --git a/apps/OpenSign/src/redux/actions/index.js b/apps/OpenSign/src/redux/actions/index.js index 8a5734ef9..b0aab4247 100644 --- a/apps/OpenSign/src/redux/actions/index.js +++ b/apps/OpenSign/src/redux/actions/index.js @@ -141,7 +141,9 @@ export const login = (username, password) => async (dispatch) => { console.error("Error while fetching tour", error); } ); - } catch (error) {} + } catch (error) { + console.log("err ", error) + } } }); @@ -167,7 +169,7 @@ export const login = (username, password) => async (dispatch) => { }; //for reset password -export const forgetPassword = (username) => async (dispatch) => { +export const forgetPassword = (username) => async () => { // let res = {}; let baseUrl = localStorage.getItem("BaseUrl12"); let parseAppId = localStorage.getItem("AppID12"); diff --git a/apps/OpenSign/src/routes/ChangePassword.js b/apps/OpenSign/src/routes/ChangePassword.js index 7a3d160dc..79fcd1431 100644 --- a/apps/OpenSign/src/routes/ChangePassword.js +++ b/apps/OpenSign/src/routes/ChangePassword.js @@ -23,17 +23,17 @@ function ChangePassword() { user.set("password", newpassword); user .save() - .then((response) => { + .then(() => { alert("Password updated successfully."); }) .catch((error) => { + console.log("err", error); alert("Something went wrong."); }); }); } else { alert("Your current password is missing or incorrect."); } - console.log("Logged in user", user); }) .catch((error) => { @@ -43,7 +43,9 @@ function ChangePassword() { } else { alert("Your password and confirmation password do not match."); } - } catch (error) {} + } catch (error) { + console.log("err", error); + } }; if (localStorage.getItem("accesstoken") === null) { return ; diff --git a/apps/OpenSign/src/routes/ForgetPassword.js b/apps/OpenSign/src/routes/ForgetPassword.js index 430e5d355..356a35952 100644 --- a/apps/OpenSign/src/routes/ForgetPassword.js +++ b/apps/OpenSign/src/routes/ForgetPassword.js @@ -44,11 +44,8 @@ class forgotPassword extends Component { } }; - componentWillMount() { - this.props.fetchAppInfo(localStorage.getItem("domain")); - } - componentDidMount() { + this.props.fetchAppInfo(localStorage.getItem("domain")); window.addEventListener("resize", this.resize.bind(this)); this.resize(); } diff --git a/apps/OpenSign/src/routes/Form.js b/apps/OpenSign/src/routes/Form.js index 95347ae1b..fd5c67449 100644 --- a/apps/OpenSign/src/routes/Form.js +++ b/apps/OpenSign/src/routes/Form.js @@ -95,9 +95,7 @@ class FormBuilder extends Component { userSchema: resultjson.userSchema }); } - for (let [key, value] of Object.entries( - resultjson.jsonSchema.properties - )) { + for (let [value] of Object.entries(resultjson.jsonSchema.properties)) { if (typeof value === "object") { for (let [k, v] of Object.entries(value)) { if (k === "format" && v === "date") { @@ -292,8 +290,7 @@ class FormBuilder extends Component { RowData[k] = RowData[k].trim(); } if (val.properties[k].data !== undefined) { - if (Array.isArray(val.properties[k].data)) { - } else if (val.properties[k].data.isPointer) { + if (val.properties[k].data.isPointer) { let pointer = undefined; if (val.properties[k].data.class) { if (val.properties[k].data.savePointerClass) { @@ -343,8 +340,6 @@ class FormBuilder extends Component { }); } let _userScheama = this.state.userSchema; - let temp = []; - Object.keys(_scanData).forEach(function (key) { let _dd = _scanData[key]; typeof _dd === "object" && @@ -418,8 +413,7 @@ class FormBuilder extends Component { RowData[k] = newDate; } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = undefined; if (_dd[k].data.savePointerClass) { if (RowData[k]) { @@ -469,8 +463,6 @@ class FormBuilder extends Component { }); Object.keys(_userScheama).forEach(function (kkey) { - let _userKey = _userScheama[kkey]; - Object.keys(RowData).forEach(function (_k) { if (_userScheama[kkey].startsWith("$")) { let _uuu = _userScheama[kkey].replace("$", ""); @@ -521,7 +513,7 @@ class FormBuilder extends Component { roleName: RoleField, userId: u.id }; - axios.post(roleurl, body, { headers: headers }).then((res) => { + axios.post(roleurl, body, { headers: headers }).then(() => { const currentUser = Parse.User.current(); let _fname = this.state.title; var forms = Parse.Object.extend(_fname); @@ -657,7 +649,7 @@ class FormBuilder extends Component { }; await axios .post(roleurl, body, { headers: headers }) - .then((res) => { + .then(() => { const currentUser = Parse.User.current(); let _fname = this.state.title; var forms = Parse.Object.extend(_fname); @@ -693,7 +685,7 @@ class FormBuilder extends Component { form.setACL(new Parse.ACL(ACL)); } form.save(RowData).then( - (form) => { + () => { let filtered = {}; if (this.state.redirect_type === "clearData") { if ( @@ -825,8 +817,7 @@ class FormBuilder extends Component { RowData[k] = RowData[k].trim(); } if (val.properties[k].data !== undefined) { - if (Array.isArray(val.properties[k].data)) { - } else if (val.properties[k].data.isPointer) { + if (val.properties[k].data.isPointer) { let pointer = undefined; if (val.properties[k].data.savePointerClass) { if (RowData[k]) { @@ -948,8 +939,7 @@ class FormBuilder extends Component { } } if (_dd[k].data !== undefined) { - if (_dd[k].data[0] !== undefined) { - } else if (_dd[k].data.isPointer) { + if (_dd[k].data.isPointer) { let pointer = undefined; if (RowData[k] && RowData[k] !== "Select") { if (_dd[k].type === "array") { @@ -1050,16 +1040,10 @@ class FormBuilder extends Component { const qu = new Parse.Query(Agent); qu.equalTo("objectId", l.objectId); qu.include(new_arr[1]); - await qu.first().then( - (results) => {}, - (error) => { - console.error( - "Error while fetching Agent", - error.massage - ); - } - ); - } catch (err) {} + await qu.first(); + } catch (err) { + console.error("Error while fetching Agent", err.massage); + } } } if (key.startsWith("role")) { @@ -1178,7 +1162,7 @@ class FormBuilder extends Component { this.saveUrlParamToFormdata(); } - componentWillReceiveProps(newProps) { + UNSAFE_componentWillReceiveProps(newProps) { let id = newProps.id; this.getForm(id); } diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js index ed9b0baeb..a29895bd0 100644 --- a/apps/OpenSign/src/routes/Login.js +++ b/apps/OpenSign/src/routes/Login.js @@ -7,7 +7,7 @@ import { fetchAppInfo, showTenantName } from "../redux/actions"; import axios from "axios"; import Title from "../components/Title"; import GoogleSignInBtn from "../components/LoginGoogle"; -import LoginFacebook from "../components/LoginFacebook"; +// import LoginFacebook from "../components/LoginFacebook"; import { NavLink, useNavigate } from "react-router-dom"; import login_img from "../assets/images/login_img.svg"; @@ -375,6 +375,7 @@ function Login(props) { } }) .catch((err) => { + console.log("err", err); setState({ ...state, loading: false, @@ -690,7 +691,7 @@ function Login(props) { }, 2000); } }) - .catch((err) => { + .catch(() => { setThirdpartyLoader(false); setState({ ...state, @@ -1034,14 +1035,14 @@ function Login(props) { justifyContent: "center" }} > - {props.appInfo.fbAppId && props.appInfo.fbAppId !== "" ? ( + {/* {props.appInfo.fbAppId && props.appInfo.fbAppId !== "" ? ( - ) : null} + ) : null} */}
{ } localStorage.setItem("showpopup", true); - localStorage.setItem( - "IncludedApps", - JSON.stringify(tenentInfo) - ); - localStorage.setItem( "PageLanding", element.pageId @@ -420,6 +415,7 @@ const PgSignUp = (props) => { } }) .catch((err) => { + console.log('err', err) setIsLoader(false); }); } diff --git a/apps/OpenSign/src/routes/PlanSubscriptions.js b/apps/OpenSign/src/routes/PlanSubscriptions.js index d28a76217..61784986e 100644 --- a/apps/OpenSign/src/routes/PlanSubscriptions.js +++ b/apps/OpenSign/src/routes/PlanSubscriptions.js @@ -39,10 +39,6 @@ const PlanSubscriptions = () => { // eslint-disable-next-line }, []); - // const toggleFrequency = () => { - // setYearlyVisible(!yearlyVisible); - // }; - return ( <> diff --git a/apps/OpenSign/src/routes/Signup.js b/apps/OpenSign/src/routes/Signup.js index e414d98dc..ea3481cb7 100644 --- a/apps/OpenSign/src/routes/Signup.js +++ b/apps/OpenSign/src/routes/Signup.js @@ -25,7 +25,6 @@ const Signup = (props) => { }); const [showPassword, setShowPassword] = useState(false); const togglePasswordVisibility = () => setShowPassword(!showPassword); - const settings = props.appInfo.settings; const image = props.appInfo.applogo; const handleSubmit = (event) => { @@ -320,95 +319,74 @@ const Signup = (props) => { /* alert( "You dont have access to this application." ); */ - setState( - { - loading: false, - toastColor: "#d9534f", - toastDescription: - "You dont have access to this application." - }, - () => { - var x = document.getElementById("snackbar"); - x.className = "show"; - setTimeout(function () { - x.className = x.className.replace("show", ""); - }, 5000); - localStorage.setItem("accesstoken", null); - } - ); - + setState({ + loading: false, + toastColor: "#d9534f", + toastDescription: + "You dont have access to this application." + }); + const x = document.getElementById("snackbar"); + x.className = "show"; + setTimeout(function () { + x.className = x.className.replace("show", ""); + }, 2000); + localStorage.setItem("accesstoken", null); console.error("Error while fetching Follow", error); } ); } }); } else { - setState( - { - loading: false, - toastColor: "#d9534f", - toastDescription: "User Role Not Found." - }, - () => { - var x = document.getElementById("snackbar"); - x.className = "show"; - setTimeout(function () { - x.className = x.className.replace("show", ""); - }, 5000); - } - ); - } - } else { - setState( - { + setState({ loading: false, toastColor: "#d9534f", toastDescription: "User Role Not Found." - }, - () => { - var x = document.getElementById("snackbar"); - x.className = "show"; - setTimeout(function () { - x.className = x.className.replace("show", ""); - }, 5000); - } - ); - } - }) - .catch((err) => { - setState( - { - loading: false, - toastColor: "#d9534f", - toastDescription: `Does not have permissions to access this application.` - }, - () => { - var x = document.getElementById("snackbar"); + }); + const x = document.getElementById("snackbar"); x.className = "show"; setTimeout(function () { x.className = x.className.replace("show", ""); - }, 5000); + }, 2000); } - ); + } else { + setState({ + loading: false, + toastColor: "#d9534f", + toastDescription: "User Role Not Found." + }); + const x = document.getElementById("snackbar"); + x.className = "show"; + setTimeout(function () { + x.className = x.className.replace("show", ""); + }, 2000); + } + }) + .catch((err) => { + console.log("err", err); + setState({ + loading: false, + toastColor: "#d9534f", + toastDescription: `Does not have permissions to access this application.` + }); + const x = document.getElementById("snackbar"); + x.className = "show"; + setTimeout(function () { + x.className = x.className.replace("show", ""); + }, 2000); }); } } catch (error) { // alert(`${error.message}`); - setState( - { - loading: false, - toastColor: "#d9534f", - toastDescription: `${error.message}` - }, - () => { - var x = document.getElementById("snackbar"); - x.className = "show"; - setTimeout(function () { - x.className = x.className.replace("show", ""); - }, 5000); - } - ); - + setState({ + loading: false, + toastColor: "#d9534f", + toastDescription: `${error.message}` + }); + const x = document.getElementById("snackbar"); + x.className = "show"; + setTimeout(function () { + x.className = x.className.replace("show", ""); + }, 2000); console.log(error); } } @@ -458,19 +436,6 @@ const Signup = (props) => { ></div> </div> )} - {settings && - settings.map((x) => { - return x.pageType === "microapp" ? ( - <iframe - key={x.pageId} - id="def_iframe" - src={x.pageId} - height="0px" - width="0px" - title="signi" - /> - ) : null; - })} <Title title={"Signup page"} />