From 4b43c7862d2c168977c24be87a45d6f541d5ecb1 Mon Sep 17 00:00:00 2001
From: "Juan A. Ruz" <juanantonioruz@gmail.com>
Date: Mon, 23 Mar 2020 12:30:14 +0100
Subject: [PATCH] [#2569] Adapt Library updateQueryAction to react-router
 location [skip ci]

---
 client/src/components/Library.jsx | 62 +++++++++++++------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/client/src/components/Library.jsx b/client/src/components/Library.jsx
index 7abc9c5486..9c8304cf56 100644
--- a/client/src/components/Library.jsx
+++ b/client/src/components/Library.jsx
@@ -22,8 +22,9 @@ import { trackPageView } from '../utilities/analytics';
 require('./Library.scss');
 
 function mergeQuery(location, query) {
+  const q = new URLSearchParams(query).toString();
   return Object.assign({}, location, {
-    query: Object.assign({}, location.query, query),
+    search: `?${q}`,
   });
 }
 
@@ -211,45 +212,34 @@ class Library extends Component {
           onAddEntitiesToCollection={this.handleAddEntitiesToCollection}
           onRemoveEntitiesFromCollection={this.handleRemoveEntitiesFromCollection}
           displayMode={displayMode}
-          onChangeDisplayMode={(newDisplayMode) => {
-            dispatch(
-              updateQueryAction(history, location, {
-                display: newDisplayMode,
-              })
-            );
-          }}
+          onChangeDisplayMode={newDisplayMode =>
+                               updateQueryAction(history, location, {
+                                 display: newDisplayMode,
+                               })
+                              }
           sortOrder={sortOrder}
-          onChangeSortOrder={(newSortOrder) => {
-            dispatch(
-              updateQueryAction(history, location, {
-                sort: newSortOrder,
-              })
-            );
-          }}
+          onChangeSortOrder={newSortOrder =>
+                             updateQueryAction(history, location, {
+                               sort: newSortOrder,
+                             })
+                            }
           isReverseSort={isReverseSort}
-          onChangeReverseSort={(newReverseSort) => {
-            dispatch(
-              updateQueryAction(history, location, {
-                reverse: newReverseSort,
-              })
-            );
-          }}
+          onChangeReverseSort={newReverseSort =>
+                               updateQueryAction(history, location, {
+                                 reverse: newReverseSort,
+                               })
+                              }
           filterBy={filterBy}
-          onChangeFilterBy={(newFilterBy) => {
-            dispatch(
-              updateQueryAction(history, location, {
-                filter: newFilterBy,
-              })
-            );
-          }}
+          onChangeFilterBy={newFilterBy =>
+                            updateQueryAction(history, location, {
+                              filter: newFilterBy,
+                            })
+                           }
           searchString={searchString}
-          onSetSearchString={(newSearchString) => {
-            dispatch(
-              updateQueryAction(history, location, {
-                search: newSearchString,
-              })
-            );
-          }}
+          onSetSearchString={newSearchString =>
+                             updateQueryAction(history, location, {
+                               search: newSearchString,
+                             })}
           onCreate={(type) => {
             const { params } = this.props;
             const meta = { collectionId: params.collectionId, from: 'library' };