Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Unify collection handling everywhere in the admin (#13275)
Damian Legawiec773e17ad20bd
diff --git a/admin/app/controllers/spree/admin/admin_users_controller.rb b/admin/app/controllers/spree/admin/admin_users_controller.rbindex 5ddd0840a5..b18600e96d 100644--- a/admin/app/controllers/spree/admin/admin_users_controller.rb+++ b/admin/app/controllers/spree/admin/admin_users_controller.rb@@ -13,8 +13,6 @@ module Spree# GET /admin/admin_usersdef index- params[:q] ||= {}- params[:q][:s] ||= 'created_at asc'@search = scope.includes(role_users: :role, avatar_attachment: :blob).where(role_users: { resource: @parent }).ransack(params[:q])diff --git a/admin/app/controllers/spree/admin/checkouts_controller.rb b/admin/app/controllers/spree/admin/checkouts_controller.rbindex 62debcb5f4..6c211d8ff4 100644--- a/admin/app/controllers/spree/admin/checkouts_controller.rb+++ b/admin/app/controllers/spree/admin/checkouts_controller.rb@@ -1,6 +1,6 @@module Spreemodule Admin- class CheckoutsController < BaseController+ class CheckoutsController < ResourceControllerinclude Spree::Admin::OrdersFiltersHelperbefore_action :load_user, only: [:index]@@ -10,9 +10,6 @@ module Spreeadd_breadcrumb_icon 'inbox'def index- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'-load_ordersrender template: 'spree/admin/orders/index'enddiff --git a/admin/app/controllers/spree/admin/coupon_codes_controller.rb b/admin/app/controllers/spree/admin/coupon_codes_controller.rbindex 14e1ef0cd5..cec64ccc6c 100644--- a/admin/app/controllers/spree/admin/coupon_codes_controller.rb+++ b/admin/app/controllers/spree/admin/coupon_codes_controller.rb@@ -4,20 +4,6 @@ module Spreebelongs_to 'spree/promotion', find_by: :idinclude PromotionsBreadcrumbConcern-- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- @search = @collection.ransack(params[:q])- @collection = if request.format.csv?- @search.result- else- @search.result.page(params[:page])- end- endendendenddiff --git a/admin/app/controllers/spree/admin/customer_returns_controller.rb b/admin/app/controllers/spree/admin/customer_returns_controller.rbindex 8e45898a52..164c4e2f7e 100644--- a/admin/app/controllers/spree/admin/customer_returns_controller.rb+++ b/admin/app/controllers/spree/admin/customer_returns_controller.rb@@ -6,19 +6,6 @@ module Spreeadd_breadcrumb Spree.t(:customer_returns), :admin_customer_returns_pathdef index; end-- private-- def collection- return @collection if @collection.present?-- params[:q] ||= {}-- # @search needs to be defined as this is passed to search_form_for- @search = current_store.customer_returns.accessible_by(current_ability, :index).ransack(params[:q])- per_page = params[:per_page]- @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)- endendendenddiff --git a/admin/app/controllers/spree/admin/digital_assets_controller.rb b/admin/app/controllers/spree/admin/digital_assets_controller.rbindex ef628025d0..5179326631 100644--- a/admin/app/controllers/spree/admin/digital_assets_controller.rb+++ b/admin/app/controllers/spree/admin/digital_assets_controller.rb@@ -13,8 +13,8 @@ module SpreeSpree::Digitalend- def collection- parent.digitals+ def scope+ parent.digitals.accessible_by(current_ability, :index)enddef collection_urldiff --git a/admin/app/controllers/spree/admin/exports_controller.rb b/admin/app/controllers/spree/admin/exports_controller.rbindex 2a8cae76d5..e112b65317 100644--- a/admin/app/controllers/spree/admin/exports_controller.rb+++ b/admin/app/controllers/spree/admin/exports_controller.rb@@ -22,15 +22,8 @@ module SpreeSpree.t('admin.export_created')end- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'- @search = @collection.ransack(params[:q])- @collection = @search.result.includes(:user, attachment_attachment: :blob).page(params[:page])+ def collection_includes+ [:user, attachment_attachment: :blob]enddef set_userdiff --git a/admin/app/controllers/spree/admin/gift_cards_controller.rb b/admin/app/controllers/spree/admin/gift_cards_controller.rbindex 7c860e10cd..58584b926e 100644--- a/admin/app/controllers/spree/admin/gift_cards_controller.rb+++ b/admin/app/controllers/spree/admin/gift_cards_controller.rb@@ -1,7 +1,8 @@module Spreemodule Adminclass GiftCardsController < ResourceController- before_action :load_user+ prepend_before_action :load_user+ prepend_before_action :set_user_id_filter, only: :indexbefore_action :add_breadcrumbsbefore_action :load_orders, only: :show@@ -21,23 +22,15 @@ module Spreeendend- def collection- return @collection if @collection.present?+ def collection_includes+ [:user, :created_by]+ end- @collection = super+ def set_user_id_filter+ return if params[:user_id].blank?params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'params[:q][:user_id_eq] = params[:user_id] if params[:user_id].present?-- @search = @collection- @search = @search.ransack(params[:q])-- @collection = @search.result.includes(:user, :created_by)-- @collection = @collection.page(params[:page]).per(params[:per_page])-- @collectionenddef location_after_destroydiff --git a/admin/app/controllers/spree/admin/invitations_controller.rb b/admin/app/controllers/spree/admin/invitations_controller.rbindex 8a19914728..d6d9607289 100644--- a/admin/app/controllers/spree/admin/invitations_controller.rb+++ b/admin/app/controllers/spree/admin/invitations_controller.rb@@ -13,8 +13,6 @@ module Spree# GET /admin/invitationsdef index- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'@search = scope.includes(:inviter, :role).ransack(params[:q])@collection = @search.resultenddiff --git a/admin/app/controllers/spree/admin/oauth_applications_controller.rb b/admin/app/controllers/spree/admin/oauth_applications_controller.rbindex cc46049cc3..aac419e7f7 100644--- a/admin/app/controllers/spree/admin/oauth_applications_controller.rb+++ b/admin/app/controllers/spree/admin/oauth_applications_controller.rb@@ -7,16 +7,6 @@ module Spreeprivate- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- @search = @collection.ransack(params[:q])- @collection = @search.result.page(params[:page]).per(500)- end-def create_turbo_stream_enabled?trueenddiff --git a/admin/app/controllers/spree/admin/option_types_controller.rb b/admin/app/controllers/spree/admin/option_types_controller.rbindex 2e24e52713..d839dc274e 100644--- a/admin/app/controllers/spree/admin/option_types_controller.rb+++ b/admin/app/controllers/spree/admin/option_types_controller.rb@@ -10,16 +10,6 @@ module Spreeprivate- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- @search = @collection.ransack(params[:q])- @collection = @search.result.all- end-def setup_new_option_value@option_type.option_values.build if @option_type.option_values.empty?enddiff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rbindex 78eaf54c82..6a7974a86b 100644--- a/admin/app/controllers/spree/admin/orders_controller.rb+++ b/admin/app/controllers/spree/admin/orders_controller.rb@@ -1,6 +1,6 @@module Spreemodule Admin- class OrdersController < Spree::Admin::BaseController+ class OrdersController < Spree::Admin::ResourceControllerinclude Spree::Admin::OrderConcerninclude Spree::Admin::OrdersFiltersHelperinclude Spree::Admin::OrderBreadcrumbConcerndiff --git a/admin/app/controllers/spree/admin/pages_controller.rb b/admin/app/controllers/spree/admin/pages_controller.rbindex f1d2c91d51..e34bc8a050 100644--- a/admin/app/controllers/spree/admin/pages_controller.rb+++ b/admin/app/controllers/spree/admin/pages_controller.rb@@ -27,7 +27,7 @@ module Spreespree.edit_admin_theme_path(current_store.default_theme, page_id: object.id, **options)end- def collection+ def scopesuper.custom.without_previewsenddiff --git a/admin/app/controllers/spree/admin/payment_methods_controller.rb b/admin/app/controllers/spree/admin/payment_methods_controller.rbindex b413c81522..f75174ef92 100644--- a/admin/app/controllers/spree/admin/payment_methods_controller.rb+++ b/admin/app/controllers/spree/admin/payment_methods_controller.rb@@ -22,16 +22,6 @@ module Spreeendend- def collection- return @collection if @collection.present?-- params[:q] ||= {}-- @collection = super.order(position: :asc)- @search = @collection.ransack(params[:q])- @collection = @search.result.page(params[:page]).per(params[:per_page])- end-def require_payment_typeredirect_to spree.admin_payment_methods_path unless params.dig(:payment_method, :type).present?enddiff --git a/admin/app/controllers/spree/admin/policies_controller.rb b/admin/app/controllers/spree/admin/policies_controller.rbindex c22a08e4ad..adc90330d1 100644--- a/admin/app/controllers/spree/admin/policies_controller.rb+++ b/admin/app/controllers/spree/admin/policies_controller.rb@@ -7,6 +7,10 @@ module Spreeprivate+ def collection_includes+ [:rich_text_translations]+ end+def permitted_resource_paramsparams.require(:policy).permit(permitted_policy_attributes)enddiff --git a/admin/app/controllers/spree/admin/posts_controller.rb b/admin/app/controllers/spree/admin/posts_controller.rbindex 7764ee7e79..dd5006a968 100644--- a/admin/app/controllers/spree/admin/posts_controller.rb+++ b/admin/app/controllers/spree/admin/posts_controller.rb@@ -14,16 +14,8 @@ module Spreeprivate- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- params[:q][:s] ||= 'published_at desc'-- @search = @collection.ransack(params[:q])- @collection = @search.result.page(params[:page]).per(params[:per_page])+ def collection_includes+ [:author, :post_category, :image_attachment]enddef load_post_categoriesdiff --git a/admin/app/controllers/spree/admin/properties_controller.rb b/admin/app/controllers/spree/admin/properties_controller.rbindex 540b5111b5..04bde6297a 100644--- a/admin/app/controllers/spree/admin/properties_controller.rb+++ b/admin/app/controllers/spree/admin/properties_controller.rb@@ -12,18 +12,6 @@ module Spreetrueend- def collection- return @collection if @collection.present?-- # params[:q] can be blank upon pagination- params[:q] = {} if params[:q].blank?-- @collection = super- @search = @collection.ransack(params[:q])- @collection = @search.result.- page(params[:page])- end-def add_breadcrumbsif @property.present? && @property.persisted?add_breadcrumb @property.presentation, spree.edit_admin_property_path(@property)diff --git a/admin/app/controllers/spree/admin/resource_controller.rb b/admin/app/controllers/spree/admin/resource_controller.rbindex b1bb353792..51dcd6c660 100644--- a/admin/app/controllers/spree/admin/resource_controller.rb+++ b/admin/app/controllers/spree/admin/resource_controller.rb@@ -1,12 +1,16 @@class Spree::Admin::ResourceController < Spree::Admin::BaseControllerinclude Spree::Admin::Callbacks- helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class, :search_collection, :paginated_collection+ helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_classbefore_action :load_resourcebefore_action :set_currency, :set_current_store, only: [:new, :create]rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found+ def index+ @collection = collection+ end+# GET /admin/<resource_name>/newdef newinvoke_callbacks(:new_action, :before)@@ -217,7 +221,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController# Returns the collection of resources (as a scope)# @return [ActiveRecord::Relation]- def collection+ def scopereturn parent.send(controller_name) if parent_data.present?base_scope = model_class.try(:for_store, current_store) || model_class@@ -227,30 +231,36 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerif model_class.respond_to?(:accessible_by) &&!current_ability.has_block?(params[:action], model_class)- base_scope.accessible_by(current_ability, action)+ base_scope.accessible_by(current_ability, action).includes(collection_includes)else- base_scope+ base_scope.includes(collection_includes)+ end+ end++ # keeping this as @search for backwards compatibility+ # @return [Ransack::Search]+ def search_collection+ @search ||= begin+ params[:q] ||= {}+ params[:q][:s] ||= collection_default_sort if collection_default_sort.present?+ scope.ransack(params[:q])endend# Returns the filtered and paginated ransack results# @return [ActiveRecord::Relation]- def paginated_collection- @paginated_collection ||= begin- # Check if collection is already a ransack collection and return it- return collection if collection.respond_to?(:current_page)+ def collection+ @collection ||= search_collection.result(distinct: true).page(params[:page]).per(params[:per_page])+ end- search_collection.result(distinct: true).page(params[:page]).per(params[:per_page])- end+ def collection_includes+ []end- # Returns the ransack search collection- # @return [Ransack::Search]- def search_collection- @search_collection ||= begin- params[:q] ||= {}- collection.ransack(params[:q])- end+ # Override in child controllers to set default sort order+ # @return [String, nil] Ransack sort string (e.g., "name asc", "created_at desc")+ def collection_default_sort+ nilend# Returns the URL to redirect to after destroying a resourcediff --git a/admin/app/controllers/spree/admin/return_authorizations_controller.rb b/admin/app/controllers/spree/admin/return_authorizations_controller.rbindex d9e73324be..0b87c35949 100644--- a/admin/app/controllers/spree/admin/return_authorizations_controller.rb+++ b/admin/app/controllers/spree/admin/return_authorizations_controller.rb@@ -21,16 +21,6 @@ module Spreedef location_after_destroyspree.edit_admin_order_path(@return_authorization.order)end-- def collection- return @collection if @collection.present?-- params[:q] ||= {}-- # @search needs to be defined as this is passed to search_form_for- @search = current_store.return_authorizations.accessible_by(current_ability, :index).ransack(params[:q])- @collection = @search.result.order(created_at: :desc).page(params[:page]).per(params[:per_page])- endendendenddiff --git a/admin/app/controllers/spree/admin/shipping_methods_controller.rb b/admin/app/controllers/spree/admin/shipping_methods_controller.rbindex cfa14237b0..b471f22ef8 100644--- a/admin/app/controllers/spree/admin/shipping_methods_controller.rb+++ b/admin/app/controllers/spree/admin/shipping_methods_controller.rb@@ -8,6 +8,10 @@ module Spreeprivate+ def collection_includes+ [:zones, :calculator]+ end+def set_default_values@shipping_method.display_on = 'both'@shipping_method.shipping_categories = [Spree::ShippingCategory.first]diff --git a/admin/app/controllers/spree/admin/stock_items_controller.rb b/admin/app/controllers/spree/admin/stock_items_controller.rbindex b10f71536f..53ed102186 100644--- a/admin/app/controllers/spree/admin/stock_items_controller.rb+++ b/admin/app/controllers/spree/admin/stock_items_controller.rb@@ -11,18 +11,15 @@ module Spreetrueend- def collection- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'+ def scope+ super.joins(:variant).where(spree_variants: { track_inventory: true }).merge(current_store.variants.eligible).reorder('')+ end- @search = super.accessible_by(current_ability, :update).ransack(params[:q])- @stock_items = @search.result.- joins(:variant).- where(spree_variants: { track_inventory: true }).- merge(current_store.variants.eligible).- includes(:stock_location, [variant: [product: [variants: [:images], master: [:images]], images: []]]).- page(params[:page]).- per(params[:per_page])+ def collection_includes+ {+ stock_location: [],+ variant: [option_values: :option_type, product: [variant_images: [], variants: [:images], master: [:images]], images: []]+ }enddef add_breadcrumbsdiff --git a/admin/app/controllers/spree/admin/stock_locations_controller.rb b/admin/app/controllers/spree/admin/stock_locations_controller.rbindex 418ff0a725..21df98d734 100644--- a/admin/app/controllers/spree/admin/stock_locations_controller.rb+++ b/admin/app/controllers/spree/admin/stock_locations_controller.rb@@ -15,7 +15,7 @@ module Spreeprivate- def collection+ def scopesuper.order_defaultenddiff --git a/admin/app/controllers/spree/admin/stock_transfers_controller.rb b/admin/app/controllers/spree/admin/stock_transfers_controller.rbindex 5d424bf238..1996a24d21 100644--- a/admin/app/controllers/spree/admin/stock_transfers_controller.rb+++ b/admin/app/controllers/spree/admin/stock_transfers_controller.rb@@ -15,16 +15,6 @@ module Spreespree.admin_stock_transfer_path(@object)end- def collection- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'-- @search = super.accessible_by(current_ability, :index).ransack(params[:q])- @stock_transfers = @search.result.- page(params[:page]).- per(params[:per_page])- end-def permitted_resource_paramsparams.require(:stock_transfer).permit(permitted_stock_transfer_attributes)enddiff --git a/admin/app/controllers/spree/admin/store_credits_controller.rb b/admin/app/controllers/spree/admin/store_credits_controller.rbindex 0d5328a23c..126b9c131d 100644--- a/admin/app/controllers/spree/admin/store_credits_controller.rb+++ b/admin/app/controllers/spree/admin/store_credits_controller.rb@@ -2,18 +2,10 @@ module Spreemodule Adminclass StoreCreditError < StandardError; end- class StoreCreditsController < Spree::Admin::BaseController- before_action :load_user- before_action :load_store_credit, only: [:new, :edit, :update, :destroy]+ class StoreCreditsController < Spree::Admin::ResourceController+ before_action :set_breadcrumbs+ before_action :set_userbefore_action :ensure_unused_store_credit, only: [:update]- helper_method :collection_url-- def index- @store_credits = scope.includes(:created_by).order(created_at: :desc)- @store_credits = @store_credits.page(params[:page]).per(params[:per_page])-- @collection = @store_credits- enddef show@store_credit = scope.find(params[:id])@@ -21,8 +13,8 @@ module Spreeenddef create- @store_credit = @user.store_credits.build(- permitted_store_credit_params.merge(+ @store_credit = parent.store_credits.build(+ permitted_resource_params.merge(created_by: try_spree_current_user,action_originator: try_spree_current_user,store: current_store@@ -31,7 +23,7 @@ module Spreeif @store_credit.saveflash[:success] = flash_message_for(@store_credit, :successfully_created)- redirect_to spree.admin_user_path(@user)+ redirect_to spree.admin_user_path(parent)elseflash[:error] = Spree.t('store_credit.errors.unable_to_create')render :new, status: :unprocessable_entity@@ -39,11 +31,11 @@ module Spreeenddef update- @store_credit.assign_attributes(permitted_store_credit_params)+ @store_credit.assign_attributes(permitted_resource_params)if @store_credit.saveflash[:success] = flash_message_for(@store_credit, :successfully_updated)- redirect_to spree.admin_user_store_credit_path(@user, @store_credit)+ redirect_to spree.admin_user_store_credit_path(parent, @store_credit)elseflash[:error] = Spree.t('store_credit.errors.unable_to_update')render :edit, status: :unprocessable_entity@@ -59,37 +51,41 @@ module Spreeflash[:error] = Spree.t('store_credit.errors.unable_to_delete')end- redirect_to spree.admin_user_path(@user)+ redirect_to spree.admin_user_path(parent)endprotected- def permitted_store_credit_params- params.require(:store_credit).permit(permitted_store_credit_attributes)+ def parent+ @parent ||= Spree.user_class.find_by(id: params[:user_id])end- private+ def parent_data+ {+ model_name: 'spree/user',+ model_class: Spree.user_class,+ find_by: :id+ }+ end- def load_user- @user = Spree.user_class.find_by(id: params[:user_id])+ def permitted_resource_params+ params.require(:store_credit).permit(permitted_store_credit_attributes)+ end- unless @user- flash[:error] = Spree.t(:user_not_found)- redirect_to spree.admin_path- end+ private- @breadcrumb_icon = 'users'- add_breadcrumb Spree.t(:customers), :admin_users_path- add_breadcrumb @user.name, spree.admin_user_path(@user)+ def set_user+ @user = parentend- def load_store_credit- @store_credit = scope.find_by(id: params[:id]) || scope.new- @object = @store_credit+ def object_url+ spree.admin_user_store_credit_path(parent, @store_credit)end- def scope- current_store.store_credits.where(user: @user)+ def set_breadcrumbs+ @breadcrumb_icon = 'users'+ add_breadcrumb Spree.t(:customers), :admin_users_path+ add_breadcrumb parent.name, spree.admin_user_path(parent)enddef ensure_unused_store_credit@@ -99,7 +95,11 @@ module Spreeenddef collection_url- spree.admin_user_store_credits_path(@user)+ spree.admin_user_store_credits_path(parent)+ end++ def update_turbo_stream_enabled?+ trueendendenddiff --git a/admin/app/controllers/spree/admin/taxonomies_controller.rb b/admin/app/controllers/spree/admin/taxonomies_controller.rbindex 989b35fc79..f472fada34 100644--- a/admin/app/controllers/spree/admin/taxonomies_controller.rb+++ b/admin/app/controllers/spree/admin/taxonomies_controller.rb@@ -8,16 +8,6 @@ module Spreeprivate- def collection- return @collection if @collection.present?-- @collection = super-- params[:q] ||= {}- @search = @collection.ransack(params[:q])- @collection = @search.result.all- end-def location_after_savespree.admin_taxonomy_path(@taxonomy)enddiff --git a/admin/app/controllers/spree/admin/themes_controller.rb b/admin/app/controllers/spree/admin/themes_controller.rbindex 8f53a035c3..d1e8dac9aa 100644--- a/admin/app/controllers/spree/admin/themes_controller.rb+++ b/admin/app/controllers/spree/admin/themes_controller.rb@@ -70,8 +70,12 @@ module Spreetrueend- def collection- super.without_previews.order(default: :desc).includes(screenshot_attachment: :blob)+ def scope+ super.without_previews.order(default: :desc)+ end++ def collection_includes+ { screenshot_attachment: :blob }enddef permitted_resource_paramsdiff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rbindex 26650faf86..385e6011a1 100644--- a/admin/app/controllers/spree/admin/users_controller.rb+++ b/admin/app/controllers/spree/admin/users_controller.rb@@ -50,23 +50,13 @@ module Spreeprotected- def collection- return @collection if @collection.present?-- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'- params[:q][:created_at_not_null] ||= 1-- @collection = model_class.accessible_by(current_ability, :index)- @search = @collection.ransack(params[:q])- @collection = @search.result(distinct: true).- includes(- addresses: [:country, :state],- ship_address: [:country, :state],- bill_address: [:country, :state],- avatar_attachment: :blob- ).- page(params[:page]).per(params[:per_page])+ def collection_includes+ {+ addresses: [:country, :state],+ ship_address: [:country, :state],+ bill_address: [:country, :state],+ avatar_attachment: :blob+ }enddef find_resourcediff --git a/admin/app/controllers/spree/admin/webhooks_subscribers_controller.rb b/admin/app/controllers/spree/admin/webhooks_subscribers_controller.rbindex 5d7fd286ad..ce5ed36ede 100644--- a/admin/app/controllers/spree/admin/webhooks_subscribers_controller.rb+++ b/admin/app/controllers/spree/admin/webhooks_subscribers_controller.rb@@ -19,16 +19,6 @@ module Spree@resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nilend- def collection- params[:q] ||= {}- params[:q][:s] ||= 'created_at desc'-- @search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])- @collection = @search.result.- page(params[:page]).- per(params[:per_page])- end-def process_subscriptionsreturn if params[:webhooks_subscriber].blank?diff --git a/admin/app/controllers/spree/admin/zones_controller.rb b/admin/app/controllers/spree/admin/zones_controller.rbindex e7d99e567c..45b1848c87 100644--- a/admin/app/controllers/spree/admin/zones_controller.rb+++ b/admin/app/controllers/spree/admin/zones_controller.rb@@ -14,13 +14,6 @@ module Spreeedit_object_url(@object, states_country_id: @selected_country&.id)end- def collection- params[:q] ||= {}- params[:q][:s] ||= 'name asc'- @search = super.ransack(params[:q])- @zones = @search.result.page(params[:page]).per(params[:per_page])- end-def load_data@selected_country = if params[:states_country_id]Spree::Country.find_by(id: params[:states_country_id])diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rbindex 782512de5c..1d2877b4de 100644--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb@@ -2,6 +2,8 @@ module Spreemodule Adminmodule OrdersFiltersHelperdef params_to_filters(search_params:, vendor: nil, user: nil)+ return if search_params.blank?+if search_params.is_a?(String)search_params = JSON.parse(search_params).deep_symbolize_keysenddiff --git a/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb b/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erbindex ad035d3bcd..5e7232ab74 100644--- a/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb+++ b/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb@@ -3,7 +3,7 @@<table class="table"><thead><tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:active) %>?</th><th scope="col"><%= Spree.t(:default) %>?</th><th scope="col"></th>diff --git a/admin/app/views/spree/admin/digital_assets/_table.html.erb b/admin/app/views/spree/admin/digital_assets/_table.html.erbindex 73a57a829a..b31db1dad1 100644--- a/admin/app/views/spree/admin/digital_assets/_table.html.erb+++ b/admin/app/views/spree/admin/digital_assets/_table.html.erb@@ -4,7 +4,7 @@<% if @product.has_variants? %><th scope="col"><%= Spree.t(:variant) %></th><% end %>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:size) %></th><th scope="col"></th></tr>diff --git a/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb b/admin/app/views/spree/admin/metafield_definitions/_filters.html.erbindex 36d0d80191..2a659e7d60 100644--- a/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb+++ b/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb@@ -1,4 +1,4 @@-<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: {controller: "filters auto-submit"} do |f| %>+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters auto-submit"} do |f| %><div class="d-flex"><%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, label: Spree.t(:title) %>diff --git a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erbindex 2156bcc592..c9e9c20860 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb@@ -1,4 +1,4 @@-<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters" } do |f| %>+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %><div class="d-flex flex-column flex-lg-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :email_cont, label: Spree.t(:email) %>diff --git a/admin/app/views/spree/admin/newsletter_subscribers/_table_header.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_table_header.html.erbindex 14902dc223..00bcd96346 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_table_header.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_table_header.html.erb@@ -1,8 +1,8 @@<tr>- <th scope="col"><%= sort_link search_collection, :email, Spree.t(:email) %></th>+ <th scope="col"><%= sort_link @search, :email, Spree.t(:email) %></th><th scope="col"><%= Spree.t(:customer) %></th><th scope="col"><%= Spree.t(:verified) %>?</th><th scope="col"><%= Spree.t(:verified_at) %></th>- <th scope="col"><%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>+ <th scope="col"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/oauth_applications/_table_header.html.erb b/admin/app/views/spree/admin/oauth_applications/_table_header.html.erbindex ca6dde032d..fbcccaf45b 100644--- a/admin/app/views/spree/admin/oauth_applications/_table_header.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t('admin.oauth_applications.client_id') %></th><th scope="col"><%= Spree.t('admin.oauth_applications.scopes') %></th><th scope="col"><%= Spree.t('admin.oauth_applications.last_used') %></th>diff --git a/admin/app/views/spree/admin/orders/_list.html.erb b/admin/app/views/spree/admin/orders/_list.html.erbindex ca532207e7..66f6a63635 100644--- a/admin/app/views/spree/admin/orders/_list.html.erb+++ b/admin/app/views/spree/admin/orders/_list.html.erb@@ -1,4 +1,4 @@-<% if @orders.any? %>+<% if @collection.any? %><div class="table-responsive"><table class="table" id="listing_orders"><thead>@@ -18,11 +18,11 @@</tr></thead><tbody>- <%= render collection: @orders, partial: 'spree/admin/orders/order', cached: !(defined?(current_vendor) && current_vendor) ? spree_base_cache_scope : false %>+ <%= render collection: @collection, partial: 'spree/admin/orders/order', cached: !(defined?(current_vendor) && current_vendor) ? spree_base_cache_scope : false %></tbody></table></div><% else %><%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Order %><% end %>-<%= render 'spree/admin/shared/index_table_options', collection: @orders if @orders.any? %>+<%= render 'spree/admin/shared/index_table_options', collection: @collection %>diff --git a/admin/app/views/spree/admin/pages/_table_header.html.erb b/admin/app/views/spree/admin/pages/_table_header.html.erbindex d34e8bbdd7..d3a16708c3 100644--- a/admin/app/views/spree/admin/pages/_table_header.html.erb+++ b/admin/app/views/spree/admin/pages/_table_header.html.erb@@ -1,6 +1,6 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>- <th scope="col"><%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>- <th scope="col"><%= sort_link search_collection, :updated_at, Spree.t(:updated_at) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>+ <th scope="col"><%= sort_link @search, :updated_at, Spree.t(:updated_at) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/policies/_filters.html.erb b/admin/app/views/spree/admin/policies/_filters.html.erbindex 1ff037d81c..fa17120176 100644--- a/admin/app/views/spree/admin/policies/_filters.html.erb+++ b/admin/app/views/spree/admin/policies/_filters.html.erb@@ -1,4 +1,4 @@-<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters" } do |f| %>+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %><div class="d-flex flex-column flex-lg-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %></div>diff --git a/admin/app/views/spree/admin/promotions/_table_header.html.erb b/admin/app/views/spree/admin/promotions/_table_header.html.erbindex 51cd6a3f19..e1d93e0d6a 100644--- a/admin/app/views/spree/admin/promotions/_table_header.html.erb+++ b/admin/app/views/spree/admin/promotions/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:code) %></th><th scope="col"><%= Spree.t(:kind) %></th><th scope="col"><%= Spree.t(:usage_limit) %></th>diff --git a/admin/app/views/spree/admin/refund_reasons/_table_header.html.erb b/admin/app/views/spree/admin/refund_reasons/_table_header.html.erbindex 19c68eeded..15ab396f65 100644--- a/admin/app/views/spree/admin/refund_reasons/_table_header.html.erb+++ b/admin/app/views/spree/admin/refund_reasons/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:status) %></th><th scope="col"><%= Spree.t(:mutable) %></th><th scope="col"></th>diff --git a/admin/app/views/spree/admin/reimbursement_types/_table_header.html.erb b/admin/app/views/spree/admin/reimbursement_types/_table_header.html.erbindex 1f4635b3e5..db72f87f7f 100644--- a/admin/app/views/spree/admin/reimbursement_types/_table_header.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:type) %></th><th scope="col"><%= Spree.t(:status) %></th><th scope="col"><%= Spree.t(:mutable) %></th>diff --git a/admin/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb b/admin/app/views/spree/admin/return_authorization_reasons/_table_header.html.erbindex 1f9412c29c..474969a099 100644--- a/admin/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb+++ b/admin/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:status) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/roles/index.html.erb b/admin/app/views/spree/admin/roles/index.html.erbindex 9c4cd86b3e..068725eb9a 100644--- a/admin/app/views/spree/admin/roles/index.html.erb+++ b/admin/app/views/spree/admin/roles/index.html.erb@@ -13,7 +13,7 @@<table class="table"><thead><tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:permissions) %></th><th scope="col"></th></tr>diff --git a/admin/app/views/spree/admin/shared/_index_table.html.erb b/admin/app/views/spree/admin/shared/_index_table.html.erbindex 71272d602a..c73cfdfc86 100644--- a/admin/app/views/spree/admin/shared/_index_table.html.erb+++ b/admin/app/views/spree/admin/shared/_index_table.html.erb@@ -1,13 +1,14 @@<% sortable = local_assigns[:sortable] %>+<% frame_name = local_assigns[:frame_name] || controller_name %>-<%= turbo_frame_tag controller_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>+<%= turbo_frame_tag frame_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %><%= render 'spree/admin/shared/export_modal', export_type: export_type if local_assigns[:export_type] %><div class="card-lg"><% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %><%= render 'filters' %><% end %>- <% if paginated_collection.any? %>+ <% if @collection.any? %><div class="<% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>with-filters<% end %>" id="listing_<%= controller_name %>"><table class="table"><thead>@@ -21,12 +22,12 @@data-sortable-response-kind-value="turbo-stream"<% end %>>- <%= render partial: 'table_row', collection: paginated_collection, as: controller_name.singularize %>+ <%= render partial: 'table_row', collection: @collection, as: controller_name.singularize %></tbody></table></div>- <%= render 'spree/admin/shared/index_table_options', collection: paginated_collection %>+ <%= render 'spree/admin/shared/index_table_options', collection: @collection %><% else %><%= render 'spree/admin/shared/no_resource_found', new_object_url: (new_object_url if can?(:create, model_class)) %><% end %>diff --git a/admin/app/views/spree/admin/shipping_categories/_table_header.html.erb b/admin/app/views/spree/admin/shipping_categories/_table_header.html.erbindex fd6dd634e3..e5aa196048 100644--- a/admin/app/views/spree/admin/shipping_categories/_table_header.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/_table_header.html.erb@@ -1,4 +1,4 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shipping_methods/_table_header.html.erb b/admin/app/views/spree/admin/shipping_methods/_table_header.html.erbindex f074548604..d8778a7671 100644--- a/admin/app/views/spree/admin/shipping_methods/_table_header.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/_table_header.html.erb@@ -1,5 +1,5 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:zone) %></th><th scope="col"><%= Spree.t(:estimated_delivery_time) %></th><th scope="col"><%= Spree.t(:amount) %></th>diff --git a/admin/app/views/spree/admin/stock_locations/_table_header.html.erb b/admin/app/views/spree/admin/stock_locations/_table_header.html.erbindex 3fd66a7b04..266bb01819 100644--- a/admin/app/views/spree/admin/stock_locations/_table_header.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_table_header.html.erb@@ -1,6 +1,6 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>- <th scope="col"><%= sort_link search_collection, :country, Spree.t(:country) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :country, Spree.t(:country) %></th><th scope="col"><%= Spree.t(:active) %>?</th><% if can?(:mark_as_default, Spree::StockLocation) %><th scope="col"><%= Spree.t(:default) %>?</th>diff --git a/admin/app/views/spree/admin/store_credit_categories/index.html.erb b/admin/app/views/spree/admin/store_credit_categories/index.html.erbindex 22372384bc..5e50009696 100644--- a/admin/app/views/spree/admin/store_credit_categories/index.html.erb+++ b/admin/app/views/spree/admin/store_credit_categories/index.html.erb@@ -15,7 +15,7 @@<table class="table"><thead><tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"></th></tr></thead>diff --git a/admin/app/views/spree/admin/store_credits/_list.html.erb b/admin/app/views/spree/admin/store_credits/_list.html.erbindex df943aea42..2b97c5b489 100644--- a/admin/app/views/spree/admin/store_credits/_list.html.erb+++ b/admin/app/views/spree/admin/store_credits/_list.html.erb@@ -1,4 +1,4 @@-<% if @store_credits.any? %>+<% if @collection.any? %><div class="table-responsive"><table class="table"><thead>@@ -11,11 +11,11 @@<th scope="col"><%= Spree.t(:issued_on) %></th></thead><tbody>- <%= render partial: 'spree/admin/store_credits/store_credit', collection: @store_credits, as: :store_credit, cached: spree_base_cache_scope %>+ <%= render partial: 'spree/admin/store_credits/store_credit', collection: @collection, as: :store_credit, cached: spree_base_cache_scope %></tbody></table></div>- <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @store_credits } %>+ <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %><% else %><%= render 'spree/admin/shared/no_resource_found', model_class: Spree::StoreCredit, new_object_url: spree.new_admin_user_store_credit_path(@user) %><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/tax_categories/_table_header.html.erb b/admin/app/views/spree/admin/tax_categories/_table_header.html.erbindex 72b9cd4dc9..7adbb32cf9 100644--- a/admin/app/views/spree/admin/tax_categories/_table_header.html.erb+++ b/admin/app/views/spree/admin/tax_categories/_table_header.html.erb@@ -1,6 +1,6 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>- <th scope="col"><%= sort_link search_collection, :tax_code, Spree.t(:tax_code) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :tax_code, Spree.t(:tax_code) %></th><th scope="col"><%= Spree.t(:description) %></th><th scope="col"><%= Spree.t(:default) %></th><th scope="col"></th>diff --git a/admin/app/views/spree/admin/tax_rates/_table_header.html.erb b/admin/app/views/spree/admin/tax_rates/_table_header.html.erbindex 6a97dedfdb..8ea47e29e5 100644--- a/admin/app/views/spree/admin/tax_rates/_table_header.html.erb+++ b/admin/app/views/spree/admin/tax_rates/_table_header.html.erb@@ -1,8 +1,8 @@<tr>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:tax_category) %></th><th scope="col"><%= Spree.t(:zone) %></th>- <th scope="col"><%= sort_link search_collection, :amount, Spree.t(:amount) %></th>+ <th scope="col"><%= sort_link @search, :amount, Spree.t(:amount) %></th><th scope="col"><%= Spree.t(:included_in_price) %></th><th scope="col"><%= Spree.t(:show_rate_in_label) %></th><th scope="col"></th>diff --git a/admin/app/views/spree/admin/taxonomies/_table_header.html.erb b/admin/app/views/spree/admin/taxonomies/_table_header.html.erbindex 07e97350b4..16f44e5918 100644--- a/admin/app/views/spree/admin/taxonomies/_table_header.html.erb+++ b/admin/app/views/spree/admin/taxonomies/_table_header.html.erb@@ -1,6 +1,6 @@<tr data-hook="listing_taxonomies_header"><th class="no-border handel-head"></th>- <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>+ <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th><th scope="col"><%= Spree.t(:taxons) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erbindex 1afa0aed42..f9b0e0d9d0 100644--- a/admin/app/views/spree/admin/users/_filters.html.erb+++ b/admin/app/views/spree/admin/users/_filters.html.erb@@ -22,7 +22,7 @@<div class="form-group"><%= f.label :addresses_country_name_eq, Spree.t(:location) %><%= tom_select_tag "q[addresses_country_name_eq]",- active_option: params[:q][:addresses_country_name_eq],+ active_option: params.dig(:q, :addresses_country_name_eq),options: Spree::Country.all.to_tom_select_json,value_field: :name,select_class: "w-100",@@ -33,7 +33,7 @@<div class="form-group"><%= f.label :tags_name_in, Spree.t(:tags) %><%= tom_select_tag "q[tags_name_in]",- active_option: params[:q][:tags_name_in],+ active_option: params.dig(:q, :tags_name_in),options: user_tags_json_array,multiple: true,value_field: :name,@@ -45,7 +45,7 @@<div class="form-group"><%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %><%= f.select :accepts_email_marketing_eq,- options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),+ options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),{ include_blank: true },{ class: "custom-select", data: { filters_target: :input } } %></div>diff --git a/admin/app/views/spree/admin/users/index.html.erb b/admin/app/views/spree/admin/users/index.html.erbindex b93657b82c..5ca99f6dc1 100644--- a/admin/app/views/spree/admin/users/index.html.erb+++ b/admin/app/views/spree/admin/users/index.html.erb@@ -63,7 +63,7 @@</div><% end %></div>- <%= render "spree/admin/shared/index_table_options", collection: @collection if @collection.any? %>+ <%= render "spree/admin/shared/index_table_options", collection: @collection %><% else %><%= render "spree/admin/shared/no_resource_found" %><% end %>diff --git a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.ttindex 74e8cdc3b5..16289041da 100644--- a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt+++ b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt@@ -1,4 +1,4 @@-<%%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>+<%%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %><div class="d-flex flex-column flex-lg-row gap-2"><%%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %><%%= render 'spree/admin/shared/filters_button' %>diff --git a/admin/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.tt b/admin/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.ttindex ec4e30ce65..014a0b4e50 100644--- a/admin/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.tt+++ b/admin/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.tt@@ -1,5 +1,5 @@<tr>- <th scope="col"><%%= sort_link search_collection, :name, Spree.t(:name) %></th>- <th scope="col"><%%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>+ <th scope="col"><%%= sort_link @search, :name, Spree.t(:name) %></th>+ <th scope="col"><%%= sort_link @search, :created_at, Spree.t(:created_at) %></th><th scope="col"></th></tr>\ No newline at end of filediff --git a/admin/spec/controllers/spree/admin/customer_returns_controller_spec.rb b/admin/spec/controllers/spree/admin/customer_returns_controller_spec.rbindex 35ff331f21..f33f5cc03d 100644--- a/admin/spec/controllers/spree/admin/customer_returns_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/customer_returns_controller_spec.rb@@ -6,44 +6,26 @@ RSpec.describe Spree::Admin::CustomerReturnsController dolet(:store) { @default_store }let(:order) { create(:shipped_order, store: store) }- let!(:customer_return) { create(:customer_return, store: store) }+ let!(:customer_returns) { create_list(:customer_return, 3, store: store) }describe '#index' dosubject { get :index }it 'is successful' dosubject+expect(response).to be_successful+ expect(assigns(:collection)).to contain_exactly(*customer_returns)endcontext 'when there are no customer returns' do- before { Spree::CustomerReturn.destroy_all }+ let!(:customer_returns) { [] }it 'is successful' dosubjectexpect(response).to be_successful+ expect(assigns(:collection)).to be_emptyendendend-- describe '#collection' do- let!(:customer_returns) { create_list(:customer_return, 3, store: store) }-- it 'orders by created_at desc' do- # Call the private method directly- collection = controller.send(:collection)-- expect(collection).to eq [*customer_returns.reverse, customer_return]- end-- it 'paginates the results' do- allow(controller).to receive(:params).and_return({ per_page: '2', page: '1' })-- # Call the private method directly- collection = controller.send(:collection)-- expect(collection.limit_value).to eq 2- expect(collection.current_page).to eq 1- end- endenddiff --git a/admin/spec/controllers/spree/admin/metafield_definitions_controller_spec.rb b/admin/spec/controllers/spree/admin/metafield_definitions_controller_spec.rbindex aa94b79e1b..383b2063ea 100644--- a/admin/spec/controllers/spree/admin/metafield_definitions_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/metafield_definitions_controller_spec.rb@@ -32,15 +32,15 @@ RSpec.describe Spree::Admin::MetafieldDefinitionsController, type: :controller dit 'renders the index template' doget :indexexpect(response).to render_template(:index)- expect(assigns(:search_collection).result).to include(*metafield_definitions)- expect(assigns(:search_collection).result).to include(taxon_rich_text_field)+ expect(assigns[:collection]).to include(*metafield_definitions)+ expect(assigns[:collection]).to include(taxon_rich_text_field)endcontext 'filtering by resource type' doit 'renders the index template' doget :index, params: { q: { resource_type_eq: 'Spree::Taxon' } }expect(response).to render_template(:index)- expect(assigns(:search_collection).result).to eq([taxon_rich_text_field])+ expect(assigns[:collection]).to eq([taxon_rich_text_field])endendenddiff --git a/admin/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/admin/spec/controllers/spree/admin/return_authorizations_controller_spec.rbindex 6acce2b361..fa04f65b5d 100644--- a/admin/spec/controllers/spree/admin/return_authorizations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/return_authorizations_controller_spec.rb@@ -6,8 +6,14 @@ RSpec.describe Spree::Admin::ReturnAuthorizationsController dolet(:store) { @default_store }let(:order) { create(:shipped_order, store: store) }- let(:return_authorization) { create(:return_authorization, order: order) }- let!(:return_item) { create(:return_item, return_authorization: return_authorization, inventory_unit: order.inventory_units.shipped.first) }++ let!(:return_authorizations) do+ [+ create(:return_authorization, order: order, created_at: 3.days.ago),+ create(:return_authorization, order: order, created_at: 1.hour.ago),+ create(:return_authorization, order: order, created_at: 10.minutes.ago)+ ]+ enddescribe '#index' dosubject { get :index }@@ -15,19 +21,24 @@ RSpec.describe Spree::Admin::ReturnAuthorizationsController doit 'is successful' dosubjectexpect(response).to be_successful+ expect(assigns(:collection)).to contain_exactly(*return_authorizations)endcontext 'when there are no return authorizations' do- before { Spree::ReturnAuthorization.destroy_all }+ let!(:return_authorizations) { [] }it 'is successful' dosubjectexpect(response).to be_successful+ expect(assigns(:collection)).to be_emptyendendenddescribe '#cancel' do+ let(:return_authorization) { return_authorizations.first }+ let!(:return_item) { create(:return_item, return_authorization: return_authorization, inventory_unit: order.inventory_units.shipped.first) }+subject { put :cancel, params: { id: return_authorization.id } }it 'cancels the return authorization' do@@ -46,6 +57,8 @@ RSpec.describe Spree::Admin::ReturnAuthorizationsController doenddescribe '#destroy' do+ let(:return_authorization) { return_authorizations.first }+subject { delete :destroy, params: { id: return_authorization.id } }it 'destroys the return authorization' do@@ -57,47 +70,4 @@ RSpec.describe Spree::Admin::ReturnAuthorizationsController doexpect(response).to redirect_to(spree.edit_admin_order_path(return_authorization.order))endend-- describe '#collection' do- let!(:return_authorizations) do- [- create(:return_authorization, order: order, created_at: 3.days.ago),- create(:return_authorization, order: order, created_at: 1.hour.ago),- create(:return_authorization, order: order, created_at: 10.minutes.ago)- ]- end-- let(:return_authorization) { create(:return_authorization, order: order, created_at: 1.week.ago) }-- before do- # Create one for a different store to test store filtering- other_store = create(:store)- create(:return_authorization, order: create(:shipped_order, store: other_store))- end-- it 'returns return authorizations for the current store' do- # Call the private method directly- collection = controller.send(:collection)-- expect(collection.count).to eq 4 # 3 created above + 1 from let- expect(collection.all? { |ra| ra.order.store == @default_store }).to be true- end-- it 'orders by created_at desc' do- # Call the private method directly- collection = controller.send(:collection)-- expect(collection).to eq [*return_authorizations.reverse, return_authorization]- end-- it 'paginates the results' do- allow(controller).to receive(:params).and_return({ per_page: '2', page: '1' })-- # Call the private method directly- collection = controller.send(:collection)-- expect(collection.limit_value).to eq 2- expect(collection.current_page).to eq 1- end- endenddiff --git a/admin/spec/controllers/spree/admin/store_credits_controller_spec.rb b/admin/spec/controllers/spree/admin/store_credits_controller_spec.rbindex ae334daa8e..ba0042d4df 100644--- a/admin/spec/controllers/spree/admin/store_credits_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/store_credits_controller_spec.rb@@ -20,7 +20,7 @@ RSpec.describe Spree::Admin::StoreCreditsController, type: :controller doexpect(response).to be_successfulexpect(response).to render_template(:index)- expect(assigns(:store_credits)).to contain_exactly(*store_credits)+ expect(assigns(:collection)).to contain_exactly(*store_credits)endend