diff --git a/lib/plausible_web/live/components/pagination.ex b/lib/plausible_web/live/components/pagination.ex
index ed66bb2d9..eeff6802a 100644
--- a/lib/plausible_web/live/components/pagination.ex
+++ b/lib/plausible_web/live/components/pagination.ex
@@ -12,24 +12,12 @@ defmodule PlausibleWeb.Live.Components.Pagination do
>
- Showing <%= Enum.count(@page.entries) + @extra_count %>
- of <%= @page.metadata.total_count + @extra_count %>
- <%= @subject %> total
+ <%= render_slot(@inner_block) %>
- <.pagination_link
- :if={@page.metadata.before != nil}
- uri={@uri}
- cursor={{"before", @page.metadata.before}}
- label="← Previous"
- />
- <.pagination_link
- :if={@page.metadata.after != nil}
- uri={@uri}
- cursor={{"after", @page.metadata.after}}
- label="Next →"
- />
+ <.pagination_link uri={@uri} cursor={{"before", @page.metadata.before}} label="← Previous" />
+ <.pagination_link uri={@uri} cursor={{"after", @page.metadata.after}} label="Next →" />
"""
@@ -37,15 +25,23 @@ defmodule PlausibleWeb.Live.Components.Pagination do
defp pagination_link(assigns) do
{field, cursor} = assigns.cursor
+ active? = not is_nil(cursor)
params = URI.decode_query(assigns.uri.query, %{field => cursor})
uri = %{assigns.uri | query: URI.encode_query(params)}
- assigns = assign(assigns, :uri, uri)
+ assigns = assign(assigns, uri: active? && uri, active?: active?)
~H"""
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 1e3b2b326..e9c020e9e 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -38,6 +38,8 @@ defmodule PlausibleWeb.Live.Sites do
end
def render(assigns) do
+ assigns = assign(assigns, :invitation_count, Enum.count(assigns.invitations))
+
~H"""
Enum.into(%{}) |> Jason.encode!}}"}
@@ -69,13 +71,12 @@ defmodule PlausibleWeb.Live.Sites do
<% end %>
- <.pagination
- :if={@sites.metadata.before || @sites.metadata.after}
- uri={@uri}
- subject="sites"
- page={@sites}
- extra_count={length(@invitations)}
- />
+ <.pagination :if={@sites.metadata.before || @sites.metadata.after} uri={@uri} page={@sites}>
+ Total of <%= @sites.metadata.total_count %>
+ sites
+ 0} class="font-medium"> (+ <%= @invitation_count %> invitations)
+
+
<.invitation_modal :if={not Enum.empty?(@invitations)} user={@user} />