From 7d8099edefe1662a19b68a32d47fd972dc1b1240 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sun, 26 May 2019 21:05:40 +0200
Subject: [PATCH] Fix pagination when filter is applied

---
 src/store/modules/reports.js                  | 30 +++++++------------
 .../reports/components/ReportsFilter.vue      |  4 ++-
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js
index 08bf1b68..a699a22a 100644
--- a/src/store/modules/reports.js
+++ b/src/store/modules/reports.js
@@ -40,6 +40,10 @@ const reports = {
       })
       commit('SET_REPORTS', updatedReports)
     },
+    ClearFetchedReports({ commit }) {
+      commit('SET_REPORTS', [])
+      commit('SET_LAST_REPORT_ID', '')
+    },
     async DeleteStatus({ commit, getters, state }, { statusId, reportId }) {
       deleteStatus(statusId, getters.authHost, getters.token)
       const updatedReports = state.fetchedReports.map(report => {
@@ -54,7 +58,11 @@ const reports = {
     },
     async FetchReports({ commit, getters, state }) {
       commit('SET_LOADING', true)
-      const response = await fetchReports(state.page_limit, state.idOfLastReport, getters.authHost, getters.token)
+
+      const response = state.stateFilter.length === 0
+        ? await fetchReports(state.page_limit, state.idOfLastReport, getters.authHost, getters.token)
+        : await filterReports(state.stateFilter, state.page_limit, state.idOfLastReport, getters.authHost, getters.token)
+
       const reports = state.fetchedReports.concat(response.data.reports)
       const id = reports.length > 0 ? reports[reports.length - 1].id : state.idOfLastReport
 
@@ -62,24 +70,8 @@ const reports = {
       commit('SET_LAST_REPORT_ID', id)
       commit('SET_LOADING', false)
     },
-    async ToggleReportsFilter({ commit, dispatch, getters, state }, filter) {
-      commit('SET_REPORTS', [])
-      commit('SET_LAST_REPORT_ID', '')
-
-      if (filter.length === 0) {
-        dispatch('FetchReports')
-      } else {
-        commit('SET_REPORTS_FILTER', filter)
-        commit('SET_LOADING', true)
-
-        const response = await filterReports(state.stateFilter, state.page_limit, state.idOfLastReport, getters.authHost, getters.token)
-        const reports = state.fetchedReports.concat(response.data.reports)
-        const id = reports.length > 0 ? reports[reports.length - 1].id : state.idOfLastReport
-
-        commit('SET_REPORTS', reports)
-        commit('SET_LAST_REPORT_ID', id)
-        commit('SET_LOADING', false)
-      }
+    SetFilter({ commit }, filter) {
+      commit('SET_REPORTS_FILTER', filter)
     }
   }
 }
diff --git a/src/views/reports/components/ReportsFilter.vue b/src/views/reports/components/ReportsFilter.vue
index bad2d2cc..263d2eca 100644
--- a/src/views/reports/components/ReportsFilter.vue
+++ b/src/views/reports/components/ReportsFilter.vue
@@ -20,7 +20,9 @@ export default {
   },
   methods: {
     toggleFilters() {
-      this.$store.dispatch('ToggleReportsFilter', this.$data.filter)
+      this.$store.dispatch('SetFilter', this.$data.filter)
+      this.$store.dispatch('ClearFetchedReports')
+      this.$store.dispatch('FetchReports')
     }
   }
 }