Skip to content

Improve Solidus Admin Orders Loading Performance #6440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tvdeyen merged 3 commits into from
Apr 17, 2026
+13 −12
Merged

Improve Solidus Admin Orders Loading Performance #6440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
192ff25
perf(solidus_admin): Configure distinct in search queries
sascha-karnatz Apr 16, 2026
2dc22af
perf(solidus_admin): Remove created_at order
sascha-karnatz Apr 16, 2026
389218d
perf(solidus_admin): Reduce N+1 queries for order index
sascha-karnatz Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/orders/index/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions admin/app/controllers/solidus_admin/controller_helpers/search.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:)
Expand Down
15 changes: 8 additions & 7 deletions admin/app/controllers/solidus_admin/orders_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading