Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Move invitations away from site cards (#6053)

Adam Rutkowski5a839876a4da
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex
index 98b0ffb709..7754a05c27 100644
--- a/lib/plausible/sites.ex
+++ b/lib/plausible/sites.ex
@@ -136,9 +136,6 @@ defmodule Plausible.Sites do
defdelegate list(user, pagination_params, opts \\ []), to: Plausible.Teams.Sites
- defdelegate list_with_invitations(user, pagination_params, opts \\ []),
- to: Plausible.Teams.Sites
-
def list_people(site) do
owner_memberships =
from(
diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.ex
index 8718adb9c6..53f1846d80 100644
--- a/lib/plausible/teams/invitations.ex
+++ b/lib/plausible/teams/invitations.ex
@@ -59,7 +59,8 @@ defmodule Plausible.Teams.Invitations do
end
end
- def all(%Teams.Team{} = team) do
+ @spec pending_team_invitations_for(Auth.User.t() | Teams.Team.t()) :: [Teams.Invitation.t()]
+ def pending_team_invitations_for(%Teams.Team{} = team) do
Repo.all(
from ti in Teams.Invitation,
inner_join: inviter in assoc(ti, :inviter),
@@ -68,7 +69,7 @@ defmodule Plausible.Teams.Invitations do
)
end
- def all(%Plausible.Auth.User{} = user) do
+ def pending_team_invitations_for(%Plausible.Auth.User{} = user) do
Repo.all(
from ti in Teams.Invitation,
inner_join: inviter in assoc(ti, :inviter),
@@ -79,6 +80,42 @@ defmodule Plausible.Teams.Invitations do
)
end
+ @spec pending_guest_invitations_for(Auth.User.t()) :: [Teams.GuestInvitation.t()]
+ def pending_guest_invitations_for(%Plausible.Auth.User{} = user) do
+ Repo.all(
+ from gi in Teams.GuestInvitation,
+ inner_join: ti in assoc(gi, :team_invitation),
+ as: :team_invitation,
+ inner_join: inviter in assoc(ti, :inviter),
+ inner_join: s in assoc(gi, :site),
+ as: :site,
+ where: ti.email == ^user.email,
+ where:
+ not exists(
+ from tm in Teams.Membership,
+ inner_join: u in assoc(tm, :user),
+ left_join: gm in assoc(tm, :guest_memberships),
+ on: gm.site_id == parent_as(:site).id,
+ where: tm.team_id == parent_as(:team_invitation).team_id,
+ where: u.email == ^user.email,
+ where: not is_nil(gm.id) or tm.role != :guest,
+ select: 1
+ ),
+ preload: [site: s, team_invitation: {ti, inviter: inviter}]
+ )
+ end
+
+ @spec pending_site_transfers_for(Auth.User.t()) :: [Teams.SiteTransfer.t()]
+ def pending_site_transfers_for(%Plausible.Auth.User{} = user) do
+ Repo.all(
+ from st in Teams.SiteTransfer,
+ inner_join: s in assoc(st, :site),
+ inner_join: initiator in assoc(st, :initiator),
+ where: st.email == ^user.email,
+ preload: [site: s, initiator: initiator]
+ )
+ end
+
defp find_team_invitation_for_user(team_invitation_id, user) do
invitation_query =
from ti in Teams.Invitation,
diff --git a/lib/plausible/teams/management/layout.ex b/lib/plausible/teams/management/layout.ex
index 50de227cc0..e67abe7160 100644
--- a/lib/plausible/teams/management/layout.ex
+++ b/lib/plausible/teams/management/layout.ex
@@ -15,7 +15,7 @@ defmodule Plausible.Teams.Management.Layout do
@spec init(Teams.Team.t()) :: t()
def init(%Teams.Team{} = team) do
- invitations_sent = Teams.Invitations.all(team)
+ invitations_sent = Teams.Invitations.pending_team_invitations_for(team)
all_members = Teams.Memberships.all(team)
build_by_email(invitations_sent ++ all_members)
end
diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.ex
index 552b3ceca3..3ffe7136e9 100644
--- a/lib/plausible/teams/sites.ex
+++ b/lib/plausible/teams/sites.ex
@@ -10,6 +10,8 @@ defmodule Plausible.Teams.Sites do
@type list_opt() :: {:filter_by_domain, String.t()} | {:team, Teams.Team.t() | nil}
+ @role_type Plausible.Teams.Invitation.__schema__(:type, :role)
+
@spec list(Auth.User.t(), map(), [list_opt()]) :: Scrivener.Page.t()
def list(user, pagination_params, opts \\ []) do
domain_filter = Keyword.get(opts, :filter_by_domain)
@@ -22,7 +24,7 @@ defmodule Plausible.Teams.Sites do
inner_join: s in assoc(t, :sites),
where: tm.user_id == ^user.id and tm.role != :guest,
where: tm.team_id == ^team.id,
- select: %{site_id: s.id, entry_type: "site"}
+ select: %{site_id: s.id, entry_type: "site", role: tm.role}
)
else
my_team_query =
@@ -32,7 +34,7 @@ defmodule Plausible.Teams.Sites do
where: tm.user_id == ^user.id and tm.role != :guest,
where: tm.is_autocreated == true,
where: t.setup_complete == false,
- select: %{site_id: s.id, entry_type: "site"}
+ select: %{site_id: s.id, entry_type: "site", role: tm.role}
)
guest_membership_query =
@@ -40,7 +42,21 @@ defmodule Plausible.Teams.Sites do
inner_join: gm in assoc(tm, :guest_memberships),
inner_join: s in assoc(gm, :site),
where: tm.user_id == ^user.id and tm.role == :guest,
- select: %{site_id: s.id, entry_type: "site"}
+ select: %{
+ site_id: s.id,
+ entry_type: "site",
+ role:
+ fragment(
+ """
+ CASE
+ WHEN ? = 'editor' THEN 'admin'
+ ELSE ?
+ END
+ """,
+ gm.role,
+ gm.role
+ )
+ }
from s in my_team_query,
union_all: ^guest_membership_query
@@ -68,64 +84,6 @@ defmodule Plausible.Teams.Sites do
),
:entry_type
),
- pinned_at: selected_as(up.pinned_at, :pinned_at)
- },
- order_by: [
- asc: selected_as(:entry_type),
- desc: selected_as(:pinned_at),
- asc: s.domain
- ]
- )
- |> maybe_filter_by_domain(domain_filter)
- |> Repo.paginate(pagination_params)
- end
-
- @role_type Plausible.Teams.Invitation.__schema__(:type, :role)
-
- @spec list_with_invitations(Auth.User.t(), map(), [list_opt()]) :: Scrivener.Page.t()
- def list_with_invitations(user, pagination_params, opts \\ []) do
- domain_filter = Keyword.get(opts, :filter_by_domain)
- team = Keyword.get(opts, :team)
-
- union_query =
- if Teams.setup?(team) do
- list_with_invitations_setup_query(team, user)
- else
- list_with_invitations_personal_query(team, user)
- end
-
- from(u in subquery(union_query),
- inner_join: s in ^Plausible.Site.regular(),
- on: u.site_id == s.id,
- as: :site,
- left_join: up in Site.UserPreference,
- on: up.site_id == s.id and up.user_id == ^user.id,
- left_join: ti in Teams.Invitation,
- on: ti.id == u.team_invitation_id,
- left_join: gi in Teams.GuestInvitation,
- on: gi.id == u.guest_invitation_id,
- left_join: st in Teams.SiteTransfer,
- on: st.id == u.transfer_id,
- select: %{
- s
- | entry_type:
- selected_as(
- fragment(
- """
- CASE
- WHEN ? IS NOT NULL THEN 'invitation'
- WHEN ? IS NOT NULL THEN 'invitation'
- WHEN ? IS NOT NULL THEN 'pinned_site'
- ELSE ?
- END
- """,
- gi.id,
- st.id,
- up.pinned_at,
- u.entry_type
- ),
- :entry_type
- ),
pinned_at: selected_as(up.pinned_at, :pinned_at),
memberships: [
%{
@@ -133,15 +91,6 @@ defmodule Plausible.Teams.Sites do
site_id: s.id,
site: s
}
- ],
- invitations: [
- %{
- invitation_id: coalesce(gi.invitation_id, st.transfer_id),
- email: coalesce(ti.email, st.email),
- role: type(u.role, ^@role_type),
- site_id: s.id,
- site: s
- }
]
},
order_by: [
@@ -152,177 +101,6 @@ defmodule Plausible.Teams.Sites do
)
|> maybe_filter_by_domain(domain_filter)
|> Repo.paginate(pagination_params)
- |> Map.update!(:entries, fn entries ->
- Enum.map(entries, fn
- %{invitation: [%{invitation_id: nil}]} = entry ->
- %{entry | invitations: []}
-
- entry ->
- entry
- end)
- end)
- end
-
- defp list_with_invitations_setup_query(team, user) do
- team_membership_query =
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: u in assoc(tm, :user),
- as: :user,
- inner_join: s in assoc(t, :sites),
- as: :site,
- where: tm.user_id == ^user.id and tm.role != :guest,
- where: tm.team_id == ^team.id,
- select: %{
- site_id: s.id,
- entry_type: "site",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: tm.role,
- transfer_id: 0
- }
- )
-
- site_transfer_query =
- from st in Teams.SiteTransfer,
- as: :site_transfer,
- inner_join: s in assoc(st, :site),
- as: :site,
- where: s.team_id != ^team.id,
- where: st.email == ^user.email,
- where:
- exists(
- from tm in Teams.Membership,
- inner_join: u in assoc(tm, :user),
- where: tm.team_id == ^team.id,
- where: u.email == parent_as(:site_transfer).email,
- where: tm.role in [:owner, :admin],
- select: 1
- ),
- select: %{
- site_id: s.id,
- entry_type: "invitation",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: "owner",
- transfer_id: st.id
- }
-
- from s in team_membership_query,
- union_all: ^site_transfer_query
- end
-
- defp list_with_invitations_personal_query(team, user) do
- my_team_query =
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: u in assoc(tm, :user),
- as: :user,
- inner_join: s in assoc(t, :sites),
- as: :site,
- where: tm.user_id == ^user.id and tm.role == :owner,
- where: t.setup_complete == false,
- select: %{
- site_id: s.id,
- entry_type: "site",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: tm.role,
- transfer_id: 0
- }
- )
-
- guest_membership_query =
- from(tm in Teams.Membership,
- inner_join: u in assoc(tm, :user),
- as: :user,
- inner_join: gm in assoc(tm, :guest_memberships),
- inner_join: s in assoc(gm, :site),
- as: :site,
- where: tm.user_id == ^user.id and tm.role == :guest,
- select: %{
- site_id: s.id,
- entry_type: "site",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role:
- fragment(
- """
- CASE
- WHEN ? = 'editor' THEN 'admin'
- ELSE ?
- END
- """,
- gm.role,
- gm.role
- ),
- transfer_id: 0
- }
- )
-
- guest_invitation_query =
- from ti in Teams.Invitation,
- as: :team_invitation,
- inner_join: gi in assoc(ti, :guest_invitations),
- inner_join: s in assoc(gi, :site),
- as: :site,
- where:
- not exists(
- from tm in Teams.Membership,
- inner_join: u in assoc(tm, :user),
- left_join: gm in assoc(tm, :guest_memberships),
- on: gm.site_id == parent_as(:site).id,
- where: tm.team_id == parent_as(:team_invitation).team_id,
- where: u.email == parent_as(:team_invitation).email,
- where: not is_nil(gm.id) or tm.role != :guest,
- select: 1
- ),
- where: ti.email == ^user.email and ti.role == :guest,
- select: %{
- site_id: s.id,
- entry_type: "invitation",
- guest_invitation_id: gi.id,
- team_invitation_id: ti.id,
- role:
- fragment(
- """
- CASE
- WHEN ? = 'editor' THEN 'admin'
- ELSE ?
- END
- """,
- gi.role,
- gi.role
- ),
- transfer_id: 0
- }
-
- site_transfer_query =
- from st in Teams.SiteTransfer,
- as: :site_transfer,
- inner_join: s in assoc(st, :site),
- as: :site,
- where: st.email == ^user.email,
- select: %{
- site_id: s.id,
- entry_type: "invitation",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: "owner",
- transfer_id: st.id
- }
-
- site_transfer_query =
- if team do
- where(site_transfer_query, [site: s], s.team_id != ^team.id)
- else
- site_transfer_query
- end
-
- from s in my_team_query,
- union_all: ^guest_membership_query,
- union_all: ^guest_invitation_query,
- union_all: ^site_transfer_query
end
defp maybe_filter_by_domain(query, domain)
diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index 01451ff8af..dcdd6cafd8 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -24,6 +24,12 @@ defmodule PlausibleWeb.Components.Generic do
icon: "text-red-600 dark:text-red-500",
title_text: "text-sm text-gray-900 dark:text-gray-100",
body_text: "text-sm text-gray-600 dark:text-gray-100/60 leading-5"
+ },
+ white: %{
+ bg: "bg-white dark:bg-gray-900 shadow-sm dark:shadow-none",
+ icon: "text-gray-600 dark:text-gray-400",
+ title_text: "text-sm text-gray-900 dark:text-gray-100",
+ body_text: "text-sm text-gray-600 dark:text-gray-300 leading-5"
}
}
@@ -31,17 +37,25 @@ defmodule PlausibleWeb.Components.Generic do
"primary" =>
"bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35",
"secondary" =>
- "border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-100 hover:text-gray-900 hover:shadow-sm dark:hover:bg-gray-600 dark:hover:text-white disabled:text-gray-700/40 disabled:hover:shadow-none dark:disabled:text-gray-500 dark:disabled:bg-gray-800 dark:disabled:border-gray-800",
+ "border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-100 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-gray-600 dark:hover:border-gray-600 dark:hover:text-white disabled:text-gray-700/40 dark:disabled:text-gray-500 dark:disabled:bg-gray-800 dark:disabled:border-gray-800",
"yellow" =>
"bg-yellow-600/90 text-white hover:bg-yellow-600 focus-visible:outline-yellow-600 disabled:bg-yellow-400/60 disabled:dark:bg-yellow-600/30 disabled:dark:text-white/35",
"danger" =>
- "border border-gray-300 dark:border-gray-800 text-red-600 bg-white dark:bg-gray-800 hover:text-red-700 hover:shadow-sm dark:hover:text-red-400 dark:text-red-500 active:text-red-800 disabled:text-red-700/40 disabled:hover:shadow-none dark:disabled:text-red-500/35 dark:disabled:bg-gray-800"
+ "border border-gray-300 dark:border-gray-800 text-red-600 bg-white dark:bg-gray-800 hover:text-red-700 dark:hover:text-red-400 dark:text-red-500 active:text-red-800 disabled:text-red-700/40 disabled:hover:shadow-none dark:disabled:text-red-500/35 dark:disabled:bg-gray-800",
+ "ghost" =>
+ "text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-800 disabled:text-gray-500 disabled:dark:text-gray-600 disabled:hover:bg-transparent"
}
- @button_base_class "whitespace-nowrap truncate inline-flex items-center justify-center gap-x-2 font-medium rounded-md px-3.5 py-2.5 text-sm transition-all duration-150 cursor-pointer disabled:cursor-not-allowed"
+ @button_base_class "whitespace-nowrap truncate inline-flex items-center justify-center gap-x-2 text-sm font-medium rounded-md cursor-pointer disabled:cursor-not-allowed"
+
+ @button_sizes %{
+ "sm" => "px-3 py-2",
+ "md" => "px-3.5 py-2.5"
+ }
attr(:type, :string, default: "button")
attr(:theme, :string, default: "primary")
+ attr(:size, :string, default: "md")
attr(:class, :string, default: "")
attr(:disabled, :boolean, default: false)
attr(:mt?, :boolean, default: true)
@@ -53,7 +67,8 @@ defmodule PlausibleWeb.Components.Generic do
assigns =
assign(assigns,
button_base_class: @button_base_class,
- theme_class: @button_themes[assigns.theme]
+ theme_class: @button_themes[assigns.theme],
+ size_class: @button_sizes[assigns.size]
)
~H"""
@@ -63,6 +78,7 @@ defmodule PlausibleWeb.Components.Generic do
class={[
@mt? && "mt-6",
@button_base_class,
+ @size_class,
@theme_class,
@class
]}
@@ -76,6 +92,7 @@ defmodule PlausibleWeb.Components.Generic do
attr(:href, :string, required: true)
attr(:class, :string, default: "")
attr(:theme, :string, default: "primary")
+ attr(:size, :string, default: "md")
attr(:disabled, :boolean, default: false)
attr(:method, :string, default: "get")
attr(:mt?, :boolean, default: true)
@@ -115,7 +132,8 @@ defmodule PlausibleWeb.Components.Generic do
assign(assigns,
onclick: onclick,
button_base_class: @button_base_class,
- theme_class: theme_class
+ theme_class: theme_class,
+ size_class: @button_sizes[assigns.size]
)
~H"""
@@ -125,6 +143,7 @@ defmodule PlausibleWeb.Components.Generic do
class={[
@mt? && "mt-6",
@button_base_class,
+ @size_class,
@theme_class,
@class
]}
@@ -192,6 +211,8 @@ defmodule PlausibleWeb.Components.Generic do
attr(:class, :string, default: "")
attr(:rest, :global)
slot(:inner_block)
+ slot(:actions)
+ slot(:icon)
def notice(assigns) do
assigns = assign(assigns, :theme, Map.fetch!(@notice_themes, assigns.theme))
@@ -206,30 +227,31 @@ defmodule PlausibleWeb.Components.Generic do
>
<Heroicons.x_mark class="h-4 w-4 hover:stroke-2" />
</button>
- <div class="flex gap-x-3">
- <div :if={@show_icon && @title} class="shrink-0">
- <svg
- class={"h-5 w-5 #{@theme.icon}"}
- viewBox="0 0 20 20"
- fill="currentColor"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
- clip-rule="evenodd"
- />
- </svg>
- </div>
- <div class="w-full flex flex-col gap-y-1.5">
- <h3 :if={@title} class={"font-semibold #{@theme.title_text}"}>
- {@title}
- </h3>
- <div class={"#{@theme.body_text}"}>
- <p>
- {render_slot(@inner_block)}
- </p>
+ <div class={[
+ "flex gap-3",
+ @actions != [] && "items-start flex-col md:items-center md:flex-row"
+ ]}>
+ <div class="flex gap-x-3 flex-1">
+ <div :if={@show_icon && @title} class="shrink-0 mt-px">
+ <%= if @icon != [] do %>
+ {render_slot(@icon)}
+ <% else %>
+ <.exclamation_triangle_icon class={"size-4.5 #{@theme.icon}"} />
+ <% end %>
</div>
+ <div class="flex-1 flex flex-col gap-y-1.5">
+ <h3 :if={@title} class={"font-medium #{@theme.title_text}"}>
+ {@title}
+ </h3>
+ <div class={"#{@theme.body_text}"}>
+ <p class="text-pretty">
+ {render_slot(@inner_block)}
+ </p>
+ </div>
+ </div>
+ </div>
+ <div :if={@actions != []} class="shrink-0 flex gap-2">
+ {render_slot(@actions)}
</div>
</div>
</div>
diff --git a/lib/plausible_web/components/icons.ex b/lib/plausible_web/components/icons.ex
index 7b8a5b2687..5ac42a70fa 100644
--- a/lib/plausible_web/components/icons.ex
+++ b/lib/plausible_web/components/icons.ex
@@ -88,4 +88,55 @@ defmodule PlausibleWeb.Components.Icons do
</svg>
"""
end
+
+ attr :class, :any, default: []
+
+ def exclamation_triangle_icon(assigns) do
+ ~H"""
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class={@class}>
+ <g fill="currentColor" stroke-linecap="round" stroke-linejoin="round">
+ <circle
+ cx="12"
+ cy="12"
+ r="10"
+ fill="none"
+ stroke="currentColor"
+ stroke-miterlimit="10"
+ stroke-width="1.5"
+ />
+ <path
+ fill="none"
+ stroke="currentColor"
+ stroke-miterlimit="10"
+ stroke-width="1.5"
+ d="M12 7v6"
+ />
+ <circle cx="12" cy="16.75" r="1.25" />
+ </g>
+ </svg>
+ """
+ end
+
+ attr :class, :any, default: []
+
+ def envelope_icon(assigns) do
+ ~H"""
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class={@class}>
+ <path
+ stroke="currentColor"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ stroke-width="1.5"
+ d="M2.333 9c0-.97.528-1.814 1.38-2.284L11.355 2.5a1.332 1.332 0 0 1 1.288 0l7.644 4.217c.85.47 1.379 1.312 1.379 2.284"
+ />
+ <path
+ stroke="currentColor"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ stroke-width="1.5"
+ d="M21.667 9.005v8.662A2.666 2.666 0 0 1 19 20.333H5a2.666 2.666 0 0 1-2.667-2.666V9l9.087 4.387c.367.177.793.177 1.159 0L21.666 9v.005Z"
+ />
+ </svg>
+ """
+ end
end
diff --git a/lib/plausible_web/components/team/notice.ex b/lib/plausible_web/components/team/notice.ex
index 32b5c42bec..4faa263d44 100644
--- a/lib/plausible_web/components/team/notice.ex
+++ b/lib/plausible_web/components/team/notice.ex
@@ -3,6 +3,9 @@ defmodule PlausibleWeb.Team.Notice do
Components with teams related notices.
"""
use PlausibleWeb, :component
+ import PlausibleWeb.Components.Icons
+
+ alias Plausible.Teams
def owner_cta_banner(assigns) do
~H"""
@@ -58,30 +61,184 @@ defmodule PlausibleWeb.Team.Notice do
def team_invitations(assigns) do
~H"""
- <aside :if={not Enum.empty?(@team_invitations)} class="mt-4 mb-4">
+ <aside :if={not Enum.empty?(@team_invitations)} class="flex flex-col gap-y-4">
<.notice
:for={i <- @team_invitations}
id={"invitation-#{i.invitation_id}"}
- title="You have received team invitation"
- class="shadow-md dark:shadow-none mt-4"
+ title="Team invitation"
+ theme={:white}
>
- {i.inviter.name} has invited you to join the "{i.team.name}" as {i.role} member.
- <.link
+ <:icon>
+ <div class="shrink-0 -mt-1 bg-green-100/80 dark:bg-green-900/30 rounded-lg p-1.5">
+ <.envelope_icon class="size-4 text-green-600 dark:text-green-400" />
+ </div>
+ </:icon>
+ {i.inviter.name} has invited you to join the "{i.team.name}" as {i.role}.
+ <:actions>
+ <.button_link
+ method="post"
+ href={Routes.invitation_path(PlausibleWeb.Endpoint, :reject_invitation, i.invitation_id)}
+ phx-value-invitation-id={i.invitation_id}
+ theme="ghost"
+ size="sm"
+ class="order-2 md:order-1"
+ mt?={false}
+ >
+ Reject
+ </.button_link>
+ <.button_link
+ method="post"
+ href={Routes.invitation_path(PlausibleWeb.Endpoint, :accept_invitation, i.invitation_id)}
+ theme="secondary"
+ size="sm"
+ class="order-1 md:order-2"
+ mt?={false}
+ >
+ Accept
+ </.button_link>
+ </:actions>
+ </.notice>
+ </aside>
+ """
+ end
+
+ def site_ownership_invitations(assigns) do
+ ~H"""
+ <aside :if={not Enum.empty?(@site_ownership_invitations)} class="flex flex-col gap-y-4">
+ <.site_ownership_invitation
+ :for={i <- @site_ownership_invitations}
+ invitation={i}
+ current_team={@current_team}
+ />
+ </aside>
+ """
+ end
+
+ defp site_ownership_invitation(assigns) do
+ {can_accept?, exceeded_limits} =
+ case assigns.invitation.ownership_check do
+ :ok ->
+ {true, nil}
+
+ {:error, {:over_plan_limits, limits}} ->
+ {false, PlausibleWeb.TextHelpers.pretty_list(limits)}
+
+ _ ->
+ {false, nil}
+ end
+
+ assigns =
+ assign(assigns, can_accept?: can_accept?, exceeded_limits: exceeded_limits)
+
+ ~H"""
+ <.notice
+ id={"site-ownership-invitation-#{@invitation.transfer_id}"}
+ title={"#{@invitation.initiator.name} has invited you to own #{@invitation.site.domain}"}
+ theme={:white}
+ >
+ <:icon>
+ <div class="shrink-0 -mt-1 bg-green-100/80 dark:bg-green-900/30 rounded-lg p-1.5">
+ <.envelope_icon class="size-4 text-green-600 dark:text-green-400" />
+ </div>
+ </:icon>
+ <p :if={@can_accept?}>
+ On acceptance, you'll be responsible for billing and this site will join "{Teams.name(
+ @current_team
+ )}"
+ </p>
+ <p :if={@invitation.ownership_check == {:error, :no_plan}} class="text-sm font-medium">
+ You don't have an active subscription. Upgrade to accept ownership and take over billing.
+ </p>
+ <p :if={@exceeded_limits} class="mt-1 text-sm font-medium">
+ This exceeds your current {@exceeded_limits} limits. Upgrade to accept ownership.
+ </p>
+ <:actions>
+ <.button_link
method="post"
- href={Routes.invitation_path(PlausibleWeb.Endpoint, :accept_invitation, i.invitation_id)}
- class="whitespace-nowrap font-semibold"
+ href={
+ Routes.invitation_path(
+ PlausibleWeb.Endpoint,
+ :reject_invitation,
+ @invitation.transfer_id
+ )
+ }
+ theme="ghost"
+ size="sm"
+ class="order-2 md:order-1"
+ mt?={false}
>
- Accept
- </.link>
- or
- <.link
+ Reject
+ </.button_link>
+ <.button_link
+ :if={@can_accept?}
method="post"
- href={Routes.invitation_path(PlausibleWeb.Endpoint, :reject_invitation, i.invitation_id)}
- phx-value-invitation-id={i.invitation_id}
- class="whitespace-nowrap font-semibold"
+ href={
+ Routes.invitation_path(
+ PlausibleWeb.Endpoint,
+ :accept_invitation,
+ @invitation.transfer_id
+ )
+ }
+ theme="secondary"
+ size="sm"
+ class="order-1 md:order-2"
+ mt?={false}
>
- Reject
- </.link>
+ Accept
+ </.button_link>
+ <.button_link
+ :if={not @can_accept?}
+ href={Routes.billing_path(PlausibleWeb.Endpoint, :choose_plan)}
+ theme="secondary"
+ size="sm"
+ class="order-1 md:order-2"
+ mt?={false}
+ >
+ Upgrade to accept
+ </.button_link>
+ </:actions>
+ </.notice>
+ """
+ end
+
+ def site_invitations(assigns) do
+ ~H"""
+ <aside :if={not Enum.empty?(@site_invitations)} class="flex flex-col gap-y-4">
+ <.notice
+ :for={i <- @site_invitations}
+ id={"site-invitation-#{i.invitation_id}"}
+ title={"Invitation to #{i.site.domain}"}
+ theme={:white}
+ >
+ <:icon>
+ <div class="shrink-0 -mt-1 bg-green-100/80 dark:bg-green-900/30 rounded-lg p-1.5">
+ <.envelope_icon class="size-4 text-green-600 dark:text-green-400" />
+ </div>
+ </:icon>
+ {i.team_invitation.inviter.name} has invited you to join the {i.site.domain} analytics
+ dashboard as a {i.role}.
+ <:actions>
+ <.button_link
+ method="post"
+ href={Routes.invitation_path(PlausibleWeb.Endpoint, :reject_invitation, i.invitation_id)}
+ theme="ghost"
+ size="sm"
+ class="order-2 md:order-1"
+ mt?={false}
+ >
+ Reject
+ </.button_link>
+ <.button_link
+ method="post"
+ href={Routes.invitation_path(PlausibleWeb.Endpoint, :accept_invitation, i.invitation_id)}
+ theme="secondary"
+ size="sm"
+ class="order-1 md:order-2"
+ mt?={false}
+ >
+ Accept
+ </.button_link>
+ </:actions>
</.notice>
</aside>
"""
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index b5cedfd26d..1266e07c0e 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -24,13 +24,12 @@ defmodule PlausibleWeb.Live.Sites do
socket =
socket
|> assign(:uri, uri)
- |> assign(
- :team_invitations,
- Teams.Invitations.all(user)
- )
|> assign(:sparklines, %{})
|> assign(:filter_text, String.trim(params["filter_text"] || ""))
|> assign(init_consolidated_view_assigns(user, team))
+ |> assign(:team_invitations, [])
+ |> assign(:site_invitations, [])
+ |> assign(:site_ownership_invitations, [])
{:ok, socket}
end
@@ -40,6 +39,7 @@ defmodule PlausibleWeb.Live.Sites do
socket
|> assign(:params, params)
|> load_sites()
+ |> load_invitations()
|> assign_new(:has_sites?, fn %{current_user: current_user} ->
Teams.Users.has_sites?(current_user, include_pending?: true)
end)
@@ -84,13 +84,7 @@ defmodule PlausibleWeb.Live.Sites do
end
def render(assigns) do
- assigns =
- assign(
- assigns,
- :invitations_map,
- Enum.map(assigns.invitations, &{&1.invitation.invitation_id, &1}) |> Enum.into(%{})
- )
- |> assign(:searching?, String.trim(assigns.filter_text) != "")
+ assigns = assign(assigns, :searching?, String.trim(assigns.filter_text) != "")
~H"""
<.flash_messages flash={@flash} />
@@ -114,8 +108,6 @@ defmodule PlausibleWeb.Live.Sites do
</.unstyled_link>
</div>
- <PlausibleWeb.Team.Notice.team_invitations team_invitations={@team_invitations} />
-
<div
:if={not @is_empty_state?}
class="relative z-10 pt-4 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-y-2"
@@ -147,12 +139,21 @@ defmodule PlausibleWeb.Live.Sites do
<a
:if={!@consolidated_view_cta_dismissed?}
href={"/sites/new?flow=#{PlausibleWeb.Flows.provisioning()}"}
- class="whitespace-nowrap truncate inline-flex items-center justify-center gap-x-2 max-w-fit font-medium rounded-md px-3.5 py-2.5 text-sm transition-all duration-150 cursor-pointer disabled:cursor-not-allowed bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35"
+ class="whitespace-nowrap truncate inline-flex items-center justify-center gap-x-2 max-w-fit font-medium rounded-md px-3.5 py-2.5 text-sm cursor-pointer disabled:cursor-not-allowed bg-indigo-600 text-white hover:bg-indigo-700 focus-visible:outline-indigo-600 disabled:bg-indigo-400/60 disabled:dark:bg-indigo-600/30 disabled:dark:text-white/35"
>
<Heroicons.plus class="size-4" /> Add website
</a>
</div>
+ <div class="flex flex-col gap-y-4 my-4">
+ <PlausibleWeb.Team.Notice.team_invitations team_invitations={@team_invitations} />
+ <PlausibleWeb.Team.Notice.site_ownership_invitations
+ site_ownership_invitations={@site_ownership_invitations}
+ current_team={@current_team}
+ />
+ <PlausibleWeb.Team.Notice.site_invitations site_invitations={@site_invitations} />
+ </div>
+
<p :if={@searching? and @sites.entries == []} class="mt-4 dark:text-gray-100 text-center">
No sites found. Try a different search term.
</p>
@@ -211,16 +212,9 @@ defmodule PlausibleWeb.Live.Sites do
/>
<%= for site <- @sites.entries do %>
<.site
- :if={site.entry_type in ["pinned_site", "site"]}
site={site}
sparkline={Map.get(@sparklines, site.domain, :loading)}
/>
- <.invitation
- :if={site.entry_type == "invitation"}
- site={site}
- invitation={@invitations_map[hd(site.invitations).invitation_id]}
- sparkline={Map.get(@sparklines, site.domain, :loading)}
- />
<% end %>
</ul>
@@ -484,41 +478,6 @@ defmodule PlausibleWeb.Live.Sites do
"""
end
- attr(:site, Plausible.Site, required: true)
- attr(:invitation, :map, required: true)
- attr(:sparkline, :map, required: true)
-
- def invitation(assigns) do
- assigns =
- assigns
- |> assign(:modal_id, "invitation-modal-#{assigns[:invitation].invitation.invitation_id}")
-
- ~H"""
- <li
- class="group relative cursor-pointer"
- id={"site-card-#{hash_domain(@site.domain)}"}
- data-domain={@site.domain}
- phx-click={Prima.Modal.JS.open(@modal_id)}
- >
- <div class="col-span-1 flex flex-col gap-y-5 bg-white dark:bg-gray-900 rounded-md shadow-sm p-6 group-hover:shadow-lg cursor-pointer transition duration-100">
- <div class="w-full flex items-center justify-between gap-x-2.5">
- <.favicon domain={@site.domain} />
- <div class="flex-1 w-full truncate">
- <h3 class="text-gray-900 font-medium text-md sm:text-lg leading-[22px] truncate dark:text-gray-100">
- {@site.domain}
- </h3>
- </div>
- <.pill color={:green}>
- Pending invitation
- </.pill>
- </div>
- <.site_stats sparkline={@sparkline} />
- </div>
- <.invitation_modal id={@modal_id} site={@site} invitation={@invitation} />
- </li>
- """
- end
-
attr(:site, Plausible.Site, required: true)
attr(:sparkline, :map, required: true)
@@ -720,117 +679,6 @@ defmodule PlausibleWeb.Live.Sites do
"""
end
- attr(:id, :string, required: true)
- attr(:site, Plausible.Site, required: true)
- attr(:invitation, :map, required: true)
-
- def invitation_modal(assigns) do
- ~H"""
- <PlausibleWeb.Live.Components.PrimaModal.modal id={@id}>
- <div class="p-5 pb-3 sm:p-6 sm:pb-3">
- <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">
- <button
- phx-click={Prima.Modal.JS.close()}
- class="text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400"
- >
- <span class="sr-only">Close</span>
- <Heroicons.x_mark class="size-6" />
- </button>
- </div>
- <div class="flex flex-col gap-y-4 text-center sm:text-left">
- <PlausibleWeb.Live.Components.PrimaModal.modal_title>
- You're invited to {@site.domain}
- </PlausibleWeb.Live.Components.PrimaModal.modal_title>
- <div>
- <p class="text-sm text-gray-600 dark:text-gray-400 text-pretty">
- You've been added as <b class="capitalize">{@invitation.invitation.role}</b>
- to the {@site.domain} analytics dashboard.
- <%= if !(Map.get(@invitation, :exceeded_limits) || Map.get(@invitation, :no_plan)) &&
- @invitation.invitation.role == :owner do %>
- If you accept the ownership transfer, you will be responsible for billing going forward.
- <% else %>
- Welcome aboard!
- <% end %>
- </p>
- </div>
- </div>
- <.notice
- :if={Map.get(@invitation, :missing_features)}
- title="Missing features"
- class="mt-4 shadow-xs dark:shadow-none"
- >
- <p>
- The site uses {Map.get(@invitation, :missing_features)},
- which your current subscription does not support. After accepting ownership of this site,
- you will not be able to access them unless you <.styled_link
- class="inline-block"
- href={Routes.billing_path(PlausibleWeb.Endpoint, :choose_plan)}
- >
- upgrade to a suitable plan
- </.styled_link>.
- </p>
- </.notice>
- <.notice
- :if={Map.get(@invitation, :exceeded_limits)}
- title="Unable to accept site ownership"
- class="mt-4 shadow-xs dark:shadow-none"
- >
- <p>
- Owning this site would exceed your {Map.get(@invitation, :exceeded_limits)}. Please check your usage in
- <.styled_link
- class="inline-block"
- href={Routes.settings_path(PlausibleWeb.Endpoint, :subscription)}
- >
- account settings
- </.styled_link>
- and upgrade your subscription to accept the site ownership.
- </p>
- </.notice>
- <.notice
- :if={Map.get(@invitation, :no_plan)}
- title="No subscription"
- class="mt-4 shadow-xs dark:shadow-none"
- >
- You are unable to accept the ownership of this site because your account does not have a subscription. To become the owner of this site, you should upgrade to a suitable plan.
- </.notice>
- </div>
- <div class="flex flex-col sm:flex-row-reverse gap-3 p-5 sm:p-6">
- <.button
- :if={!(Map.get(@invitation, :exceeded_limits) || Map.get(@invitation, :no_plan))}
- mt?={false}
- class="w-full sm:w-auto sm:text-sm"
- data-method="post"
- data-csrf={Plug.CSRFProtection.get_csrf_token()}
- data-to={"/sites/invitations/#{@invitation.invitation.invitation_id}/accept"}
- data-autofocus
- >
- Accept and continue
- </.button>
- <.button_link
- :if={Map.get(@invitation, :exceeded_limits) || Map.get(@invitation, :no_plan)}
- mt?={false}
- href={Routes.billing_path(PlausibleWeb.Endpoint, :choose_plan)}
- class="w-full sm:w-auto sm:text-sm"
- data-autofocus
- >
- Upgrade
- </.button_link>
- <.button_link
- mt?={false}
- class="w-full sm:w-auto sm:text-sm"
- href="#"
- theme="secondary"
- data-method="post"
- data-csrf={Plug.CSRFProtection.get_csrf_token()}
- data-to={"/sites/invitations/#{@invitation.invitation.invitation_id}/reject"}
- >
- Reject
- </.button_link>
- </div>
- </PlausibleWeb.Live.Components.PrimaModal.modal>
- """
- end
-
attr(:filter_text, :string, default: "")
attr(:uri, URI, required: true)
@@ -963,9 +811,25 @@ defmodule PlausibleWeb.Live.Sites do
end
end
+ defp load_invitations(%{assigns: %{params: %{"page" => page}}} = socket) when page != "1" do
+ socket
+ end
+
+ defp load_invitations(%{assigns: %{current_user: user, current_team: team}} = socket) do
+ site_transfers =
+ user
+ |> Teams.Invitations.pending_site_transfers_for()
+ |> Enum.map(&Map.put(&1, :ownership_check, ensure_can_take_ownership(&1.site, team)))
+
+ socket
+ |> assign(:team_invitations, Teams.Invitations.pending_team_invitations_for(user))
+ |> assign(:site_invitations, Teams.Invitations.pending_guest_invitations_for(user))
+ |> assign(:site_ownership_invitations, site_transfers)
+ end
+
defp load_sites(%{assigns: assigns} = socket) do
sites =
- Sites.list_with_invitations(assigns.current_user, assigns.params,
+ Sites.list(assigns.current_user, assigns.params,
filter_by_domain: assigns.filter_text,
team: assigns.current_team
)
@@ -982,69 +846,18 @@ defmodule PlausibleWeb.Live.Sites do
do: load_consolidated_sparkline(assigns.consolidated_view),
else: :loading
- invitations = extract_invitations(sites.entries, assigns.current_team)
-
assign(
socket,
sites: sites,
- invitations: invitations,
sparklines: sparklines,
consolidated_sparkline: consolidated_sparkline || Map.get(assigns, :consolidated_sparkline)
)
end
- defp extract_invitations(sites, team) do
- sites
- |> Enum.filter(&(&1.entry_type == "invitation"))
- |> Enum.flat_map(& &1.invitations)
- |> Enum.map(&check_limits(&1, team))
- end
-
on_ee do
- defp check_limits(%{role: :owner, site: site} = invitation, team) do
- case ensure_can_take_ownership(site, team) do
- :ok ->
- check_features(invitation, team)
-
- {:error, :no_plan} ->
- %{invitation: invitation, no_plan: true}
-
- {:error, {:over_plan_limits, limits}} ->
- limits = PlausibleWeb.TextHelpers.pretty_list(limits)
- %{invitation: invitation, exceeded_limits: limits}
- end
- end
- end
-
- defp check_limits(invitation, _), do: %{invitation: invitation}
-
- defdelegate ensure_can_take_ownership(site, team), to: Teams.Invitations
-
- def check_features(%{role: :owner, site: site} = invitation, team) do
- case check_feature_access(site, team) do
- :ok ->
- %{invitation: invitation}
-
- {:error, {:missing_features, features}} ->
- feature_names =
- features
- |> Enum.map(& &1.display_name())
- |> PlausibleWeb.TextHelpers.pretty_list()
-
- %{invitation: invitation, missing_features: feature_names}
- end
- end
-
- defp check_feature_access(site, new_team) do
- missing_features =
- Teams.Billing.features_usage(nil, [site.id])
- |> Enum.filter(&(&1.check_availability(new_team) != :ok))
-
- if missing_features == [] do
- :ok
- else
- {:error, {:missing_features, missing_features}}
- end
+ defdelegate ensure_can_take_ownership(site, team), to: Teams.Invitations
+ else
+ defp ensure_can_take_ownership(_site, _team), do: :ok
end
defp set_filter_text(socket, filter_text) do
@@ -1104,7 +917,7 @@ defmodule PlausibleWeb.Live.Sites do
end
defp init_consolidated_view_assigns(_user, nil) do
- # technically this is team not setup, but is also equivalent of having no sites at this moment (can have invitations though), so CTA should not be shown
+ # technically this is team not setup, but is also equivalent of having no sites at this moment, so CTA should not be shown
no_consolidated_view(no_consolidated_view_reason: :no_sites)
end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 061971e7fa..a5ba53294c 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -81,9 +81,11 @@ another_site =
user2 = new_user(name: "Mary Jane", email: "[email protected]", password: "plausible")
site2 = new_site(domain: "computer.example.com", owner: user2)
invite_guest(site2, user, inviter: user2, role: :viewer)
+invite_transfer(site2, user, inviter: user2)
+invite_member(team_of(user), user2, inviter: user, role: :editor)
user3 = new_user(name: "Harvey Dent", email: "[email protected]", password: "plausible")
-site3 = new_site(domain: "bank.example.com", owner: user3)
+_site3 = new_site(domain: "bank.example.com", owner: user3)
subscribe_to_business_plan(user3)
invite_member(team_of(user3), "[email protected]", role: :editor, inviter: user3)
diff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exs
index e9e0ba935c..97ca545f57 100644
--- a/test/plausible/sites_test.exs
+++ b/test/plausible/sites_test.exs
@@ -269,7 +269,7 @@ defmodule Plausible.SitesTest do
end
end
- describe "list/3 and list_with_invitations/3" do
+ describe "list/3" do
test "returns empty when there are no sites" do
user = new_user()
_rogue_site = new_site()
@@ -289,28 +289,11 @@ defmodule Plausible.SitesTest do
total_entries: 0,
total_pages: 1
} = Plausible.Teams.Sites.list(user, %{})
-
- assert %{
- entries: [],
- page_size: 24,
- page_number: 1,
- total_entries: 0,
- total_pages: 1
- } = Sites.list_with_invitations(user, %{})
-
- assert %{
- entries: [],
- page_size: 24,
- page_number: 1,
- total_entries: 0,
- total_pages: 1
- } = Plausible.Teams.Sites.list_with_invitations(user, %{})
end
- test "lists guest sites, site invitations and transfers when no current team set" do
+ test "lists guest sites when no current team set (no invitations)" do
user1 = new_user()
user2 = new_user()
- user3 = new_user()
user4 = new_user()
# owned site on a setup team
@@ -325,32 +308,21 @@ defmodule Plausible.SitesTest do
site2 = new_site(owner: user2, domain: "guest.example.com")
add_guest(site2, user: user1, role: :editor)
- # site invitation
- site3 = new_site(owner: user3, domain: "invitation.example.com")
- invite_guest(site3, user1, role: :viewer, inviter: user3)
-
- # transfer
- site4 = new_site(domain: "transfer.example.com", owner: user3)
- invite_transfer(site4, user1, inviter: user2)
-
# other team site access
- site5 = new_site(domain: "team.example.com", owner: user4)
- add_member(site5.team, user: user1, role: :editor)
+ site3 = new_site(domain: "team.example.com", owner: user4)
+ add_member(site3.team, user: user1, role: :editor)
assert %{
entries: [
- %{domain: "invitation.example.com"},
- %{domain: "transfer.example.com"},
%{domain: "guest.example.com"}
]
} =
- Sites.list_with_invitations(user1, %{})
+ Sites.list(user1, %{})
end
- test "lists guest sites, site invitations, transfers and team sites when current team set but not setup" do
+ test "lists guest sites and team sites when current team set but not setup (no invitations)" do
user1 = new_user()
user2 = new_user()
- user3 = new_user()
user4 = new_user()
# owned site on a personal team
@@ -360,36 +332,25 @@ defmodule Plausible.SitesTest do
site2 = new_site(owner: user2, domain: "guest.example.com")
add_guest(site2, user: user1, role: :editor)
- # site invitation
- site3 = new_site(owner: user3, domain: "invitation.example.com")
- invite_guest(site3, user1, role: :viewer, inviter: user3)
-
- # transfer
- site4 = new_site(domain: "transfer.example.com", owner: user3)
- invite_transfer(site4, user1, inviter: user2)
-
# other team site access
- site5 = new_site(domain: "team.example.com", owner: user4)
- add_member(site5.team, user: user1, role: :editor)
+ site3 = new_site(domain: "team.example.com", owner: user4)
+ add_member(site3.team, user: user1, role: :editor)
# excluded
new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
assert %{
entries: [
- %{domain: "invitation.example.com"},
- %{domain: "transfer.example.com"},
%{domain: "guest.example.com"},
%{domain: "own.example.com"}
]
} =
- Sites.list_with_invitations(user1, %{}, team: site1.team)
+ Sites.list(user1, %{}, team: site1.team)
end
- test "lists team sites and transfers when current team set and setup" do
+ test "lists team sites when current team set and setup (no invitations)" do
user1 = new_user()
user2 = new_user()
- user3 = new_user()
user4 = new_user()
# owned site on a personal team
@@ -399,37 +360,29 @@ defmodule Plausible.SitesTest do
site2 = new_site(owner: user2, domain: "guest.example.com")
add_guest(site2, user: user1, role: :editor)
- # site invitation
- site3 = new_site(owner: user3, domain: "invitation.example.com")
- invite_guest(site3, user1, role: :viewer, inviter: user3)
-
- # transfer
- site4 = new_site(domain: "transfer.example.com", owner: user3)
- invite_transfer(site4, user1, inviter: user2)
-
# other team site access
- site5 = new_site(domain: "team.example.com", owner: user4)
- team5 = Plausible.Teams.complete_setup(site5.team)
- add_member(site5.team, user: user1, role: :admin)
+ site3 = new_site(domain: "team.example.com", owner: user4)
+ team3 = Plausible.Teams.complete_setup(site3.team)
+ add_member(site3.team, user: user1, role: :admin)
# excluded
new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
assert %{
entries: [
- %{domain: "transfer.example.com"},
%{domain: "team.example.com"}
]
} =
- Sites.list_with_invitations(user1, %{}, team: team5)
+ Sites.list(user1, %{}, team: team3)
end
- test "shows both pending transfer and pinned site for user without team with guest membership" do
+ test "shows pinned site for user without team with guest membership (no invitation)" do
owner = new_user()
pending_owner = new_user()
site = new_site(owner: owner, domain: "one.example.com")
add_guest(site, user: pending_owner, role: :editor)
+ # transfer no longer shown
invite_transfer(site, pending_owner, inviter: owner)
{:ok, _} = Sites.toggle_pin(pending_owner, site)
@@ -440,49 +393,42 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{domain: "one.example.com", entry_type: "invitation"},
%{domain: "one.example.com", entry_type: "pinned_site"}
]
} =
- Sites.list_with_invitations(pending_owner, %{})
+ Sites.list(pending_owner, %{})
end
- test "shows both pending transfer and site for user without team with guest membership" do
+ test "shows site for user without team with guest membership (no invitation)" do
owner = new_user()
pending_owner = new_user()
site = new_site(owner: owner, domain: "one.example.com")
add_guest(site, user: pending_owner, role: :editor)
- invite_transfer(site, pending_owner, inviter: owner)
-
assert %{
entries: [
- %{domain: "one.example.com", entry_type: "invitation"},
%{domain: "one.example.com", entry_type: "site"}
]
} =
- Sites.list_with_invitations(pending_owner, %{})
+ Sites.list(pending_owner, %{})
end
- test "shows both pending transfer and site for user with personal team with guest membership" do
+ test "shows site for user with personal team with guest membership (no invitation)" do
owner = new_user()
pending_owner = new_user() |> subscribe_to_growth_plan()
pending_team = team_of(pending_owner)
site = new_site(owner: owner, domain: "one.example.com")
add_guest(site, user: pending_owner, role: :editor)
- invite_transfer(site, pending_owner, inviter: owner)
-
assert %{
entries: [
- %{domain: "one.example.com", entry_type: "invitation"},
%{domain: "one.example.com", entry_type: "site"}
]
} =
- Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ Sites.list(pending_owner, %{}, team: pending_team)
end
- test "shows only pending transfer for user with setup team with guest membership" do
+ test "does not show site for user with setup team with guest membership (no invitation)" do
owner = new_user()
pending_owner = new_user() |> subscribe_to_growth_plan()
@@ -494,48 +440,38 @@ defmodule Plausible.SitesTest do
site = new_site(owner: owner, domain: "one.example.com")
add_guest(site, user: pending_owner, role: :editor)
- invite_transfer(site, pending_owner, inviter: owner)
-
assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "invitation"}
- ]
+ entries: []
} =
- Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ Sites.list(pending_owner, %{}, team: pending_team)
end
test "does not show transfer for user with site in their personal team" do
- owner = new_user()
pending_owner = new_user() |> subscribe_to_growth_plan()
pending_team = team_of(pending_owner)
- site = new_site(owner: pending_owner, domain: "one.example.com")
-
- invite_transfer(site, pending_owner, inviter: owner)
+ _site = new_site(owner: pending_owner, domain: "one.example.com")
assert %{
entries: [
%{domain: "one.example.com", entry_type: "site"}
]
} =
- Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ Sites.list(pending_owner, %{}, team: pending_team)
end
test "does not show transfer for user with site in their setup team" do
- owner = new_user()
pending_owner = new_user() |> subscribe_to_growth_plan()
pending_team = team_of(pending_owner)
- site = new_site(owner: pending_owner, domain: "one.example.com")
+ _site = new_site(owner: pending_owner, domain: "one.example.com")
pending_team = Plausible.Teams.complete_setup(pending_team)
- invite_transfer(site, pending_owner, inviter: owner)
-
assert %{
entries: [
%{domain: "one.example.com", entry_type: "site"}
]
} =
- Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ Sites.list(pending_owner, %{}, team: pending_team)
end
test "pinned site doesn't matter with membership revoked (no active invitations)" do
@@ -552,22 +488,18 @@ defmodule Plausible.SitesTest do
revoke_membership(site2, user1)
assert %{entries: [%{domain: "one.example.com"}]} = Sites.list(user1, %{})
- assert %{entries: [%{domain: "one.example.com"}]} = Sites.list_with_invitations(user1, %{})
+ assert %{entries: [%{domain: "one.example.com"}]} = Sites.list(user1, %{})
assert %{entries: [%{domain: "one.example.com"}]} = Plausible.Teams.Sites.list(user1, %{})
assert %{entries: [%{domain: "one.example.com"}]} =
- Plausible.Teams.Sites.list_with_invitations(user1, %{})
+ Plausible.Teams.Sites.list(user1, %{})
end
- test "pinned site with active invitation" do
+ test "pinned site (no invitation shown)" do
user1 = new_user(email: "[email protected]")
- user2 = new_user(email: "[email protected]")
site1 = new_site(domain: "one.example.com", owner: user1)
- site2 = new_site(domain: "two.example.com")
-
- invite_guest(site2, user1, role: :editor, inviter: user2)
{:ok, _} = Sites.toggle_pin(user1, site1)
@@ -575,19 +507,18 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{domain: "two.example.com", entry_type: "invitation"},
%{domain: "one.example.com", entry_type: "pinned_site"}
]
} =
- Sites.list_with_invitations(user1, %{})
+ Sites.list(user1, %{})
assert %{entries: [%{domain: "one.example.com"}]} = Plausible.Teams.Sites.list(user1, %{})
- assert %{entries: [%{domain: "two.example.com"}, %{domain: "one.example.com"}]} =
- Plausible.Teams.Sites.list_with_invitations(user1, %{})
+ assert %{entries: [%{domain: "one.example.com"}]} =
+ Plausible.Teams.Sites.list(user1, %{})
end
- test "pinned site on active invitation" do
+ test "pinned site after invitation revoked (no invitation shown)" do
user1 = new_user(email: "[email protected]")
user2 = new_user(email: "[email protected]")
@@ -597,53 +528,36 @@ defmodule Plausible.SitesTest do
{:ok, _} = Sites.toggle_pin(user1, site1)
revoke_membership(site1, user1)
- invite_guest(site1, user1, role: :editor, inviter: user2)
-
assert %{entries: []} = Sites.list(user1, %{})
- assert %{
- entries: [
- %{domain: "one.example.com", entry_type: "invitation"}
- ]
- } =
- Sites.list_with_invitations(user1, %{})
-
assert %{entries: []} = Plausible.Teams.Sites.list(user1, %{})
- assert %{entries: [%{domain: "one.example.com", entry_type: "invitation"}]} =
- Plausible.Teams.Sites.list_with_invitations(user1, %{})
+ assert %{entries: []} =
+ Plausible.Teams.Sites.list(user1, %{})
end
- test "puts invitations first, pinned sites second, sites last" do
+ test "puts pinned sites first, sites last (no invitations)" do
user1 = new_user()
user2 = new_user()
- user3 = new_user()
site1 = new_site(owner: user1, domain: "one.example.com")
site2 = new_site(owner: user2, domain: "two.example.com")
- site3 = new_site(owner: user3, domain: "three.example.com")
+ site3 = new_site(domain: "three.example.com")
site4 = new_site(domain: "four.example.com")
- site5 = new_site(owner: user3, domain: "five.example.com")
# excluded
new_site(owner: user1, domain: "consolidated1.example.com", consolidated: true)
new_site(owner: user2, domain: "consolidated2.example.com", consolidated: true)
- new_site(owner: user3, domain: "consolidated3.example.com", consolidated: true)
- invite_guest(site2, user1, role: :editor, inviter: user2)
add_guest(site3, user: user1, role: :viewer)
add_guest(site4, user: user1, role: :editor)
- invite_transfer(site5, user1, inviter: user3)
-
{:ok, _} = Sites.toggle_pin(user1, site3)
{:ok, _pin_to_ignore} = Sites.toggle_pin(user2, site2)
site1_id = site1.id
- site2_id = site2.id
site3_id = site3.id
site4_id = site4.id
- site5_id = site5.id
assert %{
entries: [
@@ -655,16 +569,14 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{id: ^site5_id, entry_type: "invitation"},
- %{id: ^site2_id, entry_type: "invitation"},
%{id: ^site3_id, entry_type: "pinned_site"},
%{id: ^site4_id, entry_type: "site"},
%{id: ^site1_id, entry_type: "site"}
]
- } = Sites.list_with_invitations(user1, %{})
+ } = Sites.list(user1, %{})
end
- test "pinned sites are ordered according to the time they were pinned at" do
+ test "pinned sites are ordered according to the time they were pinned at (no invitations)" do
user1 = new_user()
user2 = new_user()
user3 = new_user()
@@ -675,6 +587,7 @@ defmodule Plausible.SitesTest do
site4 = new_site(domain: "four.example.com")
site5 = new_site(owner: user3, domain: "five.example.com")
+ # invitations no longer shown
invite_guest(site2, user1, role: :editor, inviter: user2)
add_guest(site3, user: user1, role: :viewer)
add_guest(site4, user: user1, role: :editor)
@@ -684,10 +597,8 @@ defmodule Plausible.SitesTest do
{:ok, _} = Sites.toggle_pin(user1, site3)
site1_id = site1.id
- site2_id = site2.id
site3_id = site3.id
site4_id = site4.id
- site5_id = site5.id
Sites.set_option(user1, site1, :pinned_at, ~N[2023-10-22 12:00:00])
{:ok, _} = Sites.toggle_pin(user1, site3)
@@ -702,32 +613,21 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{id: ^site5_id, entry_type: "invitation"},
- %{id: ^site2_id, entry_type: "invitation"},
%{id: ^site3_id, entry_type: "pinned_site"},
%{id: ^site1_id, entry_type: "pinned_site"},
%{id: ^site4_id, entry_type: "site"}
]
- } = Sites.list_with_invitations(user1, %{})
+ } = Sites.list(user1, %{})
end
- test "filters by domain" do
+ test "filters by domain (no invitations)" do
user1 = new_user()
- user2 = new_user()
- user3 = new_user()
site1 = new_site(owner: user1, domain: "first.example.com")
- site2 = new_site(owner: user2, domain: "first-transfer.example.com")
- site3 = new_site(owner: user3, domain: "first-invitation.example.com")
- _site4 = new_site(owner: user1, domain: "another.example.com")
+ _site2 = new_site(owner: user1, domain: "another.example.com")
new_site(owner: user1, domain: "consolidated.example.com", consolidated: true)
- invite_guest(site3, user1, role: :viewer, inviter: user3)
- invite_transfer(site2, user1, inviter: user2)
-
site1_id = site1.id
- site2_id = site2.id
- site3_id = site3.id
assert %{
entries: [
@@ -737,25 +637,17 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{id: ^site3_id},
- %{id: ^site2_id},
%{id: ^site1_id}
]
- } = Sites.list_with_invitations(user1, %{}, filter_by_domain: "first")
+ } = Sites.list(user1, %{}, filter_by_domain: "first")
end
- test "scopes by team when provided" do
+ test "scopes by team when provided (no invitations)" do
user1 = new_user()
- user2 = new_user()
- user3 = new_user()
site1 = new_site(owner: user1, domain: "first.example.com")
- site2 = new_site(owner: user2, domain: "first-transfer.example.com")
- site3 = new_site(owner: user3, domain: "first-invitation.example.com")
site4 = new_site(domain: "zzzsitefromanotherteam.com")
- invite_guest(site3, user1, role: :viewer, inviter: user3)
- invite_transfer(site2, user1, inviter: user2)
team4 = Plausible.Teams.complete_setup(site4.team)
add_member(team4, user: user1, role: :admin)
@@ -767,11 +659,9 @@ defmodule Plausible.SitesTest do
assert_matches %{
entries: [
- %{id: ^site3.id},
- %{id: ^site2.id},
%{id: ^site1.id}
]
- } = Sites.list_with_invitations(user1, %{})
+ } = Sites.list(user1, %{})
assert_matches %{
entries: [
@@ -781,36 +671,26 @@ defmodule Plausible.SitesTest do
assert_matches %{
entries: [
- %{id: ^site2.id},
%{id: ^site4.id}
]
- } = Sites.list_with_invitations(user1, %{}, team: team4)
+ } = Sites.list(user1, %{}, team: team4)
end
- test "handles pagination correctly" do
+ test "handles pagination correctly (no invitations)" do
user1 = new_user()
- user2 = new_user()
- user3 = new_user()
site1 = new_site(owner: user1, domain: "one.example.com")
- site2 = new_site(owner: user2, domain: "two.example.com")
site3 = new_site(domain: "three.example.com")
site4 = new_site(domain: "four.example.com")
- site5 = new_site(owner: user3, domain: "five.example.com")
- invite_guest(site2, user1, role: :editor, inviter: user2)
add_guest(site3, user: user1, role: :viewer)
add_guest(site4, user: user1, role: :editor)
- invite_transfer(site5, user1, inviter: user3)
-
{:ok, _} = Sites.toggle_pin(user1, site3)
site1_id = site1.id
- site2_id = site2.id
site3_id = site3.id
site4_id = site4.id
- site5_id = site5.id
assert %{
entries: [%{id: ^site3_id}, %{id: ^site4_id}],
@@ -835,32 +715,6 @@ defmodule Plausible.SitesTest do
total_entries: 3,
total_pages: 1
} = Sites.list(user1, %{"page_size" => 3})
-
- # list_with_invitations
- #
- assert %{
- entries: [%{id: ^site5_id}, %{id: ^site2_id}],
- page_number: 1,
- page_size: 2,
- total_entries: 5,
- total_pages: 3
- } = Sites.list_with_invitations(user1, %{"page_size" => 2})
-
- assert %{
- entries: [%{id: ^site3_id}, %{id: ^site4_id}],
- page_number: 2,
- page_size: 2,
- total_entries: 5,
- total_pages: 3
- } = Sites.list_with_invitations(user1, %{"page_size" => 2, "page" => 2})
-
- assert %{
- entries: [%{id: ^site1_id}],
- page_number: 3,
- page_size: 2,
- total_entries: 5,
- total_pages: 3
- } = Sites.list_with_invitations(user1, %{"page_size" => 2, "page" => 3})
end
end
diff --git a/test/plausible/teams/invitations/list_pending_test.exs b/test/plausible/teams/invitations/list_pending_test.exs
new file mode 100644
index 0000000000..d2a8fa27a1
--- /dev/null
+++ b/test/plausible/teams/invitations/list_pending_test.exs
@@ -0,0 +1,197 @@
+defmodule Plausible.Teams.Invitations.ListPendingTest do
+ use Plausible.DataCase, async: true
+
+ alias Plausible.Teams.Invitations
+
+ describe "pending_team_invitations_for/1" do
+ test "returns non-guest team invitations for the user" do
+ inviter = new_user(name: "Alice")
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+ invitee = new_user()
+
+ invitation = invite_member(team, invitee, inviter: inviter, role: :admin)
+
+ results = Invitations.pending_team_invitations_for(invitee)
+
+ assert [ti] = results
+ assert ti.invitation_id == invitation.invitation_id
+ assert ti.role == :admin
+ assert ti.inviter.name == "Alice"
+ assert ti.team.id == team.id
+ end
+
+ test "does not return guest-role team invitations" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ invitee = new_user()
+
+ invite_guest(site, invitee, inviter: inviter, role: :viewer)
+
+ assert Invitations.pending_team_invitations_for(invitee) == []
+ end
+
+ test "returns multiple invitations from different teams" do
+ inviter1 = new_user(name: "Dave")
+ inviter2 = new_user(name: "Eve")
+ _site1 = new_site(owner: inviter1)
+ _site2 = new_site(owner: inviter2)
+ team1 = team_of(inviter1)
+ team2 = team_of(inviter2)
+ invitee = new_user()
+
+ inv1 = invite_member(team1, invitee, inviter: inviter1, role: :viewer)
+ inv2 = invite_member(team2, invitee, inviter: inviter2, role: :admin)
+
+ results = Invitations.pending_team_invitations_for(invitee)
+
+ assert length(results) == 2
+ ids = Enum.map(results, & &1.invitation_id)
+ assert inv1.invitation_id in ids
+ assert inv2.invitation_id in ids
+ end
+
+ test "does not return invitations for other users" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+ other_user = new_user()
+
+ invite_member(team, other_user, inviter: inviter, role: :admin)
+
+ assert Invitations.pending_team_invitations_for(new_user()) == []
+ end
+ end
+
+ describe "pending_guest_invitations_for/1" do
+ test "returns guest invitations with site and inviter preloaded" do
+ inviter = new_user(name: "Bob")
+ site = new_site(owner: inviter)
+ invitee = new_user()
+
+ gi = invite_guest(site, invitee, inviter: inviter, role: :viewer)
+
+ results = Invitations.pending_guest_invitations_for(invitee)
+
+ assert [entry] = results
+ assert entry.invitation_id == gi.invitation_id
+ assert entry.role == :viewer
+ assert entry.site.id == site.id
+ assert entry.team_invitation.inviter.name == "Bob"
+ end
+
+ test "returns editor role as-is (role mapping is a UI concern)" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ invitee = new_user()
+
+ gi = invite_guest(site, invitee, inviter: inviter, role: :editor)
+
+ [entry] = Invitations.pending_guest_invitations_for(invitee)
+ assert entry.invitation_id == gi.invitation_id
+ assert entry.role == :editor
+ end
+
+ test "does not return invitations for other users" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ other_user = new_user()
+
+ invite_guest(site, other_user, inviter: inviter, role: :viewer)
+
+ assert Invitations.pending_guest_invitations_for(new_user()) == []
+ end
+
+ test "does not return invitation if invitee is already a full team member" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ invitee = new_user()
+
+ invite_guest(site, invitee, inviter: inviter, role: :viewer)
+ add_member(site.team, user: invitee, role: :editor)
+
+ assert Invitations.pending_guest_invitations_for(invitee) == []
+ end
+
+ test "does not return invitation if invitee is already a guest member of that site" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ invitee = new_user()
+
+ invite_guest(site, invitee, inviter: inviter, role: :viewer)
+ add_guest(site, user: invitee, role: :viewer)
+
+ assert Invitations.pending_guest_invitations_for(invitee) == []
+ end
+
+ test "returns invitations to multiple sites within single team" do
+ inviter = new_user()
+ site1 = new_site(owner: inviter)
+ site2 = new_site(owner: inviter)
+ invitee = new_user()
+
+ gi1 =
+ site1
+ |> invite_guest(invitee, inviter: inviter, role: :viewer)
+ |> Plausible.Repo.preload(:team_invitation)
+
+ gi2 =
+ insert(:guest_invitation,
+ site: site2,
+ team_invitation: gi1.team_invitation,
+ role: :editor
+ )
+
+ results = Invitations.pending_guest_invitations_for(invitee)
+
+ assert length(results) == 2
+ ids = Enum.map(results, & &1.invitation_id)
+ assert gi1.invitation_id in ids
+ assert gi2.invitation_id in ids
+ end
+ end
+
+ describe "pending_site_transfers_for/1" do
+ test "returns site transfer with site and initiator preloaded" do
+ initiator = new_user(name: "Carol")
+ site = new_site(owner: initiator)
+ invitee = new_user()
+
+ transfer = invite_transfer(site, invitee, inviter: initiator)
+
+ results = Invitations.pending_site_transfers_for(invitee)
+
+ assert [entry] = results
+ assert entry.transfer_id == transfer.transfer_id
+ assert entry.site.id == site.id
+ assert entry.initiator.name == "Carol"
+ end
+
+ test "returns transfers from multiple sites" do
+ initiator = new_user()
+ site1 = new_site(owner: initiator)
+ site2 = new_site(owner: initiator)
+ invitee = new_user()
+
+ t1 = invite_transfer(site1, invitee, inviter: initiator)
+ t2 = invite_transfer(site2, invitee, inviter: initiator)
+
+ results = Invitations.pending_site_transfers_for(invitee)
+
+ assert length(results) == 2
+ ids = Enum.map(results, & &1.transfer_id)
+ assert t1.transfer_id in ids
+ assert t2.transfer_id in ids
+ end
+
+ test "does not return transfers for other users" do
+ initiator = new_user()
+ site = new_site(owner: initiator)
+ other_user = new_user()
+
+ invite_transfer(site, other_user, inviter: initiator)
+
+ assert Invitations.pending_site_transfers_for(new_user()) == []
+ end
+ end
+end
diff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exs
index c2283caebb..ac6eb785f9 100644
--- a/test/plausible/teams/management/layout_test.exs
+++ b/test/plausible/teams/management/layout_test.exs
@@ -369,7 +369,7 @@ defmodule Plausible.Teams.Management.LayoutTest do
assert {:error, :not_a_member} = Teams.Memberships.team_role(team, member1)
assert {:ok, :viewer} = Teams.Memberships.team_role(team, member2)
- assert [%{email: "[email protected]"}] = Teams.Invitations.all(team)
+ assert [%{email: "[email protected]"}] = Teams.Invitations.pending_team_invitations_for(team)
assert_email_delivered_with(
to: [nil: "[email protected]"],
diff --git a/test/plausible_web/components/team/notice_test.exs b/test/plausible_web/components/team/notice_test.exs
new file mode 100644
index 0000000000..e5ff3f214b
--- /dev/null
+++ b/test/plausible_web/components/team/notice_test.exs
@@ -0,0 +1,220 @@
+defmodule PlausibleWeb.Team.NoticeTest do
+ use Plausible.DataCase, async: true
+ import Phoenix.LiveViewTest, only: [render_component: 2]
+
+ alias PlausibleWeb.Team.Notice
+
+ describe "team_invitations/1" do
+ test "renders nothing when list is empty" do
+ rendered = render_component(&Notice.team_invitations/1, team_invitations: [])
+
+ assert rendered == ""
+ end
+
+ test "renders inviter name, team name and role" do
+ invitations = [
+ %{
+ invitation_id: "inv-1",
+ inviter: %{name: "Alice"},
+ team: %{name: "Acme Corp"},
+ role: :admin
+ }
+ ]
+
+ rendered = render_component(&Notice.team_invitations/1, team_invitations: invitations)
+
+ assert rendered =~ "Alice"
+ assert rendered =~ "Acme Corp"
+ assert rendered =~ "admin"
+ end
+
+ test "renders accept and reject links for each invitation" do
+ invitations = [
+ %{
+ invitation_id: "inv-abc",
+ inviter: %{name: "Bob"},
+ team: %{name: "Team X"},
+ role: :viewer
+ }
+ ]
+
+ rendered = render_component(&Notice.team_invitations/1, team_invitations: invitations)
+
+ assert rendered =~ ~r{href="[^"]*invitations/inv-abc/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/inv-abc/reject"}
+ end
+
+ test "renders one notice per invitation" do
+ invitations = [
+ %{invitation_id: "inv-1", inviter: %{name: "A"}, team: %{name: "T1"}, role: :viewer},
+ %{invitation_id: "inv-2", inviter: %{name: "B"}, team: %{name: "T2"}, role: :admin}
+ ]
+
+ rendered = render_component(&Notice.team_invitations/1, team_invitations: invitations)
+
+ assert rendered =~ "T1"
+ assert rendered =~ "T2"
+ assert rendered =~ ~r{href="[^"]*invitations/inv-1/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/inv-2/accept"}
+ end
+ end
+
+ describe "site_invitations/1" do
+ test "renders nothing when list is empty" do
+ rendered = render_component(&Notice.site_invitations/1, site_invitations: [])
+
+ assert rendered == ""
+ end
+
+ test "renders inviter name, site domain and role" do
+ invitations = [
+ %{
+ invitation_id: "gi-1",
+ team_invitation: %{inviter: %{name: "Carol"}},
+ site: %{domain: "example.com"},
+ role: :viewer
+ }
+ ]
+
+ rendered = render_component(&Notice.site_invitations/1, site_invitations: invitations)
+
+ assert rendered =~ "Carol"
+ assert rendered =~ "example.com"
+ assert rendered =~ "viewer"
+ end
+
+ test "renders accept and reject links" do
+ invitations = [
+ %{
+ invitation_id: "gi-xyz",
+ team_invitation: %{inviter: %{name: "Dan"}},
+ site: %{domain: "mysite.io"},
+ role: :editor
+ }
+ ]
+
+ rendered = render_component(&Notice.site_invitations/1, site_invitations: invitations)
+
+ assert rendered =~ ~r{href="[^"]*invitations/gi-xyz/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/gi-xyz/reject"}
+ end
+ end
+
+ describe "site_ownership_invitations/1" do
+ test "renders nothing when list is empty" do
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: [],
+ current_team: nil
+ )
+
+ assert rendered == ""
+ end
+
+ test "renders initiator name and site domain" do
+ transfers = [
+ %{
+ transfer_id: "tr-1",
+ initiator: %{name: "Eve"},
+ site: %{domain: "transfer.me"},
+ ownership_check: :ok
+ }
+ ]
+
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: transfers,
+ current_team: nil
+ )
+
+ assert rendered =~ "Eve"
+ assert rendered =~ "transfer.me"
+ end
+
+ test "renders accept and reject links when ownership check passes" do
+ transfers = [
+ %{
+ transfer_id: "tr-abc",
+ initiator: %{name: "Eve"},
+ site: %{domain: "transfer.me"},
+ ownership_check: :ok
+ }
+ ]
+
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: transfers,
+ current_team: nil
+ )
+
+ assert rendered =~ ~r{href="[^"]*invitations/tr-abc/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/tr-abc/reject"}
+ refute rendered =~ "/billing/choose-plan"
+ end
+
+ test "shows current team name in billing note when ownership check passes" do
+ transfers = [
+ %{
+ transfer_id: "tr-team",
+ initiator: %{name: "Eve"},
+ site: %{domain: "transfer.me"},
+ ownership_check: :ok
+ }
+ ]
+
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: transfers,
+ current_team: %Plausible.Teams.Team{name: "My Team", setup_complete: true}
+ )
+
+ assert rendered =~ "My Team"
+ assert rendered =~ "billing"
+ end
+
+ test "renders upgrade link and no accept link when there is no plan" do
+ transfers = [
+ %{
+ transfer_id: "tr-noplan",
+ initiator: %{name: "Frank"},
+ site: %{domain: "nope.io"},
+ ownership_check: {:error, :no_plan}
+ }
+ ]
+
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: transfers,
+ current_team: nil
+ )
+
+ assert rendered =~ "/billing/choose-plan"
+ refute rendered =~ ~r{href="[^"]*invitations/tr-noplan/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/tr-noplan/reject"}
+ assert rendered =~ "You don't have an active subscription"
+ end
+
+ test "renders upgrade link and no accept link when plan limits are exceeded" do
+ transfers = [
+ %{
+ transfer_id: "tr-over",
+ initiator: %{name: "Grace"},
+ site: %{domain: "big.io"},
+ ownership_check: {:error, {:over_plan_limits, [:site_limit]}}
+ }
+ ]
+
+ rendered =
+ render_component(&Notice.site_ownership_invitations/1,
+ site_ownership_invitations: transfers,
+ current_team: nil
+ )
+
+ assert rendered =~ "/billing/choose-plan"
+ refute rendered =~ ~r{href="[^"]*invitations/tr-over/accept"}
+ assert rendered =~ ~r{href="[^"]*invitations/tr-over/reject"}
+ assert rendered =~ "exceeds your current"
+ assert rendered =~ "site limit"
+ end
+ end
+end
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs
index 2be757b4c9..31cabe186f 100644
--- a/test/plausible_web/controllers/site_controller_test.exs
+++ b/test/plausible_web/controllers/site_controller_test.exs
@@ -146,25 +146,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert site_card =~ site.domain
end
- test "shows invitations for user by email address", %{conn: conn, user: user} do
- inviter = new_user()
- site = new_site(owner: inviter)
- invite_guest(site, user, inviter: inviter, role: :editor)
- conn = get(conn, "/sites")
-
- assert html_response(conn, 200) =~ site.domain
- end
-
- test "invitations are case insensitive", %{conn: conn, user: user} do
- inviter = new_user()
- site = new_site(owner: inviter)
- invite_guest(site, String.upcase(user.email), inviter: inviter, role: :editor)
-
- conn = get(conn, "/sites")
-
- assert html_response(conn, 200) =~ site.domain
- end
-
test "paginates sites", %{conn: initial_conn, user: user} do
for i <- 1..25 do
new_site(
@@ -234,21 +215,21 @@ defmodule PlausibleWeb.SiteControllerTest do
end
test "filters by domain", %{conn: conn, user: user} do
- _site1 = new_site(domain: "first.example.com", owner: user)
- _site2 = new_site(domain: "second.example.com", owner: user)
+ _site1 = new_site(domain: "alpha.example.com", owner: user)
+ _site2 = new_site(domain: "beta.example.com", owner: user)
_rogue_site = new_site()
inviter = new_user()
- new_site(owner: inviter, domain: "first-another.example.com")
- |> invite_guest(user, inviter: inviter, role: :viewer)
+ site3 = new_site(owner: inviter, domain: "alpha-another.example.com")
+ add_guest(site3, user: user, role: :viewer)
- conn = get(conn, "/sites", filter_text: "first")
+ conn = get(conn, "/sites", filter_text: "alpha")
resp = html_response(conn, 200)
- assert resp =~ "first.example.com"
- assert resp =~ "first-another.example.com"
- refute resp =~ "second.example.com"
+ assert resp =~ "alpha.example.com"
+ assert resp =~ "alpha-another.example.com"
+ refute resp =~ "beta.example.com"
end
test "does not show empty state when filter returns empty but there are sites", %{
diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs
index d82683e316..364e75b4d9 100644
--- a/test/plausible_web/live/sites_test.exs
+++ b/test/plausible_web/live/sites_test.exs
@@ -51,63 +51,6 @@ defmodule PlausibleWeb.Live.SitesTest do
assert element_exists?(html, ~s|a[data-test-id="team-settings-link"]|)
end
- test "renders team invitations", %{user: user, conn: conn} do
- owner1 = new_user(name: "G.I. Joe")
- new_site(owner: owner1)
- team1 = team_of(owner1)
-
- owner2 = new_user(name: "G.I. Jane")
- new_site(owner: owner2)
- team2 = team_of(owner2)
-
- invitation1 = invite_member(team1, user, inviter: owner1, role: :viewer)
- invitation2 = invite_member(team2, user, inviter: owner2, role: :editor)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- assert text_of_element(html, "#invitation-#{invitation1.invitation_id}") =~
- "G.I. Joe has invited you to join the \"My personal sites\" as viewer member."
-
- assert text_of_element(html, "#invitation-#{invitation2.invitation_id}") =~
- "G.I. Jane has invited you to join the \"My personal sites\" as editor member."
-
- assert element_exists?(
- html,
- ~s|#invitation-#{invitation1.invitation_id} a[href="#{Routes.invitation_path(PlausibleWeb.Endpoint, :accept_invitation, invitation1.invitation_id)}"]|
- )
-
- assert element_exists?(
- html,
- ~s|#invitation-#{invitation1.invitation_id} a[href="#{Routes.invitation_path(PlausibleWeb.Endpoint, :reject_invitation, invitation1.invitation_id)}"]|
- )
-
- assert element_exists?(
- html,
- ~s|#invitation-#{invitation2.invitation_id} a[href="#{Routes.invitation_path(PlausibleWeb.Endpoint, :accept_invitation, invitation2.invitation_id)}"]|
- )
-
- assert element_exists?(
- html,
- ~s|#invitation-#{invitation2.invitation_id} a[href="#{Routes.invitation_path(PlausibleWeb.Endpoint, :reject_invitation, invitation2.invitation_id)}"]|
- )
- end
-
- @tag :ee_only
- test "renders ownership transfer invitation for a case with no plan", %{
- conn: conn,
- user: user
- } do
- inviter = new_user()
- site = new_site(owner: inviter)
-
- transfer = invite_transfer(site, user, inviter: inviter)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- assert text_of_element(html, "#invitation-modal-#{transfer.transfer_id}") =~
- "You are unable to accept the ownership of this site because your account does not have a subscription"
- end
-
@tag :ee_only
test "renders upgrade nag when current team has a site and trial expired", %{
conn: conn,
@@ -124,27 +67,6 @@ defmodule PlausibleWeb.Live.SitesTest do
assert html =~ "Payment required"
end
- @tag :ee_only
- test "renders upgrade nag when there's a pending transfer", %{
- conn: conn,
- user: user
- } do
- {:ok, personal_team} = Plausible.Teams.get_or_create(user)
-
- another_user = new_user()
- site = new_site(owner: another_user)
-
- personal_team
- |> Ecto.Changeset.change(trial_expiry_date: Date.add(Date.utc_today(), -1))
- |> Repo.update!()
-
- invite_transfer(site, user, inviter: another_user)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- assert html =~ "Payment required"
- end
-
@tag :ee_only
test "does not render upgrade nag when there's no current team", %{conn: conn, user: user} do
team = new_site().team |> Plausible.Teams.complete_setup()
@@ -156,20 +78,7 @@ defmodule PlausibleWeb.Live.SitesTest do
end
@tag :ee_only
- test "does not render upgrade nag when current team has no sites and user has no pending transfers",
- %{conn: conn, user: user} do
- {:ok, _personal_team} = Plausible.Teams.get_or_create(user)
-
- team = new_site().team |> Plausible.Teams.complete_setup()
- add_member(team, user: user, role: :owner)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- refute html =~ "Payment required"
- end
-
- @tag :ee_only
- test "does not render upgrade nag if current team does not have any sites yet and user has no pending transfers",
+ test "does not render upgrade nag if current team does not have any sites yet",
%{conn: conn, user: user} do
{:ok, personal_team} = Plausible.Teams.get_or_create(user)
@@ -185,44 +94,6 @@ defmodule PlausibleWeb.Live.SitesTest do
refute html =~ "Payment required"
end
- @tag :ee_only
- test "renders ownership transfer invitation for a case with exceeded limits", %{
- conn: conn,
- user: user
- } do
- inviter = new_user()
- site = new_site(owner: inviter)
-
- transfer = invite_transfer(site, user, inviter: inviter)
-
- # fill site quota
- subscribe_to_growth_plan(user)
- for _ <- 1..10, do: new_site(owner: user)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- assert text_of_element(html, "#invitation-modal-#{transfer.transfer_id}") =~
- "Owning this site would exceed your site limit"
- end
-
- @tag :ee_only
- test "renders ownership transfer invitation for a case with missing features", %{
- conn: conn,
- user: user
- } do
- inviter = new_user()
- site = new_site(owner: inviter, allowed_event_props: ["dummy"])
-
- transfer = invite_transfer(site, user, inviter: inviter)
-
- subscribe_to_growth_plan(user)
-
- {:ok, _lv, html} = live(conn, "/sites")
-
- assert text_of_element(html, "#invitation-modal-#{transfer.transfer_id}") =~
- "The site uses Custom Properties, which your current subscription does not support"
- end
-
test "renders 24h visitors correctly", %{conn: conn, user: user} do
site = new_site(owner: user)
@@ -512,6 +383,194 @@ defmodule PlausibleWeb.Live.SitesTest do
end
end
+ describe "invitation notices" do
+ test "renders team invitation notice", %{conn: conn, user: user} do
+ inviter = new_user(name: "Jane Doe")
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ inv = invite_member(team, user, inviter: inviter, role: :admin)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ notice = text_of_element(html, "#invitation-#{inv.invitation_id}")
+ assert notice =~ "Jane Doe"
+ assert notice =~ team.name
+ assert notice =~ "admin"
+
+ assert element_exists?(
+ html,
+ ~s|#invitation-#{inv.invitation_id} a[href$="#{inv.invitation_id}/accept"]|
+ )
+
+ assert element_exists?(
+ html,
+ ~s|#invitation-#{inv.invitation_id} a[href$="#{inv.invitation_id}/reject"]|
+ )
+ end
+
+ test "renders multiple team invitation notices", %{conn: conn, user: user} do
+ inviter1 = new_user(name: "Alice")
+ inviter2 = new_user(name: "Bob")
+ _site1 = new_site(owner: inviter1)
+ _site2 = new_site(owner: inviter2)
+ team1 = team_of(inviter1)
+ team2 = team_of(inviter2)
+
+ inv1 = invite_member(team1, user, inviter: inviter1, role: :viewer)
+ inv2 = invite_member(team2, user, inviter: inviter2, role: :editor)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert element_exists?(html, "#invitation-#{inv1.invitation_id}")
+ assert element_exists?(html, "#invitation-#{inv2.invitation_id}")
+ end
+
+ test "renders guest invitation notice", %{conn: conn, user: user} do
+ inviter = new_user(name: "John Smith")
+ site = new_site(owner: inviter)
+
+ inv = invite_guest(site, user, inviter: inviter, role: :viewer)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ notice = text_of_element(html, "#site-invitation-#{inv.invitation_id}")
+ assert notice =~ "John Smith"
+ assert notice =~ site.domain
+ assert notice =~ "viewer"
+
+ assert element_exists?(
+ html,
+ ~s|#site-invitation-#{inv.invitation_id} a[href$="#{inv.invitation_id}/accept"]|
+ )
+
+ assert element_exists?(
+ html,
+ ~s|#site-invitation-#{inv.invitation_id} a[href$="#{inv.invitation_id}/reject"]|
+ )
+ end
+
+ @tag :ee_only
+ test "renders site transfer invitation notice", %{conn: conn, user: user} do
+ inviter = new_user(name: "Carol White")
+ site = new_site(owner: inviter)
+
+ subscribe_to_growth_plan(user)
+ transfer = invite_transfer(site, user, inviter: inviter)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ notice = text_of_element(html, "#site-ownership-invitation-#{transfer.transfer_id}")
+ assert notice =~ "Carol White"
+ assert notice =~ site.domain
+
+ assert element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="#{transfer.transfer_id}/accept"]|
+ )
+
+ assert element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="#{transfer.transfer_id}/reject"]|
+ )
+ end
+
+ @tag :ee_only
+ test "renders upgrade CTA instead of accept for site transfer when no plan", %{
+ conn: conn,
+ user: user
+ } do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+
+ transfer = invite_transfer(site, user, inviter: inviter)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ notice = text_of_element(html, "#site-ownership-invitation-#{transfer.transfer_id}")
+ assert notice =~ "You don't have an active subscription"
+
+ assert element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="/billing/choose-plan"]|
+ )
+
+ refute element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="#{transfer.transfer_id}/accept"]|
+ )
+ end
+
+ @tag :ee_only
+ test "renders upgrade CTA instead of accept for site transfer when plan limits exceeded", %{
+ conn: conn,
+ user: user
+ } do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+
+ transfer = invite_transfer(site, user, inviter: inviter)
+
+ subscribe_to_growth_plan(user)
+ for _ <- 1..10, do: new_site(owner: user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ notice = text_of_element(html, "#site-ownership-invitation-#{transfer.transfer_id}")
+ assert notice =~ "site limit"
+
+ assert element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="/billing/choose-plan"]|
+ )
+
+ refute element_exists?(
+ html,
+ ~s|#site-ownership-invitation-#{transfer.transfer_id} a[href$="#{transfer.transfer_id}/accept"]|
+ )
+ end
+
+ test "shows invitations on page 1 (explicit) and with no page parameter, hides on page 2+",
+ %{conn: conn, user: user} do
+ for _ <- 1..3, do: new_site(owner: user)
+
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ inv = invite_member(team_of(inviter), user, inviter: inviter, role: :admin)
+
+ {:ok, _lv, html} = live(conn, "/sites?page_size=2")
+ assert element_exists?(html, "#invitation-#{inv.invitation_id}")
+
+ {:ok, _lv, html} = live(conn, "/sites?page_size=2&page=1")
+ assert element_exists?(html, "#invitation-#{inv.invitation_id}")
+
+ {:ok, _lv, html} = live(conn, "/sites?page_size=2&page=2")
+ refute element_exists?(html, "#invitation-#{inv.invitation_id}")
+ end
+
+ test "does not render notices for other users' invitations", %{conn: conn} do
+ other_user = new_user()
+
+ team_inviter = new_user()
+ _site = new_site(owner: team_inviter)
+ inv = invite_member(team_of(team_inviter), other_user, inviter: team_inviter, role: :admin)
+
+ guest_inviter = new_user()
+ guest_site = new_site(owner: guest_inviter)
+ gi = invite_guest(guest_site, other_user, inviter: guest_inviter, role: :viewer)
+
+ transfer_inviter = new_user()
+ transfer_site = new_site(owner: transfer_inviter)
+ transfer = invite_transfer(transfer_site, other_user, inviter: transfer_inviter)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ refute element_exists?(html, "#invitation-#{inv.invitation_id}")
+ refute element_exists?(html, "#site-invitation-#{gi.invitation_id}")
+ refute element_exists?(html, "#site-ownership-invitation-#{transfer.transfer_id}")
+ end
+ end
+
describe "pinning" do
test "renders pin site option when site not pinned", %{conn: conn, user: user} do
site = new_site(owner: user)
diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exs
index c1a3d5190f..76aae48d4c 100644
--- a/test/plausible_web/live/team_management_test.exs
+++ b/test/plausible_web/live/team_management_test.exs
@@ -186,7 +186,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest do
add_invite(lv, "[email protected]", "admin")
assert lv |> render() |> text() =~ "Your account is limited to 3 team members"
- assert Enum.count(Plausible.Teams.Invitations.all(team)) == 3
+ assert Enum.count(Plausible.Teams.Invitations.pending_team_invitations_for(team)) == 3
end
test "fails to accept invitation to already existing e-mail", %{