From 6b357b85004914b83c3e1d31e1dc4900b4260bef Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 8 Oct 2020 20:31:06 +0000 Subject: [PATCH] --- ayanova/src/api/ayanova-version.js | 2 +- ayanova/src/api/gzform.js | 22 +++++++++---------- ayanova/src/main.js | 2 +- ayanova/src/views/adm-translation.vue | 7 +----- ayanova/src/views/adm-user.vue | 7 +----- ayanova/src/views/adm-users.vue | 5 +---- ayanova/src/views/ay-history.vue | 7 +----- ayanova/src/views/ay-report-edit.vue | 7 +----- ayanova/src/views/cust-user.vue | 7 +----- ayanova/src/views/cust-users.vue | 5 +---- ayanova/src/views/home-notifications.vue | 7 +----- .../src/views/home-notify-subscription.vue | 7 +----- .../src/views/home-notify-subscriptions.vue | 5 +---- ayanova/src/views/home-user-settings.vue | 7 +----- ayanova/src/views/ops-backup.vue | 10 ++------- ayanova/src/views/ops-jobs.vue | 5 +---- ayanova/src/views/ops-log.vue | 5 +---- ayanova/src/views/ops-metrics.vue | 5 +---- .../src/views/ops-notification-settings.vue | 5 +---- ayanova/src/views/ops-notify-queue.vue | 5 +---- ayanova/src/views/widget.vue | 11 +--------- 21 files changed, 32 insertions(+), 111 deletions(-) diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js index afea83be..ee3b98b8 100644 --- a/ayanova/src/api/ayanova-version.js +++ b/ayanova/src/api/ayanova-version.js @@ -1,4 +1,4 @@ export default { - version: "8.0.0-alpha.71", + version: "8.0.0-alpha.72", copyright: "© 1999-2020, Ground Zero Tech-Works Inc." }; diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js index 8340d72e..ed5f4263 100644 --- a/ayanova/src/api/gzform.js +++ b/ayanova/src/api/gzform.js @@ -1008,16 +1008,16 @@ export default { } } return true; - - // let allValid = true; - // refs.every(function gzformCheckControlsAreValid(item) { - // if (vm.$refs[item]) { - // if (!vm.$refs[item].valid) { - // allValid = false; - // return false; - // } - // } - // }); - // return allValid; + }, + //////////////////////////////////////// + // Standard object not found handler + // + handleObjectNotFound(vm) { + window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); + // navigate backwards after small delay to show error + //(the navigate removes the toast notification immediately) + setTimeout(function() { + vm.$router.go(-1); + }, 2000); } }; diff --git a/ayanova/src/main.js b/ayanova/src/main.js index b698c1b5..9fb3cea9 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -62,7 +62,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control //DEVELOPMENT MODE //THIS SHOULD BE FALSE IN RELEASE //************************************************************ -const DEV_MODE = true; +const DEV_MODE = false; //************************************************************ //************************************************************** //************************************************************** diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue index 8e42db46..74dd6d65 100644 --- a/ayanova/src/views/adm-translation.vue +++ b/ayanova/src/views/adm-translation.vue @@ -354,12 +354,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue index 9cb0fa0f..d246a818 100644 --- a/ayanova/src/views/adm-user.vue +++ b/ayanova/src/views/adm-user.vue @@ -421,12 +421,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue index ef9d49a1..8d75c156 100644 --- a/ayanova/src/views/adm-users.vue +++ b/ayanova/src/views/adm-users.vue @@ -98,10 +98,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue index 9ead35ed..4f7c0b00 100644 --- a/ayanova/src/views/ay-history.vue +++ b/ayanova/src/views/ay-history.vue @@ -282,12 +282,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index cbd7eac0..786a5df0 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -753,12 +753,7 @@ Handlebars.registerHelper('loud', function (aString) { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue index d1008199..31b75394 100644 --- a/ayanova/src/views/cust-user.vue +++ b/ayanova/src/views/cust-user.vue @@ -425,12 +425,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue index 84e5ae68..fd66c78b 100644 --- a/ayanova/src/views/cust-users.vue +++ b/ayanova/src/views/cust-users.vue @@ -93,10 +93,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue index 12fe5566..c75ad3e0 100644 --- a/ayanova/src/views/home-notifications.vue +++ b/ayanova/src/views/home-notifications.vue @@ -136,12 +136,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue index 3f5292fd..05cb94ab 100644 --- a/ayanova/src/views/home-notify-subscription.vue +++ b/ayanova/src/views/home-notify-subscription.vue @@ -413,12 +413,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue index 18bb96cc..8f92a0a6 100644 --- a/ayanova/src/views/home-notify-subscriptions.vue +++ b/ayanova/src/views/home-notify-subscriptions.vue @@ -67,10 +67,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index 593cbd77..59fbe70d 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -256,12 +256,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - window.$gz._.delay(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue index 2fe387e5..65ea2a9d 100644 --- a/ayanova/src/views/ops-backup.vue +++ b/ayanova/src/views/ops-backup.vue @@ -210,10 +210,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); @@ -262,10 +259,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue index 98cca975..9c10c311 100644 --- a/ayanova/src/views/ops-jobs.vue +++ b/ayanova/src/views/ops-jobs.vue @@ -98,10 +98,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue index 1dd3661f..b1cf747f 100644 --- a/ayanova/src/views/ops-log.vue +++ b/ayanova/src/views/ops-log.vue @@ -106,10 +106,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue index 5cecdc91..26760464 100644 --- a/ayanova/src/views/ops-metrics.vue +++ b/ayanova/src/views/ops-metrics.vue @@ -249,10 +249,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue index 7e03d644..b27e9575 100644 --- a/ayanova/src/views/ops-notification-settings.vue +++ b/ayanova/src/views/ops-notification-settings.vue @@ -297,10 +297,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue index 7715c731..a8f6b43b 100644 --- a/ayanova/src/views/ops-notify-queue.vue +++ b/ayanova/src/views/ops-notify-queue.vue @@ -111,10 +111,7 @@ export default { 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); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index 13ee00f0..a755f80f 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -434,16 +434,7 @@ export default { if (res.error) { //Not found? if (res.error.code == "2010") { - //notify not found error then navigate backwards - window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); - // navigate backwards - //de-lodash - // window.$gz._.delay(function() { - // vm.$router.go(-1); - // }, 2000); - setTimeout(function() { - vm.$router.go(-1); - }, 2000); + window.$gz.form.handleObjectNotFound(vm); } vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm);