From fc5bc2eec6e9d3a6d6d0a0a34e85d7723152cff4 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Wed, 25 Oct 2023 09:03:34 +0100
Subject: [PATCH] persist search after clearing filters

---
 app/controllers/sessions_controller.rb         | 2 +-
 app/views/locations/_location_filters.html.erb | 2 +-
 app/views/logs/_log_filters.html.erb           | 2 +-
 app/views/schemes/_scheme_filters.html.erb     | 2 +-
 app/views/users/_user_filters.html.erb         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 225f05f8b..1e350829a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -3,7 +3,7 @@ class SessionsController < ApplicationController
     session[session_name_for(params[:filter_type])] = "{}"
     path_params = params[:path_params].presence || {}
 
-    redirect_to send("#{params[:filter_type]}_path", scheme_id: path_params[:scheme_id])
+    redirect_to send("#{params[:filter_type]}_path", scheme_id: path_params[:scheme_id], search: path_params[:search])
   end
 
 private
diff --git a/app/views/locations/_location_filters.html.erb b/app/views/locations/_location_filters.html.erb
index f7d3c3e96..f19d8a17b 100644
--- a/app/views/locations/_location_filters.html.erb
+++ b/app/views/locations/_location_filters.html.erb
@@ -11,7 +11,7 @@
             <%= filters_applied_text(@filter_type) %>
           </p>
           <p class="govuk-!-text-align-right govuk-grid-column-one-half">
-            <%= reset_filters_link(@filter_type, { scheme_id: @scheme.id }) %>
+            <%= reset_filters_link(@filter_type, { scheme_id: @scheme.id, search: request.params["search"] }.compact) %>
           </p>
         </div>
 
diff --git a/app/views/logs/_log_filters.html.erb b/app/views/logs/_log_filters.html.erb
index 9ce94c2e1..96e9eeeff 100644
--- a/app/views/logs/_log_filters.html.erb
+++ b/app/views/logs/_log_filters.html.erb
@@ -12,7 +12,7 @@
               <%= filters_applied_text(@filter_type) %>
           </p>
           <p class="govuk-!-text-align-right govuk-grid-column-one-half">
-            <%= reset_filters_link(@filter_type) %>
+            <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>
           </p>
         </div>
         <% if bulk_upload_options(@bulk_upload).present? %>
diff --git a/app/views/schemes/_scheme_filters.html.erb b/app/views/schemes/_scheme_filters.html.erb
index 80bd85cc8..6e66e38ba 100644
--- a/app/views/schemes/_scheme_filters.html.erb
+++ b/app/views/schemes/_scheme_filters.html.erb
@@ -11,7 +11,7 @@
             <%= filters_applied_text(@filter_type) %>
           </p>
           <p class="govuk-!-text-align-right govuk-grid-column-one-half">
-            <%= reset_filters_link(@filter_type) %>
+            <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>
           </p>
         </div>
 
diff --git a/app/views/users/_user_filters.html.erb b/app/views/users/_user_filters.html.erb
index c805cd60a..9547cbc86 100644
--- a/app/views/users/_user_filters.html.erb
+++ b/app/views/users/_user_filters.html.erb
@@ -11,7 +11,7 @@
             <%= filters_applied_text(@filter_type) %>
           </p>
           <p class="govuk-!-text-align-right govuk-grid-column-one-half">
-            <%= reset_filters_link(@filter_type) %>
+            <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>
           </p>
         </div>