From 7330987a698c3f8cdb1497ff0a2ee70dae32d477 Mon Sep 17 00:00:00 2001
From: Nimit Bhargava <nimitbhargava@gmail.com>
Date: Thu, 10 Oct 2019 20:32:12 +0530
Subject: [PATCH] fix - maintaining sorting after navigation

---
 webapp/pages/index.vue      | 26 +++++++++++++++++---------
 webapp/store/postsFilter.js | 12 ++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 91acb288c..2443bc037 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -11,7 +11,7 @@
             :options="sortingOptions"
             size="large"
             v-bind:icon-right="sortingIcon"
-            @input="toggleOnlySorting"
+            @input="updateOrder"
           ></ds-select>
         </div>
       </ds-grid-item>
@@ -62,7 +62,7 @@ import HcPostCard from '~/components/PostCard'
 import HcLoadMore from '~/components/LoadMore.vue'
 import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
 import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import { filterPosts } from '~/graphql/PostQuery.js'
 
 export default {
@@ -83,10 +83,8 @@ export default {
       offset: 0,
       pageSize: 12,
       hashtag,
-      placeholder: this.$t('sorting.newest'),
-      selected: this.$t('sorting.newest'),
       sortingIcon: 'sort-amount-desc',
-      sorting: 'createdAt_desc',
+      selected: this.$t('sorting.newest'),
       sortingOptions: [
         {
           label: this.$t('sorting.newest'),
@@ -103,9 +101,15 @@ export default {
       ],
     }
   },
+  mounted() {
+    if(this.postsOrder.label) {
+      this.selected = this.postsOrder.label
+    }
+  },
   computed: {
     ...mapGetters({
       postsFilter: 'postsFilter/postsFilter',
+      postsOrder: 'postsFilter/postsOrder',
     }),
     finalFilters() {
       let filter = this.postsFilter
@@ -122,11 +126,15 @@ export default {
     },
   },
   methods: {
-    toggleOnlySorting(x) {
+    ...mapMutations({
+      setPostsOrder: 'postsFilter/UPDATE_ORDER',
+    }),
+    updateOrder(sortingOptions) {
       this.offset = 0
       this.posts = []
-      this.sortingIcon = x.icons
-      this.sorting = x.order
+      this.sortingIcon = sortingOptions.icons
+      this.selected = sortingOptions.label
+      this.setPostsOrder(sortingOptions)
     },
     clearSearch() {
       this.$router.push({ path: '/' })
@@ -176,7 +184,7 @@ export default {
         return {
           filter: this.finalFilters,
           first: this.pageSize,
-          orderBy: this.sorting,
+          orderBy: this.postsOrder.order,
           offset: 0,
         }
       },
diff --git a/webapp/store/postsFilter.js b/webapp/store/postsFilter.js
index 964b265c0..8bdf1a238 100644
--- a/webapp/store/postsFilter.js
+++ b/webapp/store/postsFilter.js
@@ -12,6 +12,12 @@ export const state = () => {
     filter: {
       ...defaultFilter,
     },
+    postsOrder: {
+      label: null,
+      value: 'Newest',
+      icons: 'sort-amount-desc',
+      order: 'createdAt_desc',
+    }
   }
 }
 
@@ -46,6 +52,9 @@ export const mutations = {
     if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
     state.filter = filter
   },
+  UPDATE_ORDER(state, postsOrder) {
+    state.postsOrder = postsOrder
+  }
 }
 
 export const getters = {
@@ -64,4 +73,7 @@ export const getters = {
   filteredByEmotions(state) {
     return get(state.filter, 'emotions_some.emotion_in') || []
   },
+  postsOrder(state) {
+    return state.postsOrder
+  }
 }