ayanova/src/components/gz-data-table.vue

@@ -429,7 +429,7 @@ export default {
       });
     },
 
-    listViewChanged: function() {
+    listViewChanged: async function() {
       let vm = this;
 
       //If listview had changed it can only have changed *away* from the unsaved filter item if it's present so just remove the unsaved filter item if it exists
@@ -442,37 +442,29 @@ export default {
       //   return n.id == -1;
       // });
 
+      //first prevent the following changes from triggering a fetch
+      vm.loading = true;
+      //always go back to page one on a change of data list view
+      vm.dataTablePagingOptions.page = 1;
+
       for (let i = vm.selectLists.listViews.length - 1; i >= 0; i--) {
         if (vm.selectLists.listViews[i].id === -1) {
           vm.selectLists.listViews.splice(i, 1);
         }
       }
 
-      let ShouldGetData = vm.dataTablePagingOptions.page == 1;
-
       if (vm.listViewId == 0) {
         //default view, no saved, no cached
         vm.listView = undefined;
-
         saveFormSettings(vm);
-        if (ShouldGetData) {
-          vm.getDataFromApi();
-        } else {
-          vm.dataTablePagingOptions.page = 1;
-        }
-        //
       } else if (vm.listViewId > 0) {
-        (async function() {
-          await fetchListView(vm);
-
-          saveFormSettings(vm);
-          if (ShouldGetData) {
-            vm.getDataFromApi();
-          } else {
-            vm.dataTablePagingOptions.page = 1;
-          }
-        })();
+        await fetchListView(vm);
+        saveFormSettings(vm);
       }
+
+      //fetch data because listview has changed
+      vm.loading = false;
+      vm.getDataFromApi();
     },
     gridCellButtonClick(key, i) {
       //translate key to actual object type from header data