Pass search query if entered but not submitted

bitzesty · Jul 3, 2024 · 334261c · 334261c
1 parent 2a1d721
commit 334261c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/assets/javascripts/admin/applications-filter.js.coffee b/app/assets/javascripts/admin/applications-filter.js.coffee
@@ -123,7 +123,7 @@ filterApplicationsDropdowns = () ->
                           .length
       $(this).closest(".applications-filter").find("label[data-value='select_all'] input").prop("checked", unselected is 0)
 
-  # On clicking the award year radio
+  # On clicking the award year radio set search query to entered text
   $(document).on "click", ".applications-filter .input__award-years input[type='radio']", (e) ->
     e.stopPropagation()
     # if other selected, show dropdown of years, otherwise get form answers for current year or all years
@@ -139,4 +139,13 @@ filterApplicationsDropdowns = () ->
       url.searchParams.set('[search][query]', search_query)
       window.location = url
 
+  # On clicking the award year from the other year dropdown set search query to entered text
+  $(document).on "click", ".applications-filter .other-years-dropdown .dropdown-menu li", (e) ->
+    e.stopPropagation()
+    e.preventDefault()
+    search_query = $(this).closest("#new_search").find("#search_query").val()
+    url = new URL($(this).data('url'), document.baseURI)
+    url.searchParams.set('[search][query]', search_query)
+    window.location = url
+
 $(document).ready(ready)
diff --git a/app/views/shared/form_answers/_admin_award_year.html.slim b/app/views/shared/form_answers/_admin_award_year.html.slim
@@ -24,9 +24,9 @@ fieldset.award-year-z-index.applications-filter.award-year-radios
         span.caret-container
           span.caret
       ul.dropdown-menu.dropdown-menu-right
-        li class="#{'active' if params[:year].to_s == 'all_years' || !params[:year]}"
-          = link_to "All Years", url_for(params.permit(:controller, :action).merge(year: :all_years, search: params[:search]))
+        li class="#{'active' if params[:year].to_s == 'all_years' || !params[:year]}" data-url="#{url_for(params.permit(:controller, :action).merge(year: :all_years, search: params[:search]))}"
+          = link_to "All Years", "#"
 
         - AwardYear.admin_switch.each do |year, label|
-          li class="#{'active' if label == current_year_text}"
-            = link_to label, url_for(params.permit(:controller, :action).merge(year: year, search: params[:search]))
+          li class="#{'active' if label == current_year_text}" data-url="#{url_for(params.permit(:controller, :action).merge(year: year, search: params[:search]))}"
+            = link_to label, "#"