pagy v9 compatibility, backwards compatible (#3046)

* pagy v9 compatibility, backwards compatible issue: #3014 pagy upgrade docs: https://ddnexus.github.io/pagy/changelog/#version-900 * do not force pagy v9 upgrade * Update paginator_component.rb * lint * lint * add per page --------- Co-authored-by: Paul Bob <[email protected]>
avo-hq · Jul 24, 2024 · 6af4f0e · 6af4f0e
1 parent 723c8b6
commit 6af4f0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/components/avo/paginator_component.rb b/app/components/avo/paginator_component.rb
@@ -28,7 +28,11 @@ def change_items_per_page_url(option)
   def render?
     return false if discreet_pagination && pagy.pages <= 1
 
-    @pagy.items > 0
+    if defined?(@pagy.limit)
+      @pagy.limit > 0
+    else
+      @pagy.items > 0
+    end
   end
 
   def per_page_options

diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb
@@ -1,5 +1,6 @@
 require "pagy/extras/trim"
 require "pagy/extras/countless"
+require "pagy/extras/size"
 
 # For locales without native pagy i18n support
 def pagy_locale_path(file_name)

diff --git a/lib/avo/concerns/pagination.rb b/lib/avo/concerns/pagination.rb
@@ -39,7 +39,8 @@ def apply_pagination(index_params:, query:)
 
         send PAGINATION_METHOD[pagination_type.to_sym],
           query,
-          items: index_params[:per_page],
+          items: index_params[:per_page], # Add per page in pagy < 9
+          limit: index_params[:per_page], # Add per page in pagy >= 9
           link_extra: data_turbo_frame, # Add extra arguments in pagy 7.
           anchor_string: data_turbo_frame, # Add extra arguments in pagy 8.
           params: extra_pagy_params,