From 093998f4873e73ecb9ed9ca8e98f7f2e22b0c3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anne=20L=27H=C3=B4te?= <anne.lhote@gmail.com>
Date: Thu, 5 Mar 2020 11:29:57 +0000
Subject: [PATCH] [ICIJ/datashare#397] Restore the "Go to first page" link

---
 src/store/modules/search.js                   | 12 ++++++------
 tests/unit/specs/store/modules/search.spec.js | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/store/modules/search.js b/src/store/modules/search.js
index f8de9ac8cc..534fc2443d 100644
--- a/src/store/modules/search.js
+++ b/src/store/modules/search.js
@@ -402,12 +402,12 @@ export const actions = {
   },
   async updateFromRouteQuery ({ state, commit, getters }, query) {
     // Add the query to the state with a mutation to not triggering a search
-    if (query.q) commit('query', query.q)
-    if (query.index) commit('index', query.index)
-    if (query.from) commit('from', query.from)
-    if (query.size) commit('size', query.size)
-    if (query.sort) commit('sort', query.sort)
-    if (query.field) commit('field', query.field)
+    if (has(query, 'q')) commit('query', query.q)
+    if (has(query, 'index')) commit('index', query.index)
+    if (has(query, 'from')) commit('from', query.from)
+    if (has(query, 'size')) commit('size', query.size)
+    if (has(query, 'sort')) commit('sort', query.sort)
+    if (has(query, 'field')) commit('field', query.field)
     // Iterate over the list of filter
     each(getters.instantiatedFilters, filter => {
       // The filter key are formatted in the URL as follow.
diff --git a/tests/unit/specs/store/modules/search.spec.js b/tests/unit/specs/store/modules/search.spec.js
index c357e36dbb..d87713bfee 100644
--- a/tests/unit/specs/store/modules/search.spec.js
+++ b/tests/unit/specs/store/modules/search.spec.js
@@ -326,24 +326,35 @@ describe('SearchStore', () => {
 
   describe('updateFromRouteQuery should restore search state from url', () => {
     it('should set the index of the store according to the url', async () => {
+      store.commit('search/index', 'anything')
       await store.dispatch('search/updateFromRouteQuery', { index: process.env.VUE_APP_ES_ANOTHER_INDEX })
 
       expect(store.state.search.index).toBe(process.env.VUE_APP_ES_ANOTHER_INDEX)
     })
 
     it('should set the query of the store according to the url', async () => {
+      store.commit('search/query', 'anything')
       await store.dispatch('search/updateFromRouteQuery', { q: 'new_query' })
 
       expect(store.state.search.query).toBe('new_query')
     })
 
     it('should set the from of the store according to the url', async () => {
+      store.commit('search/from', 12)
       await store.dispatch('search/updateFromRouteQuery', { from: 42 })
 
       expect(store.state.search.from).toBe(42)
     })
 
+    it('should RESET the from of the store according to the url', async () => {
+      store.commit('search/from', 12)
+      await store.dispatch('search/updateFromRouteQuery', { from: 0 })
+
+      expect(store.state.search.from).toBe(0)
+    })
+
     it('should set the size of the store according to the url', async () => {
+      store.commit('search/size', 12)
       await store.dispatch('search/updateFromRouteQuery', { size: 24 })
 
       expect(store.state.search.size).toBe(24)
@@ -351,6 +362,7 @@ describe('SearchStore', () => {
     })
 
     it('should set the sort of the store according to the url', async () => {
+      store.commit('search/sort', 'anything')
       await store.dispatch('search/updateFromRouteQuery', { sort: 'new_sort' })
 
       expect(store.state.search.sort).toBe('new_sort')
@@ -363,7 +375,6 @@ describe('SearchStore', () => {
 
     it('should not change the starredDocuments on updateFromRouteQuery', async () => {
       store.commit('search/starredDocuments', ['doc_01', 'doc_02'])
-
       await store.dispatch('search/updateFromRouteQuery', {})
 
       expect(store.state.search.starredDocuments).toEqual(['doc_01', 'doc_02'])
@@ -371,7 +382,6 @@ describe('SearchStore', () => {
 
     it('should not change the field on updateFromRouteQuery', async () => {
       store.commit('search/field', 'author')
-
       await store.dispatch('search/updateFromRouteQuery', {})
 
       expect(store.state.search.field).toBe('author')