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

Browse Source
This commit is contained in:
John Cardinal
2020-06-20 00:24:36 +00:00
parent 10693a9bc3
commit 85006be6c1
6 changed files with 120 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/devdocs/todo.txt
View File

@@ -5,8 +5,6 @@ PRIORITY - ALWAYS Lowest level stuff first, i.e. TODO at server, api route chang
WIFI change 5g channel to 52,56,60 and 2g channel to 8 WIFI change 5g channel to 52,56,60 and 2g channel to 8
recheck before doing as it seems to vary, maybe someone else's is auto switching recheck before doing as it seems to vary, maybe someone else's is auto switching
todo: remove all use of .then() as it's being used incorrectly
replace with await and async methods

75
ayanova/src/views/ops-metrics.vue
View File

@@ -104,18 +104,17 @@ const CHART_PALETTE = {
}; };
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { await initForm(vm);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(vm); generateMenu(vm);
vm.getDataFromApi(); vm.getDataFromApi();
}) } catch (err) {
.catch(err => { vm.formState.ready = true;
vm.formState.ready = true; window.$gz.errorHandler.handleFormError(err, vm);
window.$gz.errorHandler.handleFormError(err, vm); }
});
}, },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -192,7 +191,7 @@ export default {
} }
}, },
getDataFromApi(breakPoint) { async getDataFromApi(breakPoint) {
let vm = this; let vm = this;
if (vm.formState.loading) { if (vm.formState.loading) {
return; return;
@@ -245,41 +244,37 @@ export default {
filterDates.before; filterDates.before;
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api try {
.get(url) let res = await window.$gz.api.get(url);
.then(res => {
if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
}
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
vm[tabIndexToRoute(vm.tab)] = res.data;
vm.lastFetchBreakPoint = breakPoint;
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
loading: false
});
vm.formState.ready = true; if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
} }
}) vm.formState.serverError = res.error;
.catch(function handleGetDataFromAPIError(error) { window.$gz.form.setErrorBoxErrors(vm);
} else {
vm[tabIndexToRoute(vm.tab)] = res.data;
vm.lastFetchBreakPoint = breakPoint;
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
dirty: false,
valid: true,
loading: false loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm);
vm.formState.ready = true;
}
} catch (error) {
window.$gz.form.setFormState({
vm: vm,
loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm);
}
} }
}, },
computed: { computed: {

23
ayanova/src/views/ops-profile.vue
View File

@@ -28,19 +28,18 @@
const FORM_KEY = "ops-profile"; const FORM_KEY = "ops-profile";
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { await initForm(vm);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(vm); generateMenu(vm);
// vm.getDataFromApi(); // vm.getDataFromApi();
this.formState.ready = true; this.formState.ready = true;
}) } catch (err) {
.catch(err => { vm.formState.ready = true;
vm.formState.ready = true; window.$gz.errorHandler.handleFormError(err, vm);
window.$gz.errorHandler.handleFormError(err, vm); }
});
}, },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);

159
ayanova/src/views/ops-server-state.vue
View File

@@ -49,33 +49,20 @@ const API_BASE_URL = "server-state/";
const FORM_CUSTOM_TEMPLATE_KEY = "ops-server-state"; const FORM_CUSTOM_TEMPLATE_KEY = "ops-server-state";
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.ServerState);
vm.formState.readOnly = !vm.rights.change; vm.rights = window.$gz.role.getRights(window.$gz.type.ServerState);
window.$gz.eventBus.$on("menu-click", clickHandler); vm.formState.readOnly = !vm.rights.change;
vm.getDataFromApi(); window.$gz.eventBus.$on("menu-click", clickHandler);
}) vm.getDataFromApi();
.catch(err => { } catch (err) {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
// beforeRouteLeave(to, from, next) {
// if (this.formState.dirty) {
// window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => {
// if (dialogResult == true) {
// next();
// } else {
// next(false);
// }
// });
// } else {
// next();
// }
// },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
}, },
@@ -134,42 +121,41 @@ export default {
window.$gz.form.fieldValueChanged(this, ref); window.$gz.form.fieldValueChanged(this, ref);
} }
}, },
getDataFromApi() { async getDataFromApi() {
let vm = this; let vm = this;
vm.formState.loading = true; vm.formState.loading = true;
let url = API_BASE_URL; let url = API_BASE_URL;
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api try {
.get(url) let res = await window.$gz.api.get(url);
.then(res => {
vm.formState.ready = true; vm.formState.ready = true;
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm); window.$gz.form.setErrorBoxErrors(vm);
} else { } else {
vm.obj = res.data; vm.obj = 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(function handleGetDataFromAPIError(error) {
//Update the form status //Update the form status
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
dirty: false,
valid: true,
loading: false loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm); //modify the menu as necessary
generateMenu(vm);
}
} catch (error) {
//Update the form status
window.$gz.form.setFormState({
vm: vm,
loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm);
}
}, },
submit() { async submit() {
let vm = this; let vm = this;
if (vm.canSave) { if (vm.canSave) {
vm.formState.loading = true; vm.formState.loading = true;
@@ -177,49 +163,48 @@ export default {
//clear any errors vm might be around from previous submit //clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api try {
.upsert(url, vm.obj) let res = await window.$gz.api.upsert(url, vm.obj);
.then(res => {
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.formState.loading = false;
vm.obj.concurrency = res.data.concurrency; if (res.error) {
window.$gz.form.setFormState({ vm.formState.serverError = res.error;
vm: vm, window.$gz.form.setErrorBoxErrors(vm);
dirty: false } else {
}); //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
//Set values in store so they are updated immediately for user //Handle "put" of an existing record (UPDATE)
let l = vm.$store.state.locale; vm.obj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
dirty: false
});
if (vm.obj.languageOverride) { //Set values in store so they are updated immediately for user
l.languageOverride = vm.obj.languageOverride; let l = vm.$store.state.locale;
}
if (vm.obj.timeZoneOverride) { if (vm.obj.languageOverride) {
l.timeZoneOverride = vm.obj.timeZoneOverride; l.languageOverride = vm.obj.languageOverride;
}
if (vm.obj.currencyName) {
l.currencyName = vm.obj.currencyName;
}
if (vm.obj.hour12) {
l.hour12 = vm.obj.hour12;
}
window.$gz.store.commit("setLocale", l);
} }
})
.catch(function handleSubmitError(error) { if (vm.obj.timeZoneOverride) {
vm.formState.loading = false; l.timeZoneOverride = vm.obj.timeZoneOverride;
window.$gz.errorHandler.handleFormError(error, vm); }
});
if (vm.obj.currencyName) {
l.currencyName = vm.obj.currencyName;
}
if (vm.obj.hour12) {
l.hour12 = vm.obj.hour12;
}
window.$gz.store.commit("setLocale", l);
}
} catch (error) {
vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm);
}
} }
} }
} }

2
ayanova/tests/e2e/specs/jwt-example.js
View File

@@ -7,7 +7,7 @@
// password: Cypress.env("adminpassword") // password: Cypress.env("adminpassword")
// }) // })
// .its("body") // .its("body")
// .then(res => { // .thsden(res => {
// user = res; // user = res;
// }); // });
// }); // });

2
ayanova/tests/e2e/specs/search-form.js
View File

@@ -36,7 +36,7 @@ describe("SEARCH", () => {
let sub = null; let sub = null;
//funcs are async so need to get result via then //funcs are async so need to get result via then
// cy.url().then(url => { // cy.url().thsen(url => {
// startUrl = url; // startUrl = url;
// }); // });