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
Replace `geared_pagination` with kaminari
Damian Legawiece331d62f8028
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rbindex 353ce652aa..eacf5efc7a 100644--- a/storefront/app/controllers/spree/store_controller.rb+++ b/storefront/app/controllers/spree/store_controller.rb@@ -152,10 +152,11 @@ module Spreeexecute.includes(storefront_products_includes)- default_per_page = ENV.fetch('STOREFRONT_PRODUCTS_PER_PAGE', '20,40').split(',').map(&:to_i)+ default_per_page = Spree::Storefront::Config[:products_per_page]per_page = params[:per_page].present? ? params[:per_page].to_i : default_per_page+ page = params[:page].present? ? params[:page].to_i : 1- GearedPagination::Recordset.new(products, per_page: per_page).page(params[:page] || 1)+ products.page(page).per(per_page)endenddiff --git a/storefront/app/views/themes/default/spree/products/_show_more_button.html.erb b/storefront/app/views/themes/default/spree/products/_show_more_button.html.erbindex 17166295e4..aa2a70f50f 100644--- a/storefront/app/views/themes/default/spree/products/_show_more_button.html.erb+++ b/storefront/app/views/themes/default/spree/products/_show_more_button.html.erb@@ -1,8 +1,8 @@-<% unless storefront_products.last? %>- <%= turbo_frame_tag "next_page", src: url_for(params.to_unsafe_h.merge(page: storefront_products.next_param, format: :turbo_stream)), class: "block relative w-full", data: { controller: "infinite-scroll", infinite_scroll_offset_value: "1350px" }, loading: "lazy" do %>+<% unless storefront_products.last_page? %>+ <%= turbo_frame_tag "next_page", src: url_for(params.to_unsafe_h.merge(page: storefront_products.next_page, format: :turbo_stream)), class: "block relative w-full", data: { controller: "infinite-scroll", infinite_scroll_offset_value: "1350px" }, loading: "lazy" do %><span class="flex justify-center gap-2 items-center py-4 left-0 w-full h-full"><%= render 'spree/shared/icons/spinner' %><%= Spree.t(:loading) %>...</span><% end %>-<% end %>\ No newline at end of file+<% end %>diff --git a/storefront/lib/geared_pagination/recordset_decorator.rb b/storefront/lib/geared_pagination/recordset_decorator.rbdeleted file mode 100644index 2fd8457795..0000000000--- a/storefront/lib/geared_pagination/recordset_decorator.rb+++ /dev/null@@ -1,13 +0,0 @@-# TODO: Remove this file when this issue is resolved:-# https://github.com/basecamp/geared_pagination/issues/8-module GearedPagination- module RecordsetDecorator- def records_count- return @records_count if defined?(@records_count)-- @records_count ||= records.unscope(:limit).unscope(:offset).unscope(:select).unscope(:order).unscope(:group).unscope(:includes).size- end- end-- Recordset.prepend(RecordsetDecorator)-enddiff --git a/storefront/lib/spree/storefront.rb b/storefront/lib/spree/storefront.rbindex 55a593df89..f49d1c3213 100644--- a/storefront/lib/spree/storefront.rb+++ b/storefront/lib/spree/storefront.rb@@ -5,7 +5,6 @@ require 'sprockets/railtie'require 'active_link_to'require 'canonical-rails'-require 'geared_pagination'require 'heroicon'require 'importmap-rails'require 'inline_svg'diff --git a/storefront/lib/spree/storefront/configuration.rb b/storefront/lib/spree/storefront/configuration.rbindex 33968da523..07d46870dd 100644--- a/storefront/lib/spree/storefront/configuration.rb+++ b/storefront/lib/spree/storefront/configuration.rb@@ -3,6 +3,8 @@ require 'spree/core/preferences/runtime_configuration'module Spreemodule Storefrontclass Configuration < ::Spree::Preferences::RuntimeConfiguration+ preference :products_per_page, :integer, default: 20+endendenddiff --git a/storefront/lib/spree_storefront.rb b/storefront/lib/spree_storefront.rbindex d0410c7e2f..a1997cffb3 100644--- a/storefront/lib/spree_storefront.rb+++ b/storefront/lib/spree_storefront.rb@@ -1,2 +1 @@require 'spree/storefront'-require 'geared_pagination/recordset_decorator'diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspecindex 20325c392c..69785f87cb 100644--- a/storefront/spree_storefront.gemspec+++ b/storefront/spree_storefront.gemspec@@ -1,6 +1,4 @@-# encoding: UTF-8--require_relative '../core/lib/spree/core/version.rb'+require_relative '../core/lib/spree/core/version'Gem::Specification.new do |s|s.platform = Gem::Platform::RUBY@@ -14,27 +12,26 @@ Gem::Specification.new do |s|s.license = 'AGPL-3.0-or-later's.metadata = {- "bug_tracker_uri" => "https://github.com/spree/spree/issues",- "changelog_uri" => "https://github.com/spree/spree/releases/tag/v#{s.version}",- "documentation_uri" => "https://docs.spreecommerce.org/",- "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",+ 'bug_tracker_uri' => 'https://github.com/spree/spree/issues',+ 'changelog_uri' => "https://github.com/spree/spree/releases/tag/v#{s.version}",+ 'documentation_uri' => 'https://docs.spreecommerce.org/',+ 'source_code_uri' => "https://github.com/spree/spree/tree/v#{s.version}",}s.required_ruby_version = '>= 3.0's.required_rubygems_version = '>= 1.8.23'- s.files = Dir["{app,config,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }+ s.files = Dir['{app,config,lib}/**/*', 'LICENSE.md', 'Rakefile'].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }s.require_path = 'lib'- s.add_dependency 'spree_core', ">= #{s.version}"s.add_dependency 'spree_api', ">= #{s.version}"+ s.add_dependency 'spree_core', ">= #{s.version}"s.add_dependency 'active_link_to's.add_dependency 'canonical-rails', '~> 0.2.14's.add_dependency 'heroicon's.add_dependency 'importmap-rails's.add_dependency 'inline_svg', '~> 1.5'- s.add_dependency 'geared_pagination's.add_dependency 'local_time', '~> 3.0's.add_dependency 'mail_form's.add_dependency 'payment_icons'