Merge pull request #6440 from blish/solidus-admin-orders-loading-performance

Author: tvdeyen

admin/app/components/solidus_admin/orders/index/component.rb

@@ -162,7 +162,7 @@ def items_column
     {
       header: :items,
       data: ->(order) do
-        content_tag :div, t(".columns.items", count: order.line_items.sum(:quantity))
+        content_tag :div, t(".columns.items", count: order.line_items.sum(&:quantity))
       end
     }
   end

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

@@ -19,15 +19,15 @@ def search_scopes
 
   private
 
-  def apply_search_to(relation, param:)
+  def apply_search_to(relation, param:, distinct: true)
     relation = apply_scopes_to(relation, param:)
-    apply_ransack_search_to(relation, param:)
+    apply_ransack_search_to(relation, param:, distinct:)
   end
 
-  def apply_ransack_search_to(relation, param:)
+  def apply_ransack_search_to(relation, param:, distinct: true)
     relation
       .ransack(params[param]&.except(:scope))
-      .result(distinct: true)
+      .result(distinct:)
   end
 
   def apply_scopes_to(relation, param:)

admin/app/controllers/solidus_admin/orders_controller.rb

@@ -5,16 +5,17 @@ class OrdersController < SolidusAdmin::BaseController
     include Spree::Core::ControllerHelpers::StrongParameters
     include SolidusAdmin::ControllerHelpers::Search
 
-    search_scope(:completed, default: true) { _1.complete }
-    search_scope(:canceled) { _1.canceled }
-    search_scope(:returned) { _1.with_state(:returned) }
-    search_scope(:in_progress) { _1.with_state([:cart] + _1.checkout_step_names) }
-    search_scope(:all) { _1 }
+    search_scope(:completed, default: true) { _1.complete.order(completed_at: :desc) }
+    search_scope(:canceled) { _1.canceled.order(completed_at: :desc) }
+    search_scope(:returned) { _1.with_state(:returned).order(completed_at: :desc) }
+    search_scope(:in_progress) { _1.with_state([:cart] + _1.checkout_step_names).order(id: :desc) }
+    search_scope(:all) { _1.order(id: :desc) }
 
     def index
       orders = apply_search_to(
-        Spree::Order.order(created_at: :desc, id: :desc),
-        param: :q
+        Spree::Order.includes(:line_items),
+        param: :q,
+        distinct: false
       )
 
       set_page_and_extract_portion_from(orders)