fix: pagy 9 support (#3090)

* fix: pagy 9 support * fix: pagy 9 support * fix test
avo-hq · Aug 2, 2024 · bc0c2f6 · bc0c2f6
1 parent a763f23
commit bc0c2f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -421,7 +421,7 @@ GEM
     nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (8.6.3)
+    pagy (9.0.5)
     parallel (1.25.1)
     parser (3.3.4.0)
       ast (~> 2.4.1)

diff --git a/app/components/avo/paginator_component.rb b/app/components/avo/paginator_component.rb
@@ -28,7 +28,7 @@ def change_items_per_page_url(option)
   def render?
     return false if discreet_pagination && pagy.pages <= 1
 
-    if ::Pagy::VERSION > ::Gem::Version.new("9.0")
+    if ::Pagy::VERSION >= ::Gem::Version.new("9.0")
       @pagy.limit > 0
     else
       @pagy.items > 0

diff --git a/app/components/avo/views/resource_index_component.html.erb b/app/components/avo/views/resource_index_component.html.erb
@@ -78,7 +78,7 @@
       <% end %>
       <% if view_type.to_sym == :table || view_type.to_sym == :map %>
         <% if @records.present? %>
-          <div class="mt-4">
+          <div class="mt-4 w-full">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: turbo_frame || "none", index_params: @index_params, resource: @resource, parent_record: parent_record, discreet_pagination: field&.discreet_pagination %>
           </div>
         <% end %>

diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb
@@ -1,6 +1,6 @@
 require "pagy/extras/trim"
 require "pagy/extras/countless"
-if ::Pagy::VERSION > ::Gem::Version.new("9.0")
+if ::Pagy::VERSION >= ::Gem::Version.new("9.0")
   require "pagy/extras/size"
 end
 

diff --git a/spec/system/avo/filters/filters_spec.rb b/spec/system/avo/filters/filters_spec.rb
@@ -342,10 +342,8 @@
         wait_for_loaded
         check "Featured"
 
-        expect(page).to have_css "[data-turbo-frame][aria-label='Next']"
-        # expect to have the previous link disabled (no turbo-frame attached)
-        expect(page).to have_css "[data-turbo-frame][aria-label='Previous']"
-        expect(page).not_to have_css "[data-turbo-frame][aria-label='Previous']"
+        expect(page).to have_css "[aria-label='Next']"
+        expect(page).to have_css "[aria-label='Previous']"
 
         expect(find(".current")).to have_text "1"
         expect(find(".current")).not_to have_text "2"