fix: ensure next page is detected for offset pages w/ more?: true

ash-project · Dec 19, 2023 · 78b80b3 · 78b80b3
1 parent 0026d16
commit 78b80b3
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/lib/ash_phoenix/live_view.ex b/lib/ash_phoenix/live_view.ex
@@ -299,6 +299,10 @@ defmodule AshPhoenix.LiveView do
 
   def page_link_params(%Ash.Page.Offset{more?: false}, "next"), do: :invalid
 
+  def page_link_params(%Ash.Page.Offset{more?: true} = offset, "next") do
+    [limit: offset.limit, offset: (offset.offset || 0) + offset.limit]
+  end
+
   def page_link_params(%Ash.Page.Keyset{more?: false, after: nil, before: before}, "prev")
       when not is_nil(before) do
     :invalid
@@ -309,19 +313,6 @@ defmodule AshPhoenix.LiveView do
     :invalid
   end
 
-  def page_link_params(%Ash.Page.Offset{} = offset, "next") do
-    cond do
-      offset.count && offset.offset + offset.limit >= offset.count ->
-        :invalid
-
-      Enum.count(offset.results) < offset.limit ->
-        :invalid
-
-      true ->
-        [limit: offset.limit, offset: (offset.offset || 0) + offset.limit]
-    end
-  end
-
   def page_link_params(%Ash.Page.Offset{offset: 0}, "prev") do
     :invalid
   end