From dae37e98825dcfa2cbc23028f934ffcc24ea6671 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 9 Apr 2018 13:26:40 -0300
Subject: [PATCH] Adds sorting on SearchControl.

---
 .../components/search/search-control.vue      | 36 ++++++++++---------
 src/js/event-search-bus.js                    |  8 +++--
 src/js/store/modules/search/actions.js        |  7 ++--
 src/js/store/modules/search/getters.js        |  8 +++++
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/admin/components/search/search-control.vue b/src/admin/components/search/search-control.vue
index 0f9846ef3..99e31f99b 100644
--- a/src/admin/components/search/search-control.vue
+++ b/src/admin/components/search/search-control.vue
@@ -30,15 +30,15 @@
                 <option
                     v-for="(field, index) in tableFields"
                     v-if="field.id != undefined"
-                    :value="field"
+                    :value="field.id"
                     :key="index">
                     {{ field.label }}
                 </option>
             </b-select>
             <button 
                     class="button is-small"
-                    @click="onChangeOrderAsc()">
-                <b-icon :icon="orderAsc ? 'sort-ascending' : 'sort-descending'"/>
+                    @click="onChangeOrder()">
+                <b-icon :icon="order == 'ASC' ? 'sort-ascending' : 'sort-descending'"/>
             </button>
             </b-field>
         </div>
@@ -46,27 +46,33 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
 import { eventSearchBus } from '../../../js/event-search-bus';
 
 export default {
     name: 'SearchControl',
-    data() {
-        return {
-            orderBy: 'date',
-            orderAsc: false
-        }
-    },
     props: {
         collectionId: Number,
         isRepositoryLevel: false,
         tableFields: Array,
         prefTableFields: Array    
     },
+    computed: {
+        orderBy() {
+            return this.getOrderBy();
+        },
+        order() {
+            return this.getOrder();
+        }
+    },
     methods: {
         ...mapActions('fields', [
             'fetchFields'
         ]),
+        ...mapGetters('search', [
+            'getOrderBy',
+            'getOrder'
+        ]),
         onChangeTableFields(field) {
             // let prevValue = this.prefTableFields;
             // let index = this.prefTableFields.findIndex(alteredField => alteredField.slug === field.slug);
@@ -82,13 +88,11 @@ export default {
 
             // this.$userPrefs.set('table_columns_' + this.collectionId, this.prefTableFields, prevValue);
         },
-        onChangeOrderBy(event) {
-            this.orderBy = event.id;  
-            eventSearchBus.setOrderBy(this.orderBy);
+        onChangeOrderBy(fieldId) {  
+            eventSearchBus.setOrderBy(fieldId);
         },
-        onChangeOrderAsc() {
-            this.orderAsc = !this.orderAsc;
-            eventSearchBus.setOrderAsc(this.orderAsc);
+        onChangeOrder() {
+            this.order == 'DESC' ? eventSearchBus.setOrder('ASC') : eventSearchBus.setOrder('DESC');
         }
     },
     mounted() {
diff --git a/src/js/event-search-bus.js b/src/js/event-search-bus.js
index da98f7fdb..3bd3ad7fb 100644
--- a/src/js/event-search-bus.js
+++ b/src/js/event-search-bus.js
@@ -24,6 +24,10 @@ export const eventSearchBus = new Vue({
                     this.$route.query.perpage = 12;
                 if (this.$route.query.paged == undefined)
                     this.$route.query.paged = 1;
+                if (this.$route.query.order == undefined)
+                    this.$route.query.order = 'DESC';
+                if (this.$route.query.orderby == undefined)
+                    this.$route.query.orderby = 'date';
 
                 store.dispatch('search/set_postquery', this.$route.query);
                 //console.log(this.$route.query);
@@ -63,8 +67,8 @@ export const eventSearchBus = new Vue({
             store.dispatch('search/setOrderBy', newOrderBy);
             this.updateURLQueries();
         },
-        setOrderAsc(newOrderAsc) {
-            store.dispatch('search/setOrderBy', newOrderAsc);
+        setOrder(newOrder) {
+            store.dispatch('search/setOrder', newOrder);
             this.updateURLQueries();
         },
         updateURLQueries() {
diff --git a/src/js/store/modules/search/actions.js b/src/js/store/modules/search/actions.js
index bfdb3cfe9..52ee4635d 100644
--- a/src/js/store/modules/search/actions.js
+++ b/src/js/store/modules/search/actions.js
@@ -38,11 +38,8 @@ export const setOrderBy = ({ commit }, orderBy ) => {
     commit('setPostQueryAttribute', {  attr: 'orderby', value: orderBy } );
 };
 
-export const setOrder = ({ commit }, isOrderAsc ) => {
-    if (isOrderAsc)
-        commit('setPostQueryAttribute', {  attr: 'order', value: 'ASC' } );
-    else
-        commit('setPostQueryAttribute', {  attr: 'order', value: 'DESC' } );
+export const setOrder = ({ commit }, order ) => {
+    commit('setPostQueryAttribute', {  attr: 'order', value: order } );
 };
 
 
diff --git a/src/js/store/modules/search/getters.js b/src/js/store/modules/search/getters.js
index 7e7582d2b..73ab6b9b3 100644
--- a/src/js/store/modules/search/getters.js
+++ b/src/js/store/modules/search/getters.js
@@ -20,4 +20,12 @@ export const getPage = state => {
 
 export const getItemsPerPage = state => {
     return state.postquery.perpage;
+};
+
+export const getOrder = state => {
+    return state.postquery.order;
+}
+
+export const getOrderBy = state => {
+    return state.postquery.orderby;
 };
\ No newline at end of file