admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HUGE REFACTOR / CLEANUP

Browse Source 
if there is a issue it's probably something in here that was changed
This commit is contained in:
John Cardinal
2021-09-28 20:19:44 +00:00
parent 51eddfede9
commit d0afdd9855
238 changed files with 3127 additions and 8614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
ayanova/src/views/cust-user.vue
View File

@@ -1,15 +1,12 @@
<template>
<div>
<gz-report-selector ref="reportSelector"></gz-report-selector>
<div v-if="formState.ready">
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<v-form ref="form">
<v-tabs mobile-breakpoint="100" v-model="tab">
<v-tab>{{ $ay.t("Contact") }}</v-tab>
<v-tab>{{ $ay.t("UserSettings") }}</v-tab>
<v-tabs-items v-model="tab">
<v-tab-item class="mt-4 ml-2">
<v-row>
@@ -393,74 +390,21 @@
</v-overlay>
</div>
</template>
<script>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
const FORM_KEY = "contact-edit";
const API_BASE_URL = "user/";
const FORM_CUSTOM_TEMPLATE_KEY = "Contact"; //<--- deliberately not 'User' as is customary as this is it's own form but also edit's User type objects so needs it's own customization key
export default {
async created() {
//created is called when the route is updated to show a new record even though we don't need to re-init again
let vm = this;
const vm = this;
try {
await initForm(vm);
//## NOTE: This is a Contact form so follows Customer rights even though User object
vm.rights = window.$gz.role.getRights(window.$gz.type.Customer);
vm.formState.readOnly = !vm.rights.change;
window.$gz.eventBus.$on("menu-click", clickHandler);
// //id 0 means create or duplicate to new
// if (vm.$route.params.recordid != 0) {
// //is there already an obj from a prior operation?
// if (this.$route.params.obj) {
// //yes, no need to fetch it
// this.obj = this.$route.params.obj;
// this.optionsObj = this.$route.params.optionsObj;
// vm.formState.loading = false; //here we handle it immediately
// } else {
// await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
// }
// } else {
// vm.password = window.$gz.util.getRandomPassword();
// // vm.login = window.$gz.util.getRandomPassword();
// /* Customer = 3,
// HeadOffice = 4, */
// if (vm.$route.params.customerid && vm.$route.params.customerid != 0) {
// vm.obj.customerId = vm.$route.params.customerid;
// vm.obj.userType = 3;
// } else if (
// vm.$route.params.headofficeid &&
// vm.$route.params.headofficeid != 0
// ) {
// vm.obj.headOfficeId = vm.$route.params.headofficeid;
// vm.obj.userType = 4;
// } else {
// //no customer or headoffice id, can't proceed
// // navigate backwards
// vm.$router.go(-1);
// //if above turns out to be problematic just go to customers list instead
// // vm.$router.push({
// // name: "cust-customers"
// // });
// }
// vm.formState.loading = false; //here we handle it immediately
// }
// //set initial form status
// window.$gz.form.setFormState({
// vm: vm,
// dirty: false,
// valid: true
// });
let setDirty = false;
let setValid = true;
//id 0 means create or duplicate to new
if (vm.$route.params.recordid != 0) {
//is there already an obj from a prior operation?
@@ -469,7 +413,7 @@ export default {
this.obj = this.$route.params.obj;
this.optionsObj = this.$route.params.optionsObj;
} else {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
await vm.getDataFromApi(vm.$route.params.recordid);
}
} else {
//Might be a duplicate and contain another record
@@ -487,9 +431,6 @@ export default {
setDirty = true;
} else {
vm.password = window.$gz.util.getRandomPassword();
/* Customer = 3,
HeadOffice = 4, */
if (vm.$route.params.customerid && vm.$route.params.customerid != 0) {
vm.obj.customerId = vm.$route.params.customerid;
vm.obj.userType = 3;
@@ -501,23 +442,16 @@ export default {
vm.obj.userType = 4;
} else {
//no customer or headoffice id, can't proceed
// navigate backwards
vm.$router.go(-1);
//if above turns out to be problematic just go to customers list instead
// vm.$router.push({
// name: "cust-customers"
// });
}
}
}
window.$gz.form.setFormState({
vm: vm,
loading: false,
dirty: setDirty,
valid: setValid
valid: true
});
generateMenu(vm);
} catch (error) {
window.$gz.errorHandler.handleFormError(error, vm);
@@ -565,15 +499,6 @@ export default {
lastLogin: null
},
optionsObj: {
/*concurrency": 7490431,
"translationId": 1,
"emailAddress": null,
"uiColor": "#000000",
"languageOverride": null,
"timeZoneOverride": null,
"currencyName": "USD",
"hour12": true,
"userId": 1 */
id: 0,
concurrency: 0,
emailAddress: null,
@@ -606,22 +531,17 @@ export default {
ayaType: window.$gz.type.User
};
},
//WATCHERS
watch: {
formState: {
handler: function(val) {
if (this.formState.loading) {
return;
}
//enable / disable save button
if (val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
//enable / disable duplicate / new button
if (!val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit(
"menu-enable-item",
@@ -639,7 +559,6 @@ export default {
deep: true
}
},
methods: {
goHelp() {
window.open(
@@ -679,19 +598,15 @@ export default {
}
},
async getDataFromApi(recordId) {
let vm = this;
const vm = this;
vm.formState.loading = true;
if (!recordId) {
throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
}
let url = API_BASE_URL + recordId;
try {
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.get(url);
const res = await window.$gz.api.get(API_BASE_URL + recordId);
if (res.error) {
//Not found?
if (res.error.code == "2010") {
window.$gz.form.handleObjectNotFound(vm);
}
@@ -700,17 +615,13 @@ export default {
vm.formState.loading = false;
} else {
vm.obj = res.data;
//modify the menu as necessary
generateMenu(vm);
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
loading: false
});
await vm.getUserOptionsDataFromApi();
}
} catch (error) {
@@ -719,17 +630,13 @@ export default {
}
},
async submit() {
let vm = this;
const vm = this;
if (vm.canSave == false) {
return;
}
try {
vm.formState.loading = true;
let url = API_BASE_URL;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
//add in password and login if changed
if (vm.password != null && vm.password != "") {
vm.obj.password = vm.password;
@@ -740,20 +647,16 @@ export default {
if (vm.obj.roles == null) {
vm.obj.roles = 0;
}
let res = await window.$gz.api.upsert(url, vm.obj);
const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
if (res.data.id) {
//POST - whole new object returned
//POST
vm.obj = res.data;
vm.optionsObj.userId = res.data.id;
await vm.submitOptions();
//Change URL to new record
//NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
this.$router.replace({
name: "cust-user",
params: {
@@ -763,13 +666,10 @@ export default {
}
});
} else {
//PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
//Handle "put" of an existing record (UPDATE)
//PUT
vm.obj.concurrency = res.data.concurrency;
await vm.submitOptions();
}
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -783,34 +683,26 @@ export default {
}
},
async remove() {
let vm = this;
const vm = this;
try {
let dialogResult = await window.$gz.dialog.confirmDelete();
const dialogResult = await window.$gz.dialog.confirmDelete();
if (dialogResult != true) {
return;
}
//do the delete
vm.formState.loading = true;
//No need to delete a new record, just abandon it...
if (vm.$route.params.recordid == 0) {
//this should not get offered for delete but to be safe and clear just in case:
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
} else {
let url = API_BASE_URL + vm.$route.params.recordid;
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.remove(url);
const res = await window.$gz.api.remove(
API_BASE_URL + vm.$route.params.recordid
);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//workaround to prevent warning about leaving dirty record
//For some reason I couldn't just reset isdirty in formstate
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
}
}
@@ -821,57 +713,22 @@ export default {
}
},
duplicate() {
//Navigate to new record
this.$router.push({
name: "cust-user",
params: {
recordid: 0,
obj: this.obj, // pass data object to new form
obj: this.obj,
optionsObj: this.optionsObj
}
});
},
// async duplicate() {
// let vm = this;
// if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
// return;
// }
// vm.formState.loading = true;
// let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
// try {
// window.$gz.form.deleteAllErrorBoxErrors(vm);
// let res = await window.$gz.api.upsert(url);
// if (res.error) {
// vm.formState.serverError = res.error;
// window.$gz.form.setErrorBoxErrors(vm);
// } else {
// //Navigate to new record
// this.$router.push({
// name: "adm-user",
// params: {
// recordid: res.data.id,
// obj: res.data // pass data object to new form
// }
// });
// }
// } catch (ex) {
// window.$gz.errorHandler.handleFormError(ex, vm);
// } finally {
// vm.formState.loading = false;
// }
// },
async getUserOptionsDataFromApi() {
let vm = this;
const vm = this;
vm.formState.loading = true;
let url = `user-option/${vm.obj.id}`;
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.get(url);
const res = await window.$gz.api.get(`user-option/${vm.obj.id}`);
if (res.error) {
//Not found?
if (res.error.code == "2010") {
window.$gz.form.handleObjectNotFound(vm);
}
@@ -879,19 +736,15 @@ export default {
window.$gz.form.setErrorBoxErrors(vm);
} else {
vm.optionsObj = res.data;
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
loading: false
});
//modify the menu as necessary
generateMenu(vm);
}
} catch (error) {
//Update the form status
window.$gz.form.setFormState({
vm: vm,
loading: false
@@ -900,25 +753,21 @@ export default {
}
},
async submitOptions() {
let vm = this;
const vm = this;
if (vm.canSave) {
vm.formState.loading = true;
let url = `user-option/${vm.obj.id}`;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.put(url, vm.optionsObj);
const res = await window.$gz.api.put(
`user-option/${vm.obj.id}`,
vm.optionsObj
);
vm.formState.loading = false;
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//UserOptions is never a POST as it always exists and can't be deleted so always a PUT
//Handle "put" of an existing record (UPDATE)
vm.optionsObj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
@@ -932,10 +781,10 @@ export default {
}
},
async sendResetCode() {
let vm = this;
const vm = this;
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.post(
const res = await window.$gz.api.post(
`auth/request-reset-password/${vm.obj.id}`,
null
);
@@ -950,15 +799,11 @@ export default {
}
},
async disableTfa() {
let vm = this;
const vm = this;
vm.formState.loading = true;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
const res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
@@ -973,8 +818,6 @@ export default {
vm.loading = false;
}
}
//------more above here
}
};
@@ -985,7 +828,7 @@ async function clickHandler(menuItem) {
if (!menuItem) {
return;
}
let m = window.$gz.menu.parseMenuItem(menuItem);
const m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) {
case "save":
@@ -994,17 +837,11 @@ async function clickHandler(menuItem) {
case "delete":
m.vm.remove();
break;
// case "new":
// m.vm.$router.push({
// name: "adm-user",
// params: { recordid: 0 }
// });
// break;
case "duplicate":
m.vm.duplicate();
break;
case "report":
let res = await m.vm.$refs.reportSelector.open(
const res = await m.vm.$refs.reportSelector.open(
{
AType: window.$gz.type.User,
selectedRowIds: [m.vm.obj.id]
@@ -1049,7 +886,7 @@ async function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
let menuOptions = {
const menuOptions = {
isMain: false,
readOnly: vm.formState.readOnly,
icon: "$ayiUser",
@@ -1084,8 +921,6 @@ function generateMenu(vm) {
});
}
//STUB REPORTS
//Report not Print, print is a further option
menuOptions.menuItems.push({
title: "Report",
icon: "$ayiFileAlt",
@@ -1093,8 +928,7 @@ function generateMenu(vm) {
vm: vm
});
//get last report selected
let lastReport = window.$gz.form.getLastReport(FORM_KEY);
const lastReport = window.$gz.form.getLastReport(FORM_KEY);
if (lastReport != null) {
menuOptions.menuItems.push({
title: lastReport.name,
@@ -1104,16 +938,6 @@ function generateMenu(vm) {
vm: vm
});
}
// if (vm.rights.change) {
// menuOptions.menuItems.push({
// title: "New",
// icon: "$ayiPlus",
// key: FORM_KEY + ":new",
// vm: vm
// });
// }
if (vm.rights.change && vm.$route.params.recordid != 0) {
menuOptions.menuItems.push({
title: "Duplicate",
@@ -1221,11 +1045,10 @@ async function fetchTranslatedText(vm) {
//
async function populateSelectionLists(vm) {
//http://localhost:7575/api/v8/translation/list
let res = await window.$gz.api.get("translation/list");
const res = await window.$gz.api.get("translation/list");
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
//window.$gz.errorHandler.handleFormError(res.error, vm);
} else {
vm.selectLists.translations = res.data;
}