Extract common search patterns to a controller helper

This will be also the home for the upcoming scope support.

Co-Authored-By: Rainer Dema <[email protected]>

admin/app/controllers/solidus_admin/controller_helpers/search.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SolidusAdmin::ControllerHelpers::Search
+  extend ActiveSupport::Concern
+
+  private
+
+  def apply_search_to(relation, param:)
+    apply_ransack_search_to(relation, param: param)
+  end
+
+  def apply_ransack_search_to(relation, param:)
+    relation
+      .ransack(params[param]&.except(:scope))
+      .result(distinct: true)
+  end
+end

admin/app/controllers/solidus_admin/orders_controller.rb

@@ -3,12 +3,13 @@
 module SolidusAdmin
   class OrdersController < SolidusAdmin::BaseController
     include Spree::Core::ControllerHelpers::StrongParameters
+    include SolidusAdmin::ControllerHelpers::Search
 
     def index
-      orders = Spree::Order
-        .order(created_at: :desc, id: :desc)
-        .ransack(params[:q])
-        .result(distinct: true)
+      orders = apply_search_to(
+        Spree::Order.order(created_at: :desc, id: :desc),
+        param: :q,
+      )
 
       set_page_and_extract_portion_from(
         orders,

admin/app/controllers/solidus_admin/products_controller.rb

@@ -2,6 +2,24 @@
 
 module SolidusAdmin
   class ProductsController < SolidusAdmin::BaseController
+    include SolidusAdmin::ControllerHelpers::Search
+
+    def index
+      products = apply_search_to(
+        Spree::Product.order(created_at: :desc, id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(
+        products,
+        per_page: SolidusAdmin::Config[:products_per_page]
+      )
+
+      respond_to do |format|
+        format.html { render component('products/index').new(page: @page) }
+      end
+    end
+
     def edit
       redirect_to action: :show
     end
@@ -33,22 +51,6 @@ def update
       end
     end
 
-    def index
-      products = Spree::Product
-        .order(created_at: :desc, id: :desc)
-        .ransack(params[:q])
-        .result(distinct: true)
-
-      set_page_and_extract_portion_from(
-        products,
-        per_page: SolidusAdmin::Config[:products_per_page]
-      )
-
-      respond_to do |format|
-        format.html { render component('products/index').new(page: @page) }
-      end
-    end
-
     def destroy
       @products = Spree::Product.where(id: params[:id])
 

admin/config/routes.rb

@@ -2,6 +2,7 @@
 
 SolidusAdmin::Engine.routes.draw do
   resource :account, only: :show
+
   resources(
     :products,
     only: [:index, :show, :edit, :update],