Merge branch 'master' of https://github.com/alercebroker/vue-proj

alercebroker · Aug 26, 2019 · b9e0b91 · b9e0b91
2 parents c6d0a4e + 2f92412
commit b9e0b91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/components/results/resultPanel.vue b/src/components/results/resultPanel.vue
@@ -9,10 +9,10 @@
               </v-flex>
             </v-layout>
           </v-tab-item>
-            <v-tab>Overview</v-tab>
+            <!-- <v-tab>Overview</v-tab>
             <v-tab-item>
                 <overview-cards v-if="!$route.params.id || $store.state.search.searched"/>
-            </v-tab-item>
+            </v-tab-item> -->
             <v-tab>Query Table</v-tab>
             <v-tab-item>
                 <tab-data />

diff --git a/src/components/results/tabData.vue b/src/components/results/tabData.vue
@@ -158,15 +158,17 @@ export default {
                 sortDesc: this.options.sortDesc[0]
             });
         },
-        options(value) {
-            this.$store.dispatch("queryObjects", {
-                query_parameters: this.$store.state.search.query_parameters,
-                page: this.currentPage,
-                perPage: this.$store.state.perPage,
-                total: this.$store.state.results.total,
-                sortBy: value.sortBy[0],
-                sortDesc: value.sortDesc[0]
-            });
+        options(value, old) {
+            if (value.sortBy !== old.sortBy || value.sortDesc != old.sortDesc) {
+                this.$store.dispatch("queryObjects", {
+                    query_parameters: this.$store.state.search.query_parameters,
+                    page: this.currentPage,
+                    perPage: this.$store.state.perPage,
+                    total: this.$store.state.results.total,
+                    sortBy: value.sortBy[0],
+                    sortDesc: value.sortDesc[0]
+                });
+            }
         }
     }
 };

diff --git a/src/store/modules/results.js b/src/store/modules/results.js
@@ -157,7 +157,7 @@ export const state = {
     total: null,
     num_pages: null,
     showObjectDetailsModal: false,
-    currentPage: null,
+    currentPage: 1,
     recentObjects: 'counting...',
     recentAlerts: 'counting...',
     xmatchedCount: 'counting...',