From 2be0ae585087483b1409404c468a629fc8d15ed0 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 15 Mar 2021 22:29:39 +0000
Subject: [PATCH]

---
 ayanova/src/components/data-table.vue         | 28 ++++++++++++++-----
 .../src/views/ay-data-list-column-view.vue    |  2 ++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 2a6ec747..1835e08c 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-    <!-- cols:{{ serverColumns }} filt:{{ serverFilter }} srt:{{ serverSort }} -->
+
     <gz-data-table-filter
       :data-list-key="dataListKey"
       :active-filter-id="activeFilterId"
@@ -49,8 +49,16 @@
           >
             <v-icon data-cy="refresh">$ayiFilter</v-icon>
           </v-btn>
-          <v-btn class="ml-12" @click="editColumnView">
-            <v-icon data-cy="filter">$ayiColumns</v-icon>
+          <v-btn
+            :outlined="hiddenAffectiveColumns.length > 0"
+            class="ml-12"
+            @click="editColumnView"
+          >
+            <v-icon
+              :color="hiddenAffectiveColumns.length ? 'accent' : 'primary'"
+              data-cy="filter"
+              >$ayiColumns</v-icon
+            >
           </v-btn>
         </div>
       </v-card-title>
@@ -422,6 +430,7 @@ export default {
       headers: [],
       serverColumns: [],
       serverFilter: [],
+      hiddenAffectiveColumns: [],
       totalRecords: 0,
       records: [],
       rowsPerPageItems: [5, 10, 25, 50, 100],
@@ -454,7 +463,6 @@ export default {
       type: Boolean,
       default: false
     },
-
     reload: {
       type: Boolean,
       default: false
@@ -679,8 +687,10 @@ export default {
         name: "ay-data-list-column-view",
         params: {
           dataListKey: this.dataListKey,
-          formKey: this.formKey,
-          activeFilterId: this.activeFilterId
+          hiddenAffectiveColumns: this.hiddenAffectiveColumns
+          // ,
+          // formKey: this.formKey,
+          // activeFilterId: this.activeFilterId
         }
       });
     },
@@ -775,6 +785,10 @@ export default {
           //save a copy of the filter to show the filter symbol icons beside column headers
           //and know that the return list *is* filtered
           vm.serverFilter = res.filter;
+
+          //Hidden columns that affect the query and data displayed
+          vm.hiddenAffectiveColumns = res.hiddenAffectiveColumns;
+
           //Make sure the translation keys are fetched
           await fetchTranslatedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
 
@@ -783,7 +797,7 @@ export default {
           //build vm.headers here
           vm.headers = buildHeaders(res.columns);
 
-          //SET TABLE SORT HERE FROM RESPONSE        
+          //SET TABLE SORT HERE FROM RESPONSE
           vm.setSortIndicatorsFromDataListResponse(res.sortBy);
 
           //Post process data here and then set vm.records
diff --git a/ayanova/src/views/ay-data-list-column-view.vue b/ayanova/src/views/ay-data-list-column-view.vue
index 58b4ec9d..d7d57e43 100644
--- a/ayanova/src/views/ay-data-list-column-view.vue
+++ b/ayanova/src/views/ay-data-list-column-view.vue
@@ -78,6 +78,7 @@ export default {
     let vm = this;
     try {
       vm.dataListKey = this.$route.params.dataListKey;
+      vm.hiddenAffectiveColumns=this.$route.params.hiddenAffectiveColumns;
       await initForm(vm);
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -101,6 +102,7 @@ export default {
         sort: null
       },
       dataListKey: undefined,
+      hiddenAffectiveColumns: [],
       fieldDefinitions: [],
       editView: [],
       formState: {