diff --git a/lib/plausible/pagination.ex b/lib/plausible/pagination.ex index d70db7a3d..730086d33 100644 --- a/lib/plausible/pagination.ex +++ b/lib/plausible/pagination.ex @@ -34,6 +34,9 @@ defmodule Plausible.Pagination do else acc end + + _, acc -> + acc end) end diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index e40a08e0a..b9012ce33 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -12,7 +12,7 @@ defmodule Plausible.Sites do Repo.get_by!(Site, domain: domain) end - @spec list(User.t(), map(), [list_opt()]) :: %{entries: [Site.t()], pagination: map()} + @spec list(User.t(), map(), [list_opt()]) :: Paginator.Page.t() def list(user, pagination_params, opts \\ []) do exclude_ids = Keyword.get(opts, :exclude_ids, []) domain_filter = Keyword.get(opts, :filter_by_domain) @@ -28,10 +28,11 @@ defmodule Plausible.Sites do ) |> maybe_filter_by_domain(domain_filter) - {sites, pagination} = - Repo.paginate(sites_query, pagination_params) - - %{entries: sites, pagination: pagination} + Plausible.Pagination.paginate(sites_query, pagination_params, + include_total_count: true, + cursor_fields: [{:domain, :asc}], + limit: 1 + ) end defp maybe_filter_by_domain(query, domain) diff --git a/lib/plausible_web/live/components/pagination.ex b/lib/plausible_web/live/components/pagination.ex new file mode 100644 index 000000000..ed66bb2d9 --- /dev/null +++ b/lib/plausible_web/live/components/pagination.ex @@ -0,0 +1,54 @@ +defmodule PlausibleWeb.Live.Components.Pagination do + @moduledoc """ + Pagination components for LiveViews. + """ + use Phoenix.Component + + def pagination(assigns) do + ~H""" + + """ + end + + defp pagination_link(assigns) do + {field, cursor} = assigns.cursor + params = URI.decode_query(assigns.uri.query, %{field => cursor}) + uri = %{assigns.uri | query: URI.encode_query(params)} + + assigns = assign(assigns, :uri, uri) + + ~H""" + + <%= @label %> + + """ + end +end diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 0e89d5a70..c096427ce 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -7,6 +7,7 @@ defmodule PlausibleWeb.Live.Sites do use Phoenix.HTML import PlausibleWeb.Components.Generic + import PlausibleWeb.Live.Components.Pagination alias Plausible.Auth alias Plausible.Repo @@ -14,9 +15,14 @@ defmodule PlausibleWeb.Live.Sites do alias Plausible.Sites def mount(params, %{"current_user_id" => user_id}, socket) do + uri = + ("/sites_new?" <> URI.encode_query(Map.take(params, ["filter_text"]))) + |> URI.new!() + socket = socket - |> assign_new(:filter_text, fn -> "" end) + |> assign(:uri, uri) + |> assign_new(:filter_text, fn -> params["filter_text"] || "" end) |> assign_new(:params, fn -> params end) |> assign_new(:user, fn -> Repo.get!(Auth.User, user_id) end) |> load_sites() @@ -63,6 +69,14 @@ defmodule PlausibleWeb.Live.Sites do <% end %> + <.pagination + :if={@sites.metadata.before || @sites.metadata.after} + uri={@uri} + subject="sites" + page={@sites} + extra_count={length(@invitations)} + /> + <.invitation_modal :if={not Enum.empty?(@invitations)} user={@user} /> """ @@ -401,23 +415,32 @@ defmodule PlausibleWeb.Live.Sites do &assign_new/3 end - socket - |> assign_fn.(:invitations, fn %{filter_text: filter_text, user: user} -> - Invitations.list_for_email(user.email, filter_by_domain: filter_text) - end) - |> assign_fn.(:sites, fn %{ - user: user, - params: params, - invitations: invitations, - filter_text: filter_text - } -> - excluded_site_ids = Enum.map(invitations, & &1.site_id) - Sites.list(user, params, exclude_ids: excluded_site_ids, filter_by_domain: filter_text) - end) - |> assign_fn.(:hourly_stats, fn %{sites: sites, invitations: invitations} -> - Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals( - sites.entries ++ Enum.map(invitations, & &1.site) - ) - end) + socket = + socket + |> assign_fn.(:invitations_pre, fn %{filter_text: filter_text, user: user} -> + Invitations.list_for_email(user.email, filter_by_domain: filter_text) + end) + |> assign_fn.(:sites, fn %{ + user: user, + params: params, + invitations_pre: invitations, + filter_text: filter_text + } -> + excluded_site_ids = Enum.map(invitations, & &1.site_id) + Sites.list(user, params, exclude_ids: excluded_site_ids, filter_by_domain: filter_text) + end) + |> assign_fn.(:hourly_stats, fn %{sites: sites, invitations_pre: invitations} -> + Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals( + sites.entries ++ Enum.map(invitations, & &1.site) + ) + end) + + first_page? = is_nil(socket.assigns.sites.metadata.before) + + if first_page? do + assign(socket, :invitations, socket.assigns.invitations_pre) + else + assign(socket, :invitations, []) + end end end