diff --git a/lib/plausible/site.ex b/lib/plausible/site.ex index 119d9c4f8..93a966f18 100644 --- a/lib/plausible/site.ex +++ b/lib/plausible/site.ex @@ -49,6 +49,9 @@ defmodule Plausible.Site do # strictly necessary. field :from_cache?, :boolean, virtual: true, default: false + field :list_type, :string, virtual: true + field :is_pinned, :boolean, virtual: true + timestamps() end diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 992c4909c..21b1214f1 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -14,25 +14,77 @@ defmodule Plausible.Sites do @spec list(Plausible.Auth.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) - sites_query = + base_query = from(s in Plausible.Site, - join: sm in Plausible.Site.Membership, + left_join: sm in Plausible.Site.Membership, on: sm.site_id == s.id, - where: sm.user_id == ^user.id, - where: s.id not in ^exclude_ids, - order_by: s.domain, - preload: [memberships: sm] + left_join: i in Plausible.Auth.Invitation, + on: i.site_id == s.id, + left_join: p in Plausible.Site.SitePin, + on: p.site_id == s.id, + where: sm.user_id == ^user.id or i.email == ^user.email or p.user_id == ^user.id, + select: %{ + s + | is_pinned: not is_nil(p.id), + list_type: + fragment( + """ + CASE WHEN ? IS NOT NULL THEN 'invitation' + ELSE 'site' + END + """, + i.id + ) + } + ) + + memberships_query = + from sm in Plausible.Site.Membership, + where: sm.user_id == ^user.id + + invitations_query = + from i in Plausible.Auth.Invitation, + where: i.email == ^user.email + + sites_query = + from(s in subquery(base_query), + order_by: [desc: s.is_pinned, asc: s.list_type, asc: s.domain], + preload: [ + memberships: ^memberships_query, + invitations: ^invitations_query + ] ) |> maybe_filter_by_domain(domain_filter) - Plausible.Pagination.paginate(sites_query, pagination_params, - include_total_count: true, - cursor_fields: [{:domain, :asc}], - limit: 24 - ) + total_count = + sites_query + |> Ecto.Query.exclude(:preload) + |> Ecto.Query.exclude(:order_by) + |> Ecto.Query.exclude(:select) + |> Repo.aggregate(:count) + + result = + Plausible.Pagination.paginate(sites_query, pagination_params, + cursor_fields: [is_pinned: :desc, list_type: :asc, domain: :asc], + limit: 24 + ) + + metadata = %{result.metadata | total_count: total_count} + + entries = + Enum.map(result.entries, fn + %{invitations: [invitation]} = site -> + site = %{site | invitations: [], memberships: []} + invitation = %{invitation | site: site} + %{site | invitations: [invitation]} + + site -> + site + end) + + %{result | entries: entries, metadata: metadata} end defp maybe_filter_by_domain(query, domain) diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index facdac79a..70485b0c5 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -11,7 +11,6 @@ defmodule PlausibleWeb.Live.Sites do alias Plausible.Auth alias Plausible.Repo - alias Plausible.Site.Memberships.Invitations alias Plausible.Sites def mount(params, %{"current_user_id" => user_id}, socket) do @@ -29,12 +28,11 @@ defmodule PlausibleWeb.Live.Sites do |> assign_new(:has_sites?, fn %{sites: sites} -> Enum.count(sites.entries) > 0 end) - |> assign_new(:invitation_count, fn %{invitations_pre: invitations} -> - Enum.count(invitations) - end) |> assign_new(:needs_to_upgrade, fn %{user: user, sites: sites} -> user_owns_sites = - Enum.any?(sites.entries, fn site -> List.first(site.memberships).role == :owner end) || + Enum.any?(sites.entries, fn site -> + List.first(site.memberships ++ site.invitations).role == :owner + end) || Auth.user_owns_sites?(user) user_owns_sites && Plausible.Billing.check_needs_to_upgrade(user) @@ -44,6 +42,13 @@ defmodule PlausibleWeb.Live.Sites do end def render(assigns) do + invitations = + assigns.sites.entries + |> Enum.filter(&(&1.list_type == "invitation")) + |> Enum.flat_map(& &1.invitations) + + assigns = assign(assigns, :invitations, invitations) + ~H"""
Enum.into(%{}) |> Jason.encode!}}"} @@ -73,23 +78,28 @@ defmodule PlausibleWeb.Live.Sites do
<.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) - + Total of <%= @sites.metadata.total_count %> sites - <.invitation_modal :if={not Enum.empty?(@invitations)} user={@user} /> + <.invitation_modal + :if={not Enum.any?(@sites.entries, &(&1.list_type == "invitation"))} + user={@user} + />
""" @@ -133,6 +143,7 @@ defmodule PlausibleWeb.Live.Sites do """ end + attr :site, Plausible.Site, required: true attr :invitation, Plausible.Auth.Invitation, required: true attr :hourly_stats, :map, required: true @@ -145,13 +156,13 @@ defmodule PlausibleWeb.Live.Sites do
  • - <%= @invitation.site.domain %> + <%= @site.domain %>

    @@ -422,33 +433,17 @@ defmodule PlausibleWeb.Live.Sites do &assign_new/3 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 + socket + |> assign_fn.(:sites, fn %{ + user: user, + params: params, + filter_text: filter_text + } -> + Sites.list(user, params, filter_by_domain: filter_text) + end) + |> assign_fn.(:hourly_stats, fn %{sites: sites} -> + Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites.entries) + end) end defp set_filter_text(socket, filter_text) do