persist search after clearing filters

3 years ago · fc5bc2eec6
5 changed files with 5 additions and 5 deletions
--- 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
--- 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>

--- 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? %>
--- 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>

--- 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>