From 07f345e771edb665913751886948cd46dfe19344 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 9 Feb 2021 00:10:05 +0000
Subject: [PATCH]

---
 ayanova/src/components/data-table.vue   | 30 +------------------------
 ayanova/src/views/cust-head-offices.vue |  2 +-
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index f340a4d5..7a9a8710 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -487,31 +487,12 @@ export default {
         );
 
         if (!pagingHaschanged && !sortHasChanged) {
-          console.log("NOTHING CHANGED BAILING");
           return;
         }
 
-        console.log("SOMETHING CHANGED", {
-          loading: this.loading,
-          itWasPaging: pagingHaschanged,
-          itWasSort: sortHasChanged,
-          srt: this.dataTablePagingOptions.sortBy,
-          desc: this.dataTablePagingOptions.sortDesc,
-          lastsrt: this.lastDataTablePagingOptions.sortBy,
-          lastdesc: this.lastDataTablePagingOptions.sortDesc
-        });
-        console.trace();
-
         //something changed, persist it to last
         this.lastDataTablePagingOptions = this.dataTablePagingOptions;
 
-        // console.log("AFTER LAST SET", {
-        //   srt: this.dataTablePagingOptions.sortBy,
-        //   desc: this.dataTablePagingOptions.sortDesc,
-        //   lastsrt: this.lastDataTablePagingOptions.sortBy,
-        //   lastdesc: this.lastDataTablePagingOptions.sortDesc
-        // });
-
         if (sortHasChanged && !this.loading) {
           //update sort at server and then allow get data
 
@@ -622,7 +603,6 @@ export default {
       });
     },
     setSortIndicatorsFromDataListResponse(rsort) {
-      console.log("SetSortIndicators - culprit? vm.loading is", this.loading);
       let sortBy = [];
       let sortDesc = [];
       if (rsort != null) {
@@ -788,10 +768,7 @@ export default {
           vm.headers = buildHeaders(res.columns);
 
           //SET TABLE SORT HERE FROM RESPONSE
-          //BUGBUG: this line is triggering a second fetch, but it shouldn't be since we are in the midst of loading=true which should avoid a getData call
-          console.log("InGetData about to call setsortindicators");
           vm.setSortIndicatorsFromDataListResponse(res.sortBy);
-          console.log("Back from setSortIndicators, building records...");
 
           //Post process data here and then set vm.records
           vm.records = buildRecords(
@@ -810,11 +787,8 @@ export default {
       } catch (err) {
         window.$gz.errorHandler.handleFormError(err, vm);
       } finally {
-        console.log(
-          "InGetData Finally block setting loading to false via nexttick"
-        );
+        //Note: this needs to be called in NextTick because otherwise it triggers a re-fetch when the sort indicators were set above
         vm.$nextTick(() => {
-          console.log("loading false in nexttick");
           vm.loading = false;
           vm.formState.ready = true;
         });
@@ -1169,8 +1143,6 @@ function setActiveFilter(vm, desiredId) {
     vm.activeFilterId = dflt.id;
     return;
   }
-
-  console.log("data-table::setActiveFilter - no default id found");
   vm.activeFilterId = 0;
 }
 
diff --git a/ayanova/src/views/cust-head-offices.vue b/ayanova/src/views/cust-head-offices.vue
index 0251bed8..1bc35768 100644
--- a/ayanova/src/views/cust-head-offices.vue
+++ b/ayanova/src/views/cust-head-offices.vue
@@ -10,7 +10,7 @@
     <gz-data-table
       ref="gzdatatable"
       formKey="head-office-list"
-      :dataListKey="HeadOfficeDataList"
+      dataListKey="HeadOfficeDataList"
       :showSelect="rights.read"
       :reload="reload"
       v-on:selection-change="handleSelected"