From 3202d0ea815323fdad8de16de7cc0f14cf09b4dd Mon Sep 17 00:00:00 2001 From: piyush828-design Date: Wed, 16 Apr 2025 17:45:39 +0530 Subject: [PATCH] fixed test failure --- app/controllers/admin/products_v3_controller.rb | 2 +- app/controllers/api/v0/exchange_products_controller.rb | 2 +- app/controllers/api/v0/orders_controller.rb | 2 +- app/controllers/api/v0/products_controller.rb | 2 +- app/controllers/spree/admin/orders_controller.rb | 2 +- app/controllers/spree/admin/users_controller.rb | 2 +- app/controllers/spree/admin/zones_controller.rb | 2 +- app/services/products_renderer.rb | 3 +-- app/views/admin/products_v3/_sort.html.haml | 2 +- config/initializers/pagy.rb | 1 + 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/products_v3_controller.rb b/app/controllers/admin/products_v3_controller.rb index e06ff5ebb9..43da0a2c10 100644 --- a/app/controllers/admin/products_v3_controller.rb +++ b/app/controllers/admin/products_v3_controller.rb @@ -138,7 +138,7 @@ module Admin def fetch_products product_query = OpenFoodNetwork::Permissions.new(spree_current_user) .editable_products.merge(product_scope).ransack(ransack_query).result - @pagy, @products = pagy(product_query.order(:name), items: @per_page, page: @page, + @pagy, @products = pagy(product_query.order(:name), limit: @per_page, page: @page, size: [1, 2, 2, 1]) end diff --git a/app/controllers/api/v0/exchange_products_controller.rb b/app/controllers/api/v0/exchange_products_controller.rb index 8b16fdbdd4..25586088b2 100644 --- a/app/controllers/api/v0/exchange_products_controller.rb +++ b/app/controllers/api/v0/exchange_products_controller.rb @@ -77,7 +77,7 @@ module Api if pagination_required? @pagy, results = pagy(results, - items: params[:per_page] || DEFAULT_PER_PAGE) + limit: params[:per_page] || DEFAULT_PER_PAGE) end serialized_products = ActiveModel::ArraySerializer.new( diff --git a/app/controllers/api/v0/orders_controller.rb b/app/controllers/api/v0/orders_controller.rb index 2ffb4304b3..fd1938a85d 100644 --- a/app/controllers/api/v0/orders_controller.rb +++ b/app/controllers/api/v0/orders_controller.rb @@ -12,7 +12,7 @@ module Api if pagination_required? @pagy, orders = pagy(orders, - items: params[:per_page] || default_per_page) + limit: params[:per_page] || default_per_page) end render json: { diff --git a/app/controllers/api/v0/products_controller.rb b/app/controllers/api/v0/products_controller.rb index 801b6a343a..6f95e1e64e 100644 --- a/app/controllers/api/v0/products_controller.rb +++ b/app/controllers/api/v0/products_controller.rb @@ -78,7 +78,7 @@ module Api end def render_paged_products(products, product_serializer = ::Api::Admin::ProductSerializer) - @pagy, products = pagy(products, items: params[:per_page] || DEFAULT_PER_PAGE) + @pagy, products = pagy(products, limit: params[:per_page] || DEFAULT_PER_PAGE) serialized_products = ActiveModel::ArraySerializer.new( products, diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 286929728d..c5f80d799c 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -17,7 +17,7 @@ module Spree def index orders = SearchOrders.new(search_params, spree_current_user).orders - @pagy, @orders = pagy(orders, items: params[:per_page] || 15) + @pagy, @orders = pagy(orders, limit: params[:per_page] || 15) update_search_results if searching? end diff --git a/app/controllers/spree/admin/users_controller.rb b/app/controllers/spree/admin/users_controller.rb index 00fd64e8a9..236bf66f96 100644 --- a/app/controllers/spree/admin/users_controller.rb +++ b/app/controllers/spree/admin/users_controller.rb @@ -60,7 +60,7 @@ module Spree limit(params[:limit] || 100) else @search = Spree::User.ransack(params[:q]) - @pagy, @collection = pagy(@search.result, items: Spree::Config[:admin_products_per_page]) + @pagy, @collection = pagy(@search.result, limit: Spree::Config[:admin_products_per_page]) @collection end end diff --git a/app/controllers/spree/admin/zones_controller.rb b/app/controllers/spree/admin/zones_controller.rb index 680f4d1a07..8af0181dc4 100644 --- a/app/controllers/spree/admin/zones_controller.rb +++ b/app/controllers/spree/admin/zones_controller.rb @@ -15,7 +15,7 @@ module Spree params[:q] ||= {} params[:q][:s] ||= "name asc" @search = super.ransack(params[:q]) - @pagy, @zones = pagy(@search.result, items: Spree::Config[:orders_per_page]) + @pagy, @zones = pagy(@search.result, limit: Spree::Config[:orders_per_page]) @zones end diff --git a/app/services/products_renderer.rb b/app/services/products_renderer.rb index 12ccbb19f8..d12d92ffde 100644 --- a/app/services/products_renderer.rb +++ b/app/services/products_renderer.rb @@ -39,7 +39,6 @@ class ProductsRenderer else distributed_products.products_relation end - results = filter(results) # Scope results with variant_overrides paginate(results).each { |product| product_scoper.scope(product) } @@ -100,7 +99,7 @@ class ProductsRenderer _pagy, paginated_results = pagy_array( results, page: args[:page] || 1, - items: args[:per_page] || DEFAULT_PER_PAGE + limit: args[:per_page] || DEFAULT_PER_PAGE ) paginated_results diff --git a/app/views/admin/products_v3/_sort.html.haml b/app/views/admin/products_v3/_sort.html.haml index 48e5637b45..17ae19e202 100644 --- a/app/views/admin/products_v3/_sort.html.haml +++ b/app/views/admin/products_v3/_sort.html.haml @@ -10,7 +10,7 @@ %form.with-dropdown = t(".pagination.per_page.show") = select_tag :per_page, - options_for_select([15, 25, 50, 100].collect{|i| [t('.pagination.per_page.per_page', num: i), i]}, pagy&.items), + options_for_select([15, 25, 50, 100].collect{|i| [t('.pagination.per_page.per_page', num: i), i]}, pagy&.limit), class: "no-input per-page", data: { controller: "tom-select search", action: "change->search#changePerPage", "tom-select-options-value": '{ "plugins": [] }'} diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index 2aacb32007..f3a7e13c62 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -4,6 +4,7 @@ require 'pagy/extras/arel' require 'pagy/extras/array' require 'pagy/extras/limit' require 'pagy/extras/overflow' +require 'pagy/extras/size' # Pagy Variables # See https://ddnexus.github.io/pagy/api/pagy#variables