From b7115335e7abb709a83eb5c1ea9b0b17ae43ce63 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 3 Mar 2020 23:40:08 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                 |  3 +-
 ayanova/src/components/gz-data-table.vue | 80 +++++++++++++++---------
 ayanova/src/views/ay-about.vue           |  2 +-
 ayanova/src/views/ay-customize.vue       |  2 +-
 ayanova/src/views/ay-data-list-view.vue  |  2 +-
 ayanova/src/views/ay-log.vue             |  9 +--
 ayanova/src/views/widget.vue             |  2 +-
 7 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 5e6a1089..9b987aba 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -44,14 +44,13 @@ CURRENT TODOs
 
 @@@@@@@@@@@ ROADMAP STAGE 1 and 2:
 
+todo: grid relative date tokens need to be substituted before query sent to server
 
 todo: Make functional user settings form with all overrides so can test shit out 	
 
 
 todo: SEARCH UI
 
-todo: Make sure scroll position is respected and saved when editing a widget and coming back to the list
-
 
 PICKLISTS:
 
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 3bf6479e..fb490fcb 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -1,5 +1,15 @@
 <template>
   <div>
+    <v-alert
+      ref="errorbox"
+      v-show="formState.errorBoxMessage"
+      color="error"
+      icon="fa-exclamation-circle "
+      transition="scale-transition"
+      class="multi-line"
+      outlined
+      >{{ formState.errorBoxMessage }}</v-alert
+    >
     <v-card>
       <v-card-title>
         <v-select
@@ -326,7 +336,17 @@ export default {
       totalRecords: 0,
       records: [],
       rowsPerPageItems: [5, 10, 25, 50, 100],
-      selected: []
+      selected: [],
+      formState: {
+        ready: false,
+        dirty: false,
+        valid: true,
+        readOnly: false,
+        loading: true,
+        errorBoxMessage: undefined,
+        appError: undefined,
+        serverError: {}
+      }
     };
   },
   props: {
@@ -502,27 +522,35 @@ export default {
           listView: vm.listView
         })
         .then(res => {
-          //NOTE: This is how to call an async function and await it from sync code
-          (async function() {
-            //Save a copy of the server columns data for handling button clicks etc later
-            vm.serverColumns = res.columns;
-            //Make sure the locale keys are fetched
-            await fetchLocalizedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
-            await fetchEnums(res.columns);
+          if (res.error != undefined) {
+            throw res.error;
+          } else {
+            //NOTE: This is how to call an async function and await it from sync code
+            (async function() {
+              //Save a copy of the server columns data for handling button clicks etc later
+              vm.serverColumns = res.columns;
+              //Make sure the locale keys are fetched
+              await fetchLocalizedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
+              await fetchEnums(res.columns);
 
-            //build vm.headers here
-            vm.headers = buildHeaders(res.columns);
-            //Post process data here and then set vm.records
-            vm.records = buildRecords(res.data, res.columns);
-            vm.loading = false;
-            vm.totalRecords = res.totalRecordCount;
-            //Put back selected items
-            vm.selected = [...preSelected];
+              //build vm.headers here
+              vm.headers = buildHeaders(res.columns);
+              //Post process data here and then set vm.records
+              vm.records = buildRecords(res.data, res.columns);
+              vm.loading = false;
+              vm.totalRecords = res.totalRecordCount;
+              //Put back selected items
+              vm.selected = [...preSelected];
 
-            //persist the paging options and listview stuff so user sees same page and list on refresh or leave and return scenario
-            saveFormSettings(vm);
-            //////////
-          })();
+              //persist the paging options and listview stuff so user sees same page and list on refresh or leave and return scenario
+              saveFormSettings(vm);
+              //////////
+            })();
+          }
+        })
+        .catch(err => {
+          vm.formState.ready = true;
+          window.$gz.errorHandler.handleFormError(err, vm);
         });
     }
   },
@@ -696,15 +724,9 @@ async function fetchLocalizedHeaderNames(columnData) {
     headerKeys.push(cm.cm);
   }
   //Now fetch all the keys and await the response before returning
-  await window.$gz.locale
-    .fetch(headerKeys)
-    .then(() => {
-      return;
-    })
-    .catch(err => {
-      vm.formState.ready = true; //show the form anyway so we know what's what
-      window.$gz.errorHandler.handleFormError(err);
-    });
+  await window.$gz.locale.fetch(headerKeys).then(() => {
+    return;
+  });
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index a53920cb..bd430771 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -141,7 +141,7 @@ export default {
       })
       .catch(err => {
         vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
+        window.$gz.errorHandler.handleFormError(err, vm);
       });
   },
   beforeDestroy() {
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 14e9c140..8196c516 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -130,7 +130,7 @@ export default {
       })
       .catch(err => {
         vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
+        window.$gz.errorHandler.handleFormError(err, vm);
       });
   },
   data() {
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index ea888849..3f6b7344 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -474,7 +474,7 @@ export default {
       })
       .catch(err => {
         vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
+        window.$gz.errorHandler.handleFormError(err, vm);
       });
   },
   data() {
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index 63111d75..bae4620c 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -22,6 +22,7 @@
 /*  Xeslint-disable */
 export default {
   created() {
+    var vm = this;
     window.$gz.eventBus.$emit("menu-change", {
       isMain: false,
       icon: "fa-info-circle",
@@ -40,7 +41,7 @@ export default {
     });
 
     var outText = "";
-    window.$gz._.forEach(this.$store.state.logArray, function appendLogItem(
+    window.$gz._.forEach(vm.$store.state.logArray, function appendLogItem(
       value
     ) {
       outText += value + "\n";
@@ -48,10 +49,10 @@ export default {
     this.logText = outText;
     window.$gz.locale
       .fetch(["Log"])
-      .then(() => (this.formState.ready = true))
+      .then(() => (vm.formState.ready = true))
       .catch(err => {
-        this.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
+        vm.formState.ready = true;
+        window.$gz.errorHandler.handleFormError(err, vm);
       });
   },
   data() {
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 3f33f722..a216b793 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -236,7 +236,7 @@ export default {
       })
       .catch(err => {
         vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
+        window.$gz.errorHandler.handleFormError(err, vm);
       });
   },
   beforeRouteUpdate(to, from, next) {