wip

Author: corylown

app/controllers/concerns/spotlight/search_helper.rb

@@ -3,11 +3,10 @@
 module Spotlight
   # ...
   module SearchHelper
-    def search_service(user_params = respond_to?(:search_state, true) ? search_state.to_h : {})
-      search_state = Blacklight::SearchState.new(user_params, blacklight_config)
+    def search_service(search_state: nil)
       klass = respond_to?(:search_service_class) ? search_service_class : Blacklight::SearchService
 
-      klass.new(config: blacklight_config, search_state: search_state, **search_service_context)
+      klass.new(config: blacklight_config, search_state:, **search_service_context)
     end
 
     # @return [Hash] a hash of context information to pass through to the search service

app/controllers/spotlight/pages_controller.rb

@@ -121,7 +121,7 @@ def _prefixes
     # @param [Hash] the query parameters
     # @return [Object] the search results object from the configured search service
     def search_results(user_params)
-      search_service(user_params).search_results
+      search_service(search_state: Blacklight::SearchState.new(user_params, blacklight_config)).search_results
     end
 
     def undo_link