Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Team Management UI (#4997)
hq12cc361548675
diff --git a/lib/plausible/application.ex b/lib/plausible/application.exindex 1e0e6a23c5..c8bbf2f916 100644--- a/lib/plausible/application.ex+++ b/lib/plausible/application.ex@@ -15,6 +15,7 @@ defmodule Plausible.Application dochildren =[+ Plausible.PromEx,Plausible.Cache.Stats,Plausible.Repo,Plausible.ClickhouseRepo,@@ -104,7 +105,6 @@ defmodule Plausible.Application doend,endpoint,{Oban, Application.get_env(:plausible, Oban)},- Plausible.PromEx,on_ee dohelp_scout_vault()enddiff --git a/lib/plausible/prom_ex.ex b/lib/plausible/prom_ex.exindex 3cf68d8473..8e22a4dc43 100644--- a/lib/plausible/prom_ex.ex+++ b/lib/plausible/prom_ex.ex@@ -3,23 +3,33 @@ defmodule Plausible.PromEx doalias PromEx.Plugins+ @plugins [+ Plugins.Application,+ Plugins.Beam,+ Plugins.PhoenixLiveView,+ {Plugins.Phoenix, router: PlausibleWeb.Router, endpoint: PlausibleWeb.Endpoint},+ {Plugins.Ecto,+ repos: [+ Plausible.Repo,+ Plausible.ClickhouseRepo,+ Plausible.IngestRepo,+ Plausible.AsyncInsertRepo+ ]},+ Plausible.PromEx.Plugins.PlausibleMetrics+ ]+@impl true- def plugins do- [- Plugins.Application,- Plugins.Beam,- Plugins.PhoenixLiveView,- {Plugins.Phoenix, router: PlausibleWeb.Router, endpoint: PlausibleWeb.Endpoint},- {Plugins.Ecto,- repos: [- Plausible.Repo,- Plausible.ClickhouseRepo,- Plausible.IngestRepo,- Plausible.AsyncInsertRepo- ]},- Plugins.Oban,- Plausible.PromEx.Plugins.PlausibleMetrics- ]+ if Mix.env() in [:test, :ce_test] do+ # PromEx tries to query Oban's DB tables in order to retrieve metrics.+ # During tests, however, this is pointless as Oban is in manual mode,+ # and that leads to connection ownership clashes.+ def plugins do+ @plugins+ end+ else+ def plugins do+ [Plugins.Oban | @plugins]+ endend@impl truediff --git a/lib/plausible/teams.ex b/lib/plausible/teams.exindex 375464edf5..d72a8d4262 100644--- a/lib/plausible/teams.ex+++ b/lib/plausible/teams.ex@@ -273,39 +273,6 @@ defmodule Plausible.Teams do)end- def setup_team(team, candidates) do- inviter = Repo.preload(team, :owner).owner-- setup_team_fn = fn {{email, _name}, role} ->- case Teams.Invitations.InviteToTeam.invite(team, inviter, email, role, send_email?: false) do- {:ok, invitation} -> invitation- {:error, error} -> Repo.rollback(error)- end- end-- result =- Repo.transaction(fn ->- team- |> Teams.Team.setup_changeset()- |> Repo.update!()-- Enum.map(candidates, setup_team_fn)- end)-- case result do- {:ok, invitations} ->- Enum.each(invitations, fn invitation ->- invitee = Auth.find_user_by(email: invitation.email)- Teams.Invitations.InviteToTeam.send_invitation_email(invitation, invitee)- end)-- {:ok, invitations}-- {:error, {:over_limit, _}} = error ->- error- end- end-defp create_my_team(user) doteam ="My Team"diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.exindex 42ce31b705..93becf11cc 100644--- a/lib/plausible/teams/invitations.ex+++ b/lib/plausible/teams/invitations.ex@@ -35,7 +35,16 @@ defmodule Plausible.Teams.Invitations doendend- def find_team_invitations(user) do+ def all(%Teams.Team{} = team) do+ Repo.all(+ from ti in Teams.Invitation,+ inner_join: inviter in assoc(ti, :inviter),+ where: ti.team_id == ^team.id,+ preload: [inviter: inviter]+ )+ end++ def all(%Plausible.Auth.User{} = user) doRepo.all(from ti in Teams.Invitation,inner_join: inviter in assoc(ti, :inviter),diff --git a/lib/plausible/teams/invitations/candidates.ex b/lib/plausible/teams/invitations/candidates.exdeleted file mode 100644index 1e12a361b3..0000000000--- a/lib/plausible/teams/invitations/candidates.ex+++ /dev/null@@ -1,47 +0,0 @@-defmodule Plausible.Teams.Invitations.Candidates do- @moduledoc """- Search through team's site guests looking for full membership candidates.- """- import Ecto.Query-- alias Plausible.Repo- alias Plausible.Teams.GuestMembership- alias Plausible.Teams-- @spec search_site_guests(Teams.Team.t(), String.t(), Keyword.t()) :: [Plausible.Auth.User.t()]- def search_site_guests(%Teams.Team{} = team, name_or_email, opts \\ [])- when is_binary(name_or_email) do- limit = Keyword.get(opts, :limit, 50)- exclude = Keyword.get(opts, :exclude, [])-- all_site_ids = Teams.owned_sites_ids(team)- term = "%#{name_or_email}%"-- Repo.all(- from gm in GuestMembership,- inner_join: tm in assoc(gm, :team_membership),- inner_join: u in assoc(tm, :user),- where: gm.site_id in ^all_site_ids,- where: ilike(u.email, ^term) or ilike(u.name, ^term),- where: u.email not in ^exclude,- order_by: [asc: u.id],- select: u,- distinct: true,- limit: ^limit- )- end-- def get_site_guest(%Teams.Team{} = team, email) do- all_site_ids = Teams.owned_sites_ids(team)-- Repo.one(- from gm in GuestMembership,- inner_join: tm in assoc(gm, :team_membership),- inner_join: u in assoc(tm, :user),- where: gm.site_id in ^all_site_ids,- where: u.email == ^email,- distinct: true,- select: u- )- end-enddiff --git a/lib/plausible/teams/management/layout.ex b/lib/plausible/teams/management/layout.exnew file mode 100644index 0000000000..d8f3de0481--- /dev/null+++ b/lib/plausible/teams/management/layout.ex@@ -0,0 +1,178 @@+defmodule Plausible.Teams.Management.Layout do+ @moduledoc """+ Abstraction for team membership(s) layout - provides a high level CRUD for+ setting up team memberships, including invitations. Persisting the layout,+ effectively takes care of delegating the operations to specialized services+ and sending out e-mail notifications on success, if need be.+ To be used in UIs allowing team memberships adjustments.+ """+ alias Plausible.Teams+ alias Plausible.Teams.Management.Layout.Entry+ alias Plausible.Repo+ alias Plausible.Auth.User++ @type t() :: %{String.t() => Entry.t()}++ @spec init(Teams.Team.t()) :: t()+ def init(%Teams.Team{} = team) do+ invitations_sent = Teams.Invitations.all(team)+ all_members = Teams.Memberships.all(team)+ build_by_email(invitations_sent ++ all_members)+ end++ @spec build_by_email([Teams.Invitation.t() | Teams.Membership.t()]) ::+ t()+ def build_by_email(entities) do+ Enum.reduce(entities, %{}, fn+ %Teams.Invitation{} = invitation, acc ->+ Map.put(acc, invitation.email, Entry.new(invitation))++ %Teams.Membership{} = membership, acc ->+ Map.put(+ acc,+ membership.user.email,+ Entry.new(membership)+ )+ end)+ end++ @spec active_count(t()) :: non_neg_integer()+ def active_count(layout) do+ Enum.count(layout, fn {_, entry} -> entry.queued_op != :delete end)+ end++ @spec owners_count(t()) :: non_neg_integer()+ def owners_count(layout) do+ Enum.count(layout, fn {_, entry} -> entry.queued_op != :delete and entry.role == :owner end)+ end++ @spec has_guests?(t()) :: boolean()+ def has_guests?(layout) do+ not is_nil(+ Enum.find(+ layout,+ fn+ {_, entry} -> entry.role == :guest and entry.queued_op != :delete+ end+ )+ )+ end++ @spec update_role(t(), String.t(), atom()) :: t()+ def update_role(layout, email, role) do+ entry = Map.fetch!(layout, email)+ Map.put(layout, email, Entry.patch(entry, role: role, queued_op: :update))+ end++ @spec schedule_send(t(), String.t(), atom(), Keyword.t()) :: t()+ def schedule_send(layout, email, role, entry_attrs \\ []) do+ invitation = %Teams.Invitation{email: email, role: role}+ Map.put(layout, email, Entry.new(invitation, Keyword.merge(entry_attrs, queued_op: :send)))+ end++ @spec schedule_delete(t(), String.t()) :: t()+ def schedule_delete(layout, email) do+ entry = Map.fetch!(layout, email)+ Map.put(layout, email, Entry.patch(entry, queued_op: :delete))+ end++ @spec verify_removable(t(), String.t()) :: :ok | {:error, String.t()}+ def verify_removable(layout, email) do+ ensure_at_least_one_owner(layout, email)+ end++ @spec removable?(t(), String.t()) :: boolean()+ def removable?(layout, email) do+ verify_removable(layout, email) == :ok+ end++ @spec sorted_for_display(t()) :: [{String.t(), Entry.t()}]+ def sorted_for_display(layout) do+ layout+ |> Enum.reject(fn {_, entry} -> entry.queued_op == :delete end)+ |> Enum.sort_by(fn {email, entry} ->+ primary_criterion =+ case entry do+ %{role: :guest, type: :invitation_pending} -> 10+ %{role: :guest, type: :invitation_sent} -> 11+ %{role: :guest, type: :membership} -> 12+ %{type: :invitation_pending} -> 0+ %{type: :invitation_sent} -> 1+ %{type: :membership} -> 2+ end++ secondary_criterion = entry.name+ tertiary_criterion = email+ {primary_criterion, secondary_criterion, tertiary_criterion}+ end)+ end++ @spec persist(t(), %{current_user: User.t(), my_team: Teams.Team.t()}) ::+ {:ok, integer()} | {:error, any()}+ def persist(layout, context) do+ result =+ Repo.transaction(fn ->+ if not context.my_team.setup_complete do+ context.my_team+ |> Teams.Team.setup_changeset()+ |> Repo.update!()+ end++ layout+ |> sorted_for_persistence()+ |> Enum.reduce([], fn {_, entry}, acc ->+ persist_entry(entry, context, acc)+ end)+ end)++ case result do+ {:ok, persisted} ->+ persisted+ |> Enum.each(fn+ {%Entry{type: :invitation_pending}, invitation} ->+ invitee = Plausible.Auth.find_user_by(email: invitation.email)+ Teams.Invitations.InviteToTeam.send_invitation_email(invitation, invitee)++ {%Entry{type: :membership, queued_op: :delete}, team_membership} ->+ Teams.Memberships.Remove.send_team_member_removed_email(team_membership)++ _ ->+ :noop+ end)++ {:ok, length(persisted)}++ {:error, _} = error ->+ error+ end+ end++ defp sorted_for_persistence(layout) do+ # sort by deletions first, so team member limits are triggered accurately+ Enum.sort_by(layout, fn {_email, entry} ->+ case entry.queued_op do+ :delete -> 0+ _ -> 1+ end+ end)+ end++ defp ensure_at_least_one_owner(layout, email) do+ if Enum.find(layout, fn {_email, entry} ->+ entry.email != email and+ entry.role == :owner and+ entry.type == :membership and+ entry.queued_op != :delete+ end),+ do: :ok,+ else: {:error, "The team has to have at least one owner"}+ end++ def persist_entry(entry, context, acc) do+ case Entry.persist(entry, context) do+ {:ok, :ignore} -> acc+ {:ok, persist_result} -> [{entry, persist_result} | acc]+ {:error, error} -> Repo.rollback(error)+ end+ end+enddiff --git a/lib/plausible/teams/management/layout/entry.ex b/lib/plausible/teams/management/layout/entry.exnew file mode 100644index 0000000000..9b25c49e82--- /dev/null+++ b/lib/plausible/teams/management/layout/entry.ex@@ -0,0 +1,120 @@+defmodule Plausible.Teams.Management.Layout.Entry do+ @moduledoc """+ Module representing a single Team Layout element and all its state+ transitions, including persistence options.+ """+ alias Plausible.Teams++ defstruct [:email, :name, :role, :type, :meta, :queued_op]++ @type t() :: %__MODULE__{}++ @spec new(Teams.Invitation.t() | Teams.Membership.t(), Keyword.t()) :: t()+ def new(object, attrs \\ [])++ def new(+ %Teams.Invitation{id: existing} = invitation,+ attrs+ )+ when is_integer(existing) do+ %__MODULE__{+ name: "Invited User",+ email: invitation.email,+ role: invitation.role,+ type: :invitation_sent,+ meta: invitation+ }+ |> Map.merge(Enum.into(attrs, %{}))+ end++ def new(%Teams.Invitation{id: nil} = pending, attrs) do+ %__MODULE__{+ name: "Invited User",+ email: pending.email,+ role: pending.role,+ type: :invitation_pending,+ meta: pending+ }+ |> Map.merge(Enum.into(attrs, %{}))+ end++ def new(%Teams.Membership{} = membership, attrs) do+ %__MODULE__{+ name: membership.user.name,+ role: membership.role,+ email: membership.user.email,+ type: :membership,+ meta: membership+ }+ |> Map.merge(Enum.into(attrs, %{}))+ end++ @spec patch(t(), Keyword.t()) :: t()+ def patch(%__MODULE__{} = entry, attrs) do+ struct!(entry, attrs)+ end++ @spec persist(t(), map()) ::+ {:ok, :ignore | Teams.Invitation.t() | Teams.Membership.t()} | {:error, any()}+ def persist(%__MODULE__{queued_op: nil}, _context) do+ {:ok, :ignore}+ end++ def persist(%__MODULE__{type: :invitation_pending, queued_op: :delete}, _context) do+ {:ok, :ignore}+ end++ def persist(+ %__MODULE__{email: email, role: role, type: :invitation_pending, queued_op: op},+ context+ )+ when op in [:update, :send] do+ Teams.Invitations.InviteToTeam.invite(context.my_team, context.current_user, email, role,+ send_email?: false+ )+ end++ def persist(+ %__MODULE__{type: :invitation_sent, email: email, role: role, queued_op: :update},+ context+ ) do+ Teams.Invitations.InviteToTeam.invite(context.my_team, context.current_user, email, role,+ send_email?: false+ )+ end++ def persist(+ %__MODULE__{type: :invitation_sent, queued_op: :delete, meta: meta},+ context+ ) do+ Plausible.Teams.Invitations.Remove.remove(+ context.my_team,+ meta.invitation_id,+ context.current_user+ )+ end++ def persist(+ %__MODULE__{type: :membership, queued_op: :delete, meta: meta},+ context+ ) do+ Plausible.Teams.Memberships.Remove.remove(+ context.my_team,+ meta.user.id,+ context.current_user,+ send_email?: false+ )+ end++ def persist(+ %__MODULE__{type: :membership, queued_op: :update, role: role, meta: meta},+ context+ ) do+ Plausible.Teams.Memberships.UpdateRole.update(+ context.my_team,+ meta.user.id,+ "#{role}",+ context.current_user+ )+ end+enddiff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.exindex 41d4c5fee6..31e466fae3 100644--- a/lib/plausible/teams/memberships.ex+++ b/lib/plausible/teams/memberships.ex@@ -7,6 +7,17 @@ defmodule Plausible.Teams.Memberships doalias Plausible.Repoalias Plausible.Teams+ def all(team) do+ query =+ from tm in Teams.Membership,+ inner_join: u in assoc(tm, :user),+ where: tm.team_id == ^team.id,+ order_by: [asc: u.id],+ preload: [user: u]++ Repo.all(query)+ end+def all_pending_site_transfers(email) do|> pending_site_transfers_query()diff --git a/lib/plausible/teams/memberships/remove.ex b/lib/plausible/teams/memberships/remove.exindex 9aa1562e2c..7ba440884d 100644--- a/lib/plausible/teams/memberships/remove.ex+++ b/lib/plausible/teams/memberships/remove.ex@@ -8,14 +8,17 @@ defmodule Plausible.Teams.Memberships.Remove dodef remove(nil, _, _), do: {:error, :permission_denied}- def remove(team, user_id, current_user) do+ def remove(team, user_id, current_user, opts \\ []) dowith {:ok, team_membership} <- Memberships.get_team_membership(team, user_id),{:ok, current_user_role} <- Memberships.team_role(team, current_user),:ok <- check_can_remove_membership(current_user_role, team_membership.role),:ok <- check_owner_can_get_removed(team, team_membership.role) doteam_membership = Repo.preload(team_membership, [:team, :user])Repo.delete!(team_membership)- send_team_member_removed_email(team_membership)++ if Keyword.get(opts, :send_email?, true) do+ send_team_member_removed_email(team_membership)+ end{:ok, team_membership}end@@ -35,7 +38,7 @@ defmodule Plausible.Teams.Memberships.Remove dodefp check_owner_can_get_removed(_team, _role), do: :ok- defp send_team_member_removed_email(team_membership) do+ def send_team_member_removed_email(team_membership) doteam_membership|> PlausibleWeb.Email.team_member_removed()|> Plausible.Mailer.send()diff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.exindex 956f89ed9b..6f0294eb3d 100644--- a/lib/plausible/teams/memberships/update_role.ex+++ b/lib/plausible/teams/memberships/update_role.ex@@ -30,6 +30,8 @@ defmodule Plausible.Teams.Memberships.UpdateRole do|> Repo.update!()|> Repo.preload(:user)+ :ok = maybe_prune_guest_memberships(team_membership)+{:ok, team_membership}endend@@ -86,4 +88,15 @@ defmodule Plausible.Teams.Memberships.UpdateRole dodefp can_grant_role_to_other?(:admin, :viewer, :editor), do: truedefp can_grant_role_to_other?(:admin, :viewer, :viewer), do: truedefp can_grant_role_to_other?(_, _, _), do: false++ defp maybe_prune_guest_memberships(%Teams.Membership{role: :guest}),+ do: :ok++ defp maybe_prune_guest_memberships(%Teams.Membership{} = team_membership) do+ team_membership+ |> Ecto.assoc(:guest_memberships)+ |> Repo.delete_all()++ :ok+ endenddiff --git a/lib/plausible/teams/team.ex b/lib/plausible/teams/team.exindex ef4fe82b16..78d74e9afe 100644--- a/lib/plausible/teams/team.ex+++ b/lib/plausible/teams/team.ex@@ -63,9 +63,7 @@ defmodule Plausible.Teams.Team do|> validate_required(:name)end- def setup_changeset(team) do- now = NaiveDateTime.utc_now(:second)-+ def setup_changeset(team, now \\ NaiveDateTime.utc_now(:second)) doteam|> change(setup_complete: true,diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.exindex 587d86c8b5..513d32cad3 100644--- a/lib/plausible_web/components/generic.ex+++ b/lib/plausible_web/components/generic.ex@@ -222,6 +222,7 @@ defmodule PlausibleWeb.Components.Generic doendattr :class, :string, default: ""+ attr :id, :string, default: nilslot :button, required: true doattr(:class, :string)@@ -236,11 +237,17 @@ defmodule PlausibleWeb.Components.Generic do~H"""<div+ id={@id}x-data="dropdown"x-on:keydown.escape.prevent.stop="close($refs.button)"class="relative inline-block text-left">- <button x-ref="button" x-on:click="toggle()" type="button" class={List.first(@button).class}>+ <button+ x-ref="button"+ x-on:click="toggle()"+ type="button"+ class={["py-2.5", List.first(@button).class]}+ >{render_slot(List.first(@button))}</button><div@@ -255,7 +262,7 @@ defmodule PlausibleWeb.Components.Generic dox-on:click.outside="close($refs.button)"style="display: none;"class={[- "origin-top-right absolute z-50 right-0 mt-2 p-1 w-max rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none",+ "origin-top-right absolute z-50 right-0 mt-2 p-1.5 w-max rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none",@menu_class]}>@@ -267,6 +274,7 @@ defmodule PlausibleWeb.Components.Generic doattr(:href, :string)attr(:class, :string, default: "")+ attr(:id, :string, default: nil)attr(:new_tab, :boolean, default: false)attr(:disabled, :boolean, default: false)attr(:rest, :global, include: ~w(method))@@ -287,6 +295,7 @@ defmodule PlausibleWeb.Components.Generic do~H"""<.unstyled_link+ id={@id}class={@class}new_tab={@new_tab}href={@href}diff --git a/lib/plausible_web/controllers/settings_controller.ex b/lib/plausible_web/controllers/settings_controller.exindex b47c912319..116b971181 100644--- a/lib/plausible_web/controllers/settings_controller.ex+++ b/lib/plausible_web/controllers/settings_controller.ex@@ -40,7 +40,8 @@ defmodule PlausibleWeb.SettingsController dorender(conn, :team_general,team_name_changeset: name_changeset,- layout: {PlausibleWeb.LayoutView, :settings}+ layout: {PlausibleWeb.LayoutView, :settings},+ connect_live_socket: true)enddiff --git a/lib/plausible_web/live/components/combo_box.ex b/lib/plausible_web/live/components/combo_box.exindex cd777dec47..8d2cde417e 100644--- a/lib/plausible_web/live/components/combo_box.ex+++ b/lib/plausible_web/live/components/combo_box.ex@@ -106,7 +106,7 @@ defmodule PlausibleWeb.Live.Components.ComboBox dophx-target={@myself}phx-debounce={200}value={@display_value}- class="text-sm [&.phx-change-loading+svg.spinner]:block border-none py-1 px-1 p-0 w-full inline-block rounded-md focus:outline-none focus:ring-0"+ class="text-sm [&.phx-change-loading+svg.spinner]:block border-none py-1.5 px-1.5 w-full inline-block rounded-md focus:outline-none focus:ring-0"style="background-color: inherit;"required={@required}/>diff --git a/lib/plausible_web/live/components/form.ex b/lib/plausible_web/live/components/form.exindex 53596fbd58..933865fc1f 100644--- a/lib/plausible_web/live/components/form.ex+++ b/lib/plausible_web/live/components/form.ex@@ -18,7 +18,7 @@ defmodule PlausibleWeb.Live.Components.Form do<.input name="my-input" errors={["oh no!"]} />"""- @default_input_class "text-sm text-gray-900 dark:text-white dark:bg-gray-900 block pl-3.5 py-2 border-gray-300 dark:border-gray-500 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 rounded-md"+ @default_input_class "text-sm text-gray-900 dark:text-white dark:bg-gray-900 block pl-3.5 py-2.5 border-gray-300 dark:border-gray-500 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 rounded-md"attr(:id, :any, default: nil)attr(:name, :any)@@ -396,7 +396,7 @@ defmodule PlausibleWeb.Live.Components.Form dotype="select"options={@options}onchange={"if (event.target.value) { location.href = '#{@href_base}' + event.target.value }"}- class="dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 rounded-md dark:text-gray-100"+ class="dark:bg-gray-800 mt-1 block w-full pl-3.5 pr-10 py-2.5 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 rounded-md dark:text-gray-100"/></.form>"""diff --git a/lib/plausible_web/live/components/team.ex b/lib/plausible_web/live/components/team.exnew file mode 100644index 0000000000..002992c671--- /dev/null+++ b/lib/plausible_web/live/components/team.ex@@ -0,0 +1,178 @@+defmodule PlausibleWeb.Live.Components.Team do+ @moduledoc """+ Shared component base for listing team members/invitations+ alongside with the role dropdown.+ """+ use PlausibleWeb, :component+ import PlausibleWeb.Components.Generic++ alias Plausible.Auth.User++ attr(:user, User, required: true)+ attr(:label, :string, default: nil)+ attr(:role, :atom, default: nil)+ attr(:my_role, :atom, required: true)+ attr(:disabled, :boolean, default: false)+ attr(:remove_disabled, :boolean, default: false)++ def member(assigns) do+ ~H"""+ <div+ class="mt-4"+ id={"member-row-#{:erlang.phash2(@user.email)}"}+ data-test-kind={if @role == :guest, do: "guest", else: "member"}+ data-role-changed={+ JS.show(+ transition: {"duration-500", "opacity-0 shadow-2xl -translate-y-6", "opacity-100 shadow"},+ time: 400+ )+ }+ >+ <div class="flex items-center gap-x-5">+ <img src={User.profile_img_url(@user)} class="w-7 rounded-full bg-gray-300" />+ <span class="text-sm">+ {@user.name}+ <span+ :if={@label}+ class="ml-1 dark:bg-indigo-600 dark:text-gray-200 bg-gray-100 text-gray-500 text-xs px-1 rounded"+ >+ {@label}+ </span>++ <br /><span class="text-gray-500 text-xs">{@user.email}</span>+ </span>+ <div class="flex-1 text-right">+ <.dropdown id={"role-dropdown-#{@user.email}"}>+ <:button class="role bg-transparent text-gray-800 dark:text-gray-100 hover:bg-gray-50 dark:hover:bg-gray-700 focus-visible:outline-gray-100 whitespace-nowrap truncate inline-flex items-center gap-x-2 font-medium rounded-md px-3.5 py-2.5 text-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 disabled:bg-gray-400 dark:disabled:text-white dark:disabled:text-gray-400 dark:disabled:bg-gray-700">+ {@role |> to_string() |> String.capitalize()}+ <Heroicons.chevron_down mini class="size-4 mt-0.5" />+ </:button>+ <:menu class="dropdown-items max-w-60">+ <.role_item+ user={@user}+ id={"option-#{:erlang.phash2(@user.email)}-owner"}+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ role={:owner}+ disabled={@disabled or @role == :owner}+ dispatch_animation?={@role == :guest}+ >+ Manage the team without restrictions+ </.role_item>+ <.role_item+ user={@user}+ id={"option-#{:erlang.phash2(@user.email)}-admin"}+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ role={:admin}+ disabled={@disabled or @role == :admin}+ dispatch_animation?={@role == :guest}+ >+ Manage all team settings+ </.role_item>+ <.role_item+ user={@user}+ id={"option-#{:erlang.phash2(@user.email)}-editor"}+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ role={:editor}+ disabled={@disabled or @role == :editor}+ dispatch_animation?={@role == :guest}+ >+ Create and view new sites+ </.role_item>+ <.role_item+ user={@user}+ id={"option-#{:erlang.phash2(@user.email)}-billing"}+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ role={:billing}+ disabled={@disabled or @role == :billing}+ dispatch_animation?={@role == :guest}+ >+ Manage subscription+ </.role_item>+ <.role_item+ user={@user}+ id={"option-#{:erlang.phash2(@user.email)}-viewer"}+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ role={:viewer}+ disabled={@disabled or @role == :viewer}+ dispatch_animation?={@role == :guest}+ >+ View all sites under your team+ </.role_item>+ <.dropdown_divider />+ <.dropdown_item+ id={"#{:erlang.phash2(@user.email)}-remove"}+ href="#"+ disabled={@disabled or @remove_disabled}+ phx-click="remove-member"+ phx-value-email={@user.email}+ phx-value-name={@user.name}+ >+ <div class={+ not @remove_disabled &&+ "text-red-600 hover:text-red-600 dark:text-red-500 hover:dark:text-red-400"+ }>+ Remove member+ </div>+ <div class="text-gray-500 dark:text-gray-400 text-xs/5">+ Remove member from your team+ </div>+ </.dropdown_item>+ </:menu>+ </.dropdown>+ </div>+ </div>+ </div>+ """+ end++ attr(:role, :atom, required: true)+ attr(:disabled, :boolean, default: false)+ attr(:dispatch_animation?, :boolean, default: false)+ attr(:rest, :global)+ attr(:user, :map, default: %{email: nil})+ attr(:id, :string, default: nil)++ slot(:inner_block, required: true)++ def role_item(assigns) do+ click =+ cond do+ phx_click = assigns.rest[:"phx-click"] ->+ phx_click++ assigns.dispatch_animation? ->+ JS.hide(+ transition: {"duration-500", "opacity-100", "opacity-0"},+ to: "#member-row-#{:erlang.phash2(assigns.user.email)}",+ time: 500+ )+ |> JS.push("update-role")++ true ->+ "update-role"+ end++ assigns = assign(assigns, :click, click)++ ~H"""+ <.dropdown_item+ id={@id}+ href="#"+ phx-click={@click}+ phx-value-role={@role}+ disabled={@disabled}+ {@rest}+ >+ <div>{@role |> Atom.to_string() |> String.capitalize()}</div>+ <div class="text-gray-500 dark:text-gray-400 text-xs/5">+ {render_slot(@inner_block)}+ </div>+ </.dropdown_item>+ """+ end+enddiff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex 3eaa466770..0ffbb1855b 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -18,7 +18,7 @@ defmodule PlausibleWeb.Live.Sites do|> assign(:uri, uri)|> assign(:team_invitations,- Plausible.Teams.Invitations.find_team_invitations(socket.assigns.current_user)+ Plausible.Teams.Invitations.all(socket.assigns.current_user))|> assign(:filter_text, params["filter_text"] || "")diff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exnew file mode 100644index 0000000000..0dd1ce1dfc--- /dev/null+++ b/lib/plausible_web/live/team_management.ex@@ -0,0 +1,324 @@+defmodule PlausibleWeb.Live.TeamManagement do+ @moduledoc """+ Live view for enqueuing and applying team membership adjustments.+ """+ use PlausibleWeb, :live_view++ alias Plausible.Teams+ alias Plausible.Auth.User+ import PlausibleWeb.Live.Components.Team++ alias Plausible.Teams.Management.Layout++ def mount(_params, session, socket) do+ mode =+ if session["mode"] == "team-setup" do+ :team_setup+ else+ :team_management+ end++ {:ok, socket |> assign(mode: mode) |> reset()}+ end++ defp reset(%{assigns: %{current_user: current_user, my_team: my_team}} = socket) do+ {:ok, my_role} = Teams.Memberships.team_role(my_team, current_user)++ if my_role not in [:owner, :admin] do+ redirect(socket, to: Routes.settings_path(socket, :team_general))+ else+ layout = Layout.init(my_team)+ team_members_limit = Plausible.Teams.Billing.team_member_limit(my_team)++ assign(socket,+ attempted_save?: false,+ team_members_limit: team_members_limit,+ layout: layout,+ my_role: my_role,+ team_layout_changed?: false,+ input_role: :viewer,+ input_email: ""+ )+ end+ end++ def render(assigns) do+ ~H"""+ <.flash_messages flash={@flash} />++ <PlausibleWeb.Components.Billing.Notice.limit_exceeded+ :if={+ (not @team_layout_changed? or @attempted_save?) and+ not Plausible.Billing.Quota.below_limit?(+ Layout.active_count(@layout) - 1,+ @team_members_limit+ )+ }+ current_user={@current_user}+ billable_user={@current_user}+ current_team={@my_team}+ limit={@team_members_limit}+ resource="team members"+ class="mb-4"+ />+ <div>+ <.form id="team-layout-form" for={} phx-submit="input-invitation" phx-change="form-changed">+ <div class="flex gap-x-3 mb-8">+ <div class="flex-1">+ <.input+ name="input-email"+ type="email"+ value={@input_email}+ placeholder="Enter e-mail to send invitation to"+ phx-debounce={200}+ mt?={false}+ />+ </div>++ <.dropdown id="input-role-picker">+ <:button class="role border rounded border-indigo-700 bg-transparent text-gray-800 dark:text-gray-100 hover:bg-gray-50 dark:hover:bg-gray-700 focus-visible:outline-gray-100 whitespace-nowrap truncate inline-flex items-center gap-x-2 font-medium rounded-md px-3 py-2 text-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 disabled:bg-gray-400 dark:disabled:text-white dark:disabled:text-gray-400 dark:disabled:bg-gray-700">+ {@input_role |> Atom.to_string() |> String.capitalize()}+ <Heroicons.chevron_down mini class="size-4 mt-0.5" />+ </:button>+ <:menu class="dropdown-items max-w-60">+ <.role_item role={:owner} disabled={@my_role != :owner} phx-click="switch-role">+ Manage the team without restrictions+ </.role_item>+ <.role_item+ role={:admin}+ disabled={@my_role not in [:owner, :admin]}+ phx-click="switch-role"+ >+ Manage all team settings+ </.role_item>+ <.role_item+ role={:editor}+ disabled={@my_role not in [:owner, :admin]}+ phx-click="switch-role"+ >+ Create and view new sites+ </.role_item>+ <.role_item+ role={:billing}+ disabled={@my_role not in [:owner, :admin]}+ phx-click="switch-role"+ >+ Manage subscription+ </.role_item>+ <.role_item+ role={:viewer}+ disabled={@my_role not in [:owner, :admin]}+ phx-click="switch-role"+ >+ View all sites under your team+ </.role_item>+ </:menu>+ </.dropdown>++ <.button id="invite-member" type="submit" mt?={false}>+ Invite+ </.button>+ </div>+ </.form>++ <div id="member-list">+ <.member+ :for={{email, entry} <- Layout.sorted_for_display(@layout)}+ :if={entry.role != :guest}+ user={%User{email: entry.email, name: entry.name}}+ role={entry.role}+ label={entry_label(entry, @current_user)}+ my_role={@my_role}+ remove_disabled={not Layout.removable?(@layout, email)}+ disabled={entry.role == :owner && Layout.owners_count(@layout) == 1}+ />+ </div>++ <div :if={Layout.has_guests?(@layout)} class="flex items-center mt-4 mb-4" id="guests-hr">+ <hr class="flex-grow border-t border-gray-200 dark:border-gray-600" />+ <span class="mx-4 text-gray-500 text-sm">+ Guests+ </span>+ <hr class="flex-grow border-t border-gray-200 dark:border-gray-600" />+ </div>++ <div :if={Layout.has_guests?(@layout)} id="guest-list">+ <.member+ :for={{email, entry} <- Layout.sorted_for_display(@layout)}+ :if={entry.role == :guest}+ user={%User{email: entry.email, name: entry.name}}+ role={entry.role}+ label={entry_label(entry, @current_user)}+ my_role={@my_role}+ remove_disabled={not Layout.removable?(@layout, email)}+ />+ </div>++ <.button+ :if={@mode == :team_setup}+ id="save-layout"+ type="submit"+ phx-click="save-team-layout"+ class="mt-8 w-full"+ >+ Create Team+ </.button>+ </div>+ """+ end++ @roles Plausible.Teams.Membership.roles() -- [:guest]+ @roles_cast_map Enum.into(@roles, %{}, fn role -> {to_string(role), role} end)++ def handle_event("form-changed", params, socket) do+ {:noreply, assign(socket, input_email: params["input-email"])}+ end++ def handle_event("switch-role", %{"role" => role}, socket) do+ socket = assign(socket, input_role: Map.fetch!(@roles_cast_map, role))+ {:noreply, socket}+ end++ def handle_event(+ "input-invitation",+ %{"input-email" => email},+ %{assigns: %{layout: layout, input_role: role}} = socket+ ) do+ email = String.trim(email)++ existing_entry = Map.get(layout, email)++ socket =+ cond do+ existing_entry && existing_entry.queued_op == :delete ->+ # bring back previously deleted entry (either invitation or membership), and only update role+ socket+ |> update_layout(Layout.update_role(layout, email, role))+ |> assign(input_email: "")++ existing_entry ->+ # trying to add e-mail that's already in the layout+ socket+ |> assign(input_email: email)+ |> put_live_flash(+ :error,+ "Make sure the e-mail is valid and is not taken already in your team layout"+ )++ valid_email?(email) ->+ socket+ |> update_layout(Layout.schedule_send(layout, email, role))+ |> assign(input_email: "")++ true ->+ socket+ |> assign(input_email: email)+ |> put_live_flash(+ :error,+ "Make sure the e-mail is valid and is not taken already in your team layout"+ )+ end++ {:noreply, socket}+ end++ def handle_event(+ "save-team-layout",+ _params,+ socket+ ) do+ socket = save_team_layout(socket)++ {:noreply, socket}+ end++ def handle_event("remove-member", %{"email" => email}, %{assigns: %{layout: layout}} = socket) do+ socket =+ case Layout.verify_removable(layout, email) do+ :ok ->+ update_layout(socket, Layout.schedule_delete(layout, email))++ {:error, message} ->+ socket+ |> put_live_flash(+ :error,+ message+ )+ end++ {:noreply, socket}+ end++ def handle_event(+ "update-role",+ %{"email" => email, "role" => role},+ %{assigns: %{layout: layout}} = socket+ ) do+ socket =+ update_layout(socket, Layout.update_role(layout, email, Map.fetch!(@roles_cast_map, role)))+ |> push_event("js-exec", %{+ to: "#member-row-#{:erlang.phash2(email)}",+ attr: "data-role-changed"+ })++ {:noreply, socket}+ end++ defp valid_email?(email) do+ String.contains?(email, "@") and String.contains?(email, ".")+ end++ defp update_layout(socket, layout) do+ socket =+ assign(socket,+ layout: layout,+ team_layout_changed?: true+ )++ if socket.assigns.mode == :team_management do+ save_team_layout(socket)+ else+ socket+ end+ end++ defp save_team_layout(+ %{assigns: %{layout: layout, my_team: my_team, current_user: current_user}} = socket+ ) do+ result = Layout.persist(layout, %{current_user: current_user, my_team: my_team})++ socket = assign(socket, attempted_save?: true)++ case {result, socket.assigns.mode} do+ {{:ok, _}, :team_setup} ->+ socket+ |> put_flash(:success, "Your team is now setup")+ |> redirect(to: Routes.settings_path(socket, :team_general))++ {{:ok, _}, :team_management} ->+ socket+ |> reset()+ |> put_live_flash(:success, "Team layout updated successfully")++ {{:error, :only_one_owner}, _} ->+ socket+ |> put_live_flash(+ :error,+ "The team has to have at least one owner"+ )++ {{:error, {:over_limit, limit}}, _} ->+ socket+ |> put_live_flash(+ :error,+ "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit"+ )+ end+ end++ defp entry_label(%Layout.Entry{role: :guest, type: :membership}, _), do: nil+ defp entry_label(%Layout.Entry{type: :invitation_pending}, _), do: "Invitation Pending"+ defp entry_label(%Layout.Entry{type: :invitation_sent}, _), do: "Invitation Sent"+ defp entry_label(%Layout.Entry{meta: %{user: %{id: id}}}, %{id: id}), do: "You"+ defp entry_label(_, _), do: "Team Member"+enddiff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.exindex a33a43ea3c..7503bc9ca7 100644--- a/lib/plausible_web/live/team_setup.ex+++ b/lib/plausible_web/live/team_setup.ex@@ -7,10 +7,7 @@ defmodule PlausibleWeb.Live.TeamSetup doalias Plausible.Repoalias Plausible.Teams- alias PlausibleWeb.Live.Components.ComboBox- alias Plausible.Teams.Invitations.Candidates- alias Plausible.Auth.User-+ alias Plausible.Teams.Management.Layoutalias PlausibleWeb.Router.Helpers, as: Routesdef mount(params, _session, socket) do@@ -26,20 +23,13 @@ defmodule PlausibleWeb.Live.TeamSetup do|> redirect(to: Routes.settings_path(socket, :team_general)){true, %Teams.Team{}, _} ->- all_candidates =- my_team- |> Candidates.search_site_guests("")- |> Enum.map(fn user ->- {user.email, "#{user.name} <#{user.email}>"}- end)-- candidates_selected = %{}team_name_changeset = Teams.Team.name_changeset(my_team)+ layout = Layout.init(my_team)+assign(socket,- all_candidates: all_candidates,team_name_changeset: team_name_changeset,- candidates_selected: candidates_selected+ team_layout: layout){false, _, _} ->@@ -48,199 +38,50 @@ defmodule PlausibleWeb.Live.TeamSetup do|> redirect(to: Routes.site_path(socket, :index))end- {:ok, socket}- end+ socket =+ if my_team do+ {:ok, my_role} = Teams.Memberships.team_role(my_team, socket.assigns.current_user)+ assign(socket, my_role: my_role)+ else+ socket+ end- def handle_params(_params, _uri, socket) do- {:noreply, socket}+ {:ok, socket}enddef render(assigns) do~H"""- <.flash_messages flash={@flash} /><.focus_box><:title>Create a new team</:title><:subtitle>Add members and assign roles to manage different sites access efficiently</:subtitle>- <.form :let={f} for={@team_name_changeset} method="post" phx-change="update-team">+ <.form+ :let={f}+ for={@team_name_changeset}+ method="post"+ phx-change="update-team"+ id="update-team-form"+ class="mt-4 mb-8"+ ><.input type="text" field={f[:name]} label="Name" width="w-full" phx-debounce="500" />-- <div class="mt-4">- <.label>- Add members- </.label>-- <.live_component- id="team-member-candidates"- submit_name="team-member-candidate"- class="py-2"- module={ComboBox}- clear_on_select- creatable- creatable_prompt="Send invitation to email:"- placeholder="Select existing member or type email address to invite"- options={reject_already_selected(@all_candidates, @candidates_selected)}- on_selection_made={- fn email, _by_id ->- send(self(), {:candidate_selected, %{email: email, role: :viewer}})- end- }- suggest_fun={- fn input, _options ->- exclude_emails =- Enum.map(@candidates_selected, fn {{email, _}, _} -> email end)-- @my_team- |> Candidates.search_site_guests(input, exclude: exclude_emails)- |> Enum.map(fn user -> {user.email, "#{user.name} <#{user.email}>"} end)- end- }- />- </div></.form>- <.member user={@current_user} role={:owner} you?={true} />-- <%= for {{email, name}, role} <- @candidates_selected do %>- <.member user={%User{email: email, name: name}} role={role} />- <% end %>-- <:footer>- <.button phx-click="setup-team" type="submit" mt?={false} class="w-full">- Create team- </.button>- </:footer>+ <.label class="mb-2">+ Team Members+ </.label>+ {live_render(@socket, PlausibleWeb.Live.TeamManagement,+ id: "team-management-setup",+ container: {:div, id: "team-setup"},+ session: %{+ "mode" => "team-setup"+ }+ )}</.focus_box>"""end- attr :user, User, required: true- attr :you?, :boolean, default: false- attr :role, :atom, default: nil-- def member(assigns) do- ~H"""- <div class="member mt-4">- <div class="flex items-center gap-x-5">- <img src={User.profile_img_url(@user)} class="w-7 rounded-full" />- <span class="text-sm">- {@user.name}- <span- :if={@you?}- class="ml-1 dark:bg-indigo-600 dark:text-gray-200 bg-gray-100 text-gray-500 text-xs px-1 rounded"- >- You- </span>-- <br /><span class="text-gray-500 text-xs">{@user.email}</span>- </span>- <div class="flex-1 text-right">- <.dropdown class="relative">- <:button class="role bg-transparent text-gray-800 dark:text-gray-100 hover:bg-gray-50 dark:hover:bg-gray-700 focus-visible:outline-gray-100 whitespace-nowrap truncate inline-flex items-center gap-x-2 font-medium rounded-md px-3.5 py-2.5 text-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 disabled:bg-gray-400 dark:disabled:text-white dark:disabled:text-gray-400 dark:disabled:bg-gray-700">- {@role |> to_string() |> String.capitalize()}- <Heroicons.chevron_down mini class="size-4 mt-0.5" />- </:button>- <:menu class="dropdown-items max-w-60">- <.dropdown_item- href="#"- disabled={@you? or @role == :admin}- phx-click="update-role"- phx-value-role={:admin}- phx-value-email={@user.email}- phx-value-name={@user.name}- >- <div>Admin</div>- <div class="text-gray-500 dark:text-gray-400 text-xs/5">- Manage all team settings- </div>- </.dropdown_item>-- <.dropdown_item- href="#"- disabled={@you? or @role == :editor}- phx-click="update-role"- phx-value-role={:editor}- phx-value-email={@user.email}- phx-value-name={@user.name}- >- <div>Editor</div>- <div class="text-gray-500 dark:text-gray-400 text-xs/5">- Create and view new sites- </div>- </.dropdown_item>-- <.dropdown_item- href="#"- disabled={@you? or @role == :viewer}- phx-click="update-role"- phx-value-role={:viewer}- phx-value-email={@user.email}- phx-value-name={@user.name}- >- <div>Viewer</div>- <div class="text-gray-500 dark:text-gray-400 text-xs/5">- Can only view all sites under your team- </div>- </.dropdown_item>-- <.dropdown_divider />- <.dropdown_item- href="#"- disabled={@you?}- phx-click="remove-member"- phx-value-email={@user.email}- phx-value-name={@user.name}- >- <div class="text-red-600 hover:text-red-600 dark:text-red-500 hover:dark:text-red-400">- Remove member- </div>- <div class="text-gray-500 dark:text-gray-400 text-xs/5">- Remove member from your team- </div>- </.dropdown_item>- </:menu>- </.dropdown>- </div>- </div>- </div>- """- end-- def handle_info(- {:candidate_selected, %{email: email, role: role}},- %{assigns: %{my_team: team, candidates_selected: candidates, current_user: current_user}} =- socket- ) do- socket =- case Candidates.get_site_guest(team, email) do- %User{} = user ->- assign(- socket,- :candidates_selected,- Map.put(candidates, {user.email, user.name}, role)- )-- nil ->- if valid_email?(email) and email != current_user.email do- assign(- socket,- :candidates_selected,- Map.put(candidates, {email, "Invited User"}, role)- )- else- put_live_flash(- socket,- :error,- "Sorry, e-mail '#{email}' is invalid. Please type the address again."- )- end- end-- {:noreply, socket}- end-def handle_event("update-team", %{"team" => params}, socket) doteam_name_changeset =socket.assigns.my_team@@ -258,55 +99,4 @@ defmodule PlausibleWeb.Live.TeamSetup do{:noreply, socket}endend-- def handle_event("update-role", %{"name" => name, "email" => email, "role" => role}, socket) do- updated_candidates =- Map.put(socket.assigns.candidates_selected, {email, name}, String.to_existing_atom(role))-- {:noreply, assign(socket, candidates_selected: updated_candidates)}- end-- def handle_event("remove-member", %{"name" => name, "email" => email}, socket) do- updated_candidates = Map.delete(socket.assigns.candidates_selected, {email, name})- {:noreply, assign(socket, candidates_selected: updated_candidates)}- end-- def handle_event("setup-team", %{}, socket) do- candidates = socket.assigns.candidates_selected- team = socket.assigns.my_team-- case Teams.setup_team(team, candidates) do- {:ok, _invitations} ->- socket =- socket- |> put_flash(:success, "Your team is now setup")- |> redirect(to: Routes.settings_path(socket, :team_general))-- {:noreply, socket}-- {:error, {:over_limit, limit}} ->- socket =- socket- |> put_live_flash(- :error,- "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit."- )-- {:noreply, socket}- end- end-- defp valid_email?(email) do- String.contains?(email, "@") and String.contains?(email, ".")- end-- defp reject_already_selected(candidates, candidates_selected) do- candidates- |> Enum.reject(fn {email, _} ->- Enum.find(candidates_selected, fn- {{^email, _}, _} -> true- _ -> false- end)- end)- endenddiff --git a/lib/plausible_web/templates/layout/settings.html.heex b/lib/plausible_web/templates/layout/settings.html.heexindex 3b5c3c0140..15c02bc076 100644--- a/lib/plausible_web/templates/layout/settings.html.heex+++ b/lib/plausible_web/templates/layout/settings.html.heex@@ -36,7 +36,7 @@<% end %></div>- <div :if={Plausible.Teams.enabled?(@my_team)}>+ <div :if={Plausible.Teams.enabled?(@my_team) and @my_team.setup_complete}><div class="mb-4 mt-4 hidden lg:block"><h3 class="uppercase text-sm text-indigo-600 font-semibold">Team Settings</h3><p class="text-xs dark:text-gray-400 truncate">{@my_team.name}</p>diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex bbd038d66b..eb5e4c7426 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -19,4 +19,16 @@</.button></.form></.tile>+ <.tile>+ <:title>+ <a id="team-members">Team Members</a>+ </:title>+ <:subtitle>+ Add, remove or change your team memberships+ </:subtitle>+ {live_render(@conn, PlausibleWeb.Live.TeamManagement,+ id: "team-setup",+ session: %{"mode" => "team-management"}+ )}+ </.tile></.settings_tiles>diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex b/lib/plausible_web/templates/site/membership/invite_member_form.html.heexindex 34a2ca02f8..359d6046c9 100644--- a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex+++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.heex@@ -1,6 +1,6 @@<.focus_box><:title>- Invite member to {@site.domain}+ Invite guest to {@site.domain}</:title><:subtitle>diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex d5c540942a..3d77b62a5d 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -12,7 +12,7 @@mt?={false}href={Routes.membership_path(@conn, :invite_member_form, @site.domain)}>- Invite new member+ Invite New Guest</.button_link></.filter_bar>@@ -50,7 +50,7 @@</p></div>- <.dropdown class="relative">+ <.dropdown><:button class="bg-transparent text-gray-800 dark:text-gray-100 hover:bg-gray-50 dark:hover:bg-gray-700 focus-visible:outline-gray-100 whitespace-nowrap truncate inline-flex items-center gap-x-2 font-medium rounded-md px-3.5 py-2.5 text-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 disabled:bg-gray-400 dark:disabled:text-white dark:disabled:text-gray-400 dark:disabled:bg-gray-700">{membership.role |> to_string() |> String.capitalize()}<Heroicons.chevron_down mini class="size-4 mt-0.5" />diff --git a/test/plausible/teams/invitations/candidates_test.exs b/test/plausible/teams/invitations/candidates_test.exsdeleted file mode 100644index 49ef537bc7..0000000000--- a/test/plausible/teams/invitations/candidates_test.exs+++ /dev/null@@ -1,79 +0,0 @@-defmodule Plausible.Teams.Invitations.CandidatesTest do- use Plausible.DataCase, async: true- use Plausible.Teams.Test-- alias Plausible.Teams.Invitations.Candidates-- test "performs basic searches" do- owner = new_user()- site = new_site(owner: owner)-- add_guest(site, role: :viewer, user: new_user(email: "[email protected]", name: "Jane Doe"))- add_guest(site, role: :viewer, user: new_user(email: "[email protected]", name: "Joe Doe"))- add_guest(site, role: :viewer, user: new_user(email: "[email protected]", name: "Wu Tang"))-- assert [- %{email: "[email protected]"},- %{email: "[email protected]"}- ] = Candidates.search_site_guests(team_of(owner), "doe")-- assert [- %{email: "[email protected]"},- %{email: "[email protected]"}- ] = Candidates.search_site_guests(team_of(owner), "FOO")-- assert [- %{email: "[email protected]"},- %{email: "[email protected]"},- %{email: "[email protected]"}- ] = Candidates.search_site_guests(team_of(owner), "")-- assert [] = Candidates.search_site_guests(team_of(owner), "WONTMATCH")- end-- test "searches across multiple sites" do- owner = new_user()-- site1 = new_site(owner: owner)- site2 = new_site(owner: owner)-- multi_site_guest = new_user(email: "[email protected]", name: "Jane Doe")-- add_guest(site1, role: :viewer, user: multi_site_guest)- add_guest(site2, role: :viewer, user: new_user(email: "[email protected]", name: "Joe Doe"))- add_guest(site2, role: :viewer, user: multi_site_guest)-- assert [- %{email: "[email protected]"},- %{email: "[email protected]"}- ] = Candidates.search_site_guests(team_of(owner), "doe")- end-- test "capable of limiting results" do- owner = new_user()- site = new_site(owner: owner)-- add_guest(site, role: :viewer)- add_guest(site, role: :viewer)- add_guest(site, role: :viewer)-- assert [_, _, _] = Candidates.search_site_guests(team_of(owner), "")- assert [_, _] = Candidates.search_site_guests(team_of(owner), "", limit: 2)- end-- test "capable of excluding e-mails" do- owner = new_user()- site = new_site(owner: owner)-- to_be_excluded = new_user(email: "[email protected]", name: "Jane Doe")-- add_guest(site, role: :viewer, user: to_be_excluded)- add_guest(site, role: :viewer, user: new_user(email: "[email protected]", name: "Joe Doe"))- add_guest(site, role: :viewer, user: new_user(email: "[email protected]", name: "Wu Tang"))-- assert [- %{email: "[email protected]"}- ] =- Candidates.search_site_guests(team_of(owner), "doe", exclude: [to_be_excluded.email])- end-enddiff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exsnew file mode 100644index 0000000000..642f6d696a--- /dev/null+++ b/test/plausible/teams/management/layout_test.exs@@ -0,0 +1,446 @@+defmodule Plausible.Teams.Management.LayoutTest do+ use Plausible.DataCase, async: true+ use Plausible.Teams.Test+ use Bamboo.Test+ use Plausible++ alias Plausible.Teams.Management.Layout+ alias Plausible.Teams.Management.Layout.Entry+ alias Plausible.Teams++ describe "no persistence" do+ test "can be built of invitations and memberships" do+ layout = sample_layout()++ assert %Entry{name: "Current User", role: :admin, type: :membership} =+ layout["[email protected]"]++ assert %Entry{name: "Owner User", role: :owner, type: :membership} =+ layout["[email protected]"]++ assert %Entry{+ name: "Invited User",+ role: :admin,+ type: :invitation_sent+ } =+ layout["[email protected]"]++ assert %Entry{+ name: "Invited User",+ role: :admin,+ type: :invitation_pending+ } =+ layout["[email protected]"]+ end++ test "can be sorted for display" do+ layout =+ sample_layout()++ assert [+ {"[email protected]", %Entry{type: :invitation_pending}},+ {"[email protected]", %Entry{type: :invitation_sent}},+ {"[email protected]", %Entry{type: :membership}},+ {"[email protected]", %Entry{type: :membership}},+ {"[email protected]", %Entry{role: :guest, type: :invitation_pending}},+ {"[email protected]",+ %Entry{role: :guest, type: :invitation_sent}},+ {"[email protected]", %Entry{role: :guest, type: :membership}}+ ] = Layout.sorted_for_display(layout)++ layout =+ layout+ |> put(membership(name: "Aa", email: "[email protected]", role: :viewer))+ |> put(invitation_pending("[email protected]"))+ |> put(invitation_sent("[email protected]"))+ |> Layout.schedule_delete("[email protected]")++ assert [+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{}},+ {"[email protected]", %Entry{role: :guest, type: :invitation_pending}},+ {"[email protected]",+ %Entry{role: :guest, type: :invitation_sent}},+ {"[email protected]", %Entry{role: :guest, type: :membership}}+ ] = Layout.sorted_for_display(layout)+ end++ test "removable?/2 + counters" do+ layout = sample_layout()+ assert Layout.removable?(layout, "[email protected]")+ assert Layout.removable?(layout, "[email protected]")+ refute Layout.removable?(layout, "[email protected]")++ layout =+ put(+ layout,+ invitation_sent("[email protected]", role: :owner)+ )++ refute Layout.removable?(layout, "[email protected]")++ layout =+ put(+ layout,+ membership(+ email: "[email protected]",+ role: :owner+ )+ )++ assert Layout.removable?(layout, "[email protected]")+ assert Layout.removable?(layout, "[email protected]")++ assert Layout.owners_count(layout) == 3+ assert Layout.active_count(layout) == 9++ layout = Layout.schedule_delete(layout, "[email protected]")++ assert Layout.owners_count(layout) == 2+ assert Layout.active_count(layout) == 8++ refute Layout.removable?(layout, "[email protected]")+ end++ test "update_role/3" do+ assert %Entry{queued_op: :update, role: :owner} =+ sample_layout()+ |> Layout.update_role("[email protected]", :owner)+ |> Map.get("[email protected]")++ assert_raise KeyError, ~r/not found/, fn ->+ Layout.update_role(sample_layout(), "x", :owner)+ end+ end++ test "schedule_send/3" do+ assert %Entry{+ queued_op: :send,+ name: "Invited User",+ role: :admin,+ meta: %{email: "[email protected]"}+ } =+ sample_layout()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Map.get("[email protected]")++ assert %Entry{+ queued_op: :send,+ name: "Joe Doe",+ role: :admin,+ meta: %{email: "[email protected]"}+ } =+ sample_layout()+ |> Layout.schedule_send("[email protected]", :admin, name: "Joe Doe")+ |> Map.get("[email protected]")+ end++ test "schedule_delete/2" do+ assert %Entry{queued_op: :delete} =+ sample_layout()+ |> Layout.schedule_delete("[email protected]")+ |> Map.get("[email protected]")++ assert_raise KeyError, ~r/not found/, fn ->+ Layout.schedule_delete(sample_layout(), "x")+ end+ end++ test "has_guests?/1" do+ input = [+ invitation_pending("[email protected]")+ ]++ layout = Layout.build_by_email(input)+ refute Layout.has_guests?(layout)++ layout =+ put(+ layout,+ membership(email: "[email protected]", role: :guest)+ )++ assert Layout.has_guests?(layout)+ layout = Layout.schedule_delete(layout, "[email protected]")+ refute Layout.has_guests?(layout)++ layout = Layout.update_role(layout, "[email protected]", :viewer)++ refute Layout.has_guests?(layout)+ end++ test "overwrite" do+ assert %Entry{queued_op: :send, type: :invitation_pending} =+ sample_layout()+ |> put(+ membership(+ name: "Aa",+ email: "[email protected]",+ role: :viewer+ )+ )+ |> Layout.schedule_send("[email protected]", :admin)+ |> Map.get("[email protected]")+ end++ defp invitation_pending(email, attrs \\ []) do+ build(:team_invitation, Keyword.merge([email: email], attrs))+ end++ defp invitation_sent(email, attrs \\ []) do+ build(+ :team_invitation,+ Keyword.merge(+ [email: email, id: Enum.random(1..1_000_000)],+ attrs+ )+ )+ end++ defp membership(attrs) do+ build(:team_membership,+ role: attrs[:role],+ user: attrs[:user] || build(:user, name: attrs[:name], email: attrs[:email])+ )+ end++ defp sample_layout() do+ current_user = build(:user, id: 777, name: "Current User", email: "[email protected]")++ input = [+ invitation_pending("[email protected]"),+ membership(+ role: :owner,+ name: "Owner User",+ email: "[email protected]"+ ),+ invitation_pending("[email protected]", role: :guest),+ membership(role: :guest, name: "Guest User", email: "[email protected]"),+ membership(role: :admin, user: current_user),+ invitation_sent("[email protected]", role: :guest),+ invitation_sent("[email protected]")+ ]++ Layout.build_by_email(input)+ end+ end++ describe "persistence" do+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "+ setup [:create_user, :create_team]++ test "unchanged layout no-op", %{user: user, team: team} do+ add_member(team, role: :admin)+ invite_member(team, "[email protected]", role: :viewer, inviter: user)++ assert {:ok, 0} =+ team+ |> Layout.init()+ |> Layout.persist(%{current_user: user, my_team: team})++ assert_no_emails_delivered()+ end++ test "writes setup markers", %{user: user, team: team} do+ refute team.setup_complete+ refute team.setup_at++ team |> Layout.init() |> Layout.persist(%{current_user: user, my_team: team})++ team = Repo.reload!(team)++ assert team.setup_complete+ assert team.setup_at+ end++ test "won't update setup_at", %{user: user, team: team} do+ team =+ team+ |> Teams.Team.setup_changeset(+ NaiveDateTime.utc_now(:second)+ |> NaiveDateTime.shift(month: -1)+ )+ |> Repo.update!()++ assert setup_at = team.setup_at++ team |> Layout.init() |> Layout.persist(%{current_user: user, my_team: team})++ team = Repo.reload!(team)++ assert team.setup_at == setup_at+ end++ test "invitation pending email goes out", %{user: user, team: team} do+ assert {:ok, 1} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.persist(%{current_user: user, my_team: team})++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )++ layout = Layout.init(team)+ assert %{type: :invitation_sent} = Map.get(layout, "[email protected]")+ end++ test "membership removal email goes out", %{user: user, team: team} do+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))++ assert {:ok, 1} =+ team+ |> Layout.init()+ |> Layout.schedule_delete("[email protected]")+ |> Layout.persist(%{current_user: user, my_team: team})++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )+ end++ test "limits are checked", %{user: user, team: team} do+ assert {:error, {:over_limit, 3}} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.persist(%{current_user: user, my_team: team})++ assert {:error, :only_one_owner} =+ team+ |> Layout.init()+ |> Layout.schedule_delete(user.email)+ |> put(invitation_pending("[email protected]", role: :owner))+ |> put(invitation_sent("[email protected]", role: :owner))+ |> Layout.persist(%{current_user: user, my_team: team})++ assert {:error, :only_one_owner} =+ team+ |> Layout.init()+ |> Layout.update_role(user.email, :viewer)+ |> Layout.persist(%{current_user: user, my_team: team})++ assert {:error, :already_a_member} =+ team+ |> Layout.init()+ |> Layout.schedule_send(user.email, :admin)+ |> Layout.persist(%{current_user: user, my_team: team})++ assert_no_emails_delivered()+ end++ test "deletions are made first, so that limits apply accurately", %{user: user, team: team} do+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))++ assert {:ok, 3} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_delete("[email protected]")+ |> Layout.schedule_delete("[email protected]")+ |> Layout.persist(%{current_user: user, my_team: team})+ end++ test "multiple ops queue", %{user: user, team: team} do+ member1 = add_member(team, role: :admin, user: new_user(email: "[email protected]"))+ member2 = add_member(team, role: :admin, user: new_user(email: "[email protected]"))++ assert {:ok, 3} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_delete("[email protected]")+ |> Layout.update_role("[email protected]", :viewer)+ |> Layout.persist(%{current_user: user, my_team: team})++ 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_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )++ assert_no_emails_delivered()+ end++ test "deletion of scheduled invitations is no-op", %{user: user, team: team} do+ assert {:ok, 0} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_delete("[email protected]")+ |> Layout.persist(%{current_user: user, my_team: team})+ end++ test "idempotence", %{user: user, team: team} do+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))+ add_member(team, role: :admin, user: new_user(email: "[email protected]"))++ assert {:ok, 3} =+ team+ |> Layout.init()+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.schedule_delete("[email protected]")+ |> Layout.schedule_send("[email protected]", :admin)+ |> Layout.update_role("[email protected]", :viewer)+ |> Layout.schedule_delete("[email protected]")+ |> Layout.update_role("[email protected]", :viewer)+ |> Layout.persist(%{current_user: user, my_team: team})++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )++ assert_no_emails_delivered()+ end++ test "guests promotion", %{user: user, team: team} do+ site = new_site(owner: user)+ u2 = new_user()++ add_guest(site, user: u2, role: :viewer)+ assert_guest_membership(team, site, u2, :viewer)++ layout = Layout.init(team)+ assert Layout.has_guests?(layout)++ layout+ |> Layout.update_role(u2.email, :viewer)+ |> Layout.persist(%{current_user: user, my_team: team})++ refute team |> Layout.init() |> Layout.has_guests?()++ assert_non_guest_membership(team, site, u2)+ end+ end++ def put(layout, entity) do+ entry = Entry.new(entity)+ Map.put(layout, entry.email, entry)+ end+enddiff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex 162b7526bf..09371bfbd8 100644--- a/test/plausible_web/controllers/settings_controller_test.exs+++ b/test/plausible_web/controllers/settings_controller_test.exs@@ -1116,14 +1116,23 @@ defmodule PlausibleWeb.SettingsControllerTest dorefute html =~ "Team Settings"end- test "renders team settings, when team assigned", %{conn: conn, user: user} do+ test "renders team settings, when team assigned and set up", %{conn: conn, user: user} do{:ok, team} = Plausible.Teams.get_or_create(user)+ team |> Plausible.Teams.Team.setup_changeset() |> Repo.update!()conn = get(conn, Routes.settings_path(conn, :preferences))html = html_response(conn, 200)assert html =~ "Team Settings"assert html =~ team.nameend+ test "does not render team settings, when team not set up", %{conn: conn, user: user} do+ {:ok, team} = Plausible.Teams.get_or_create(user)+ conn = get(conn, Routes.settings_path(conn, :preferences))+ html = html_response(conn, 200)+ assert html =~ "Team Settings"+ refute html =~ team.name+ end+test "GET /settings/team/general", %{conn: conn, user: user} do{:ok, team} = Plausible.Teams.get_or_create(user)conn = get(conn, Routes.settings_path(conn, :team_general))diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 45a73ed6e8..d0bc103a19 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -20,7 +20,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do|> get("/sites/#{site.domain}/memberships/invite")|> html_response(200)- assert html =~ "Invite member to"+ assert html =~ "Invite guest to"assert element_exists?(html, ~s/button[type=submit]/)refute element_exists?(html, ~s/button[type=submit][disabled]/)enddiff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsnew file mode 100644index 0000000000..3c983d0d3c--- /dev/null+++ b/test/plausible_web/live/team_management_test.exs@@ -0,0 +1,328 @@+defmodule PlausibleWeb.Live.TeamMangementTest do+ use PlausibleWeb.ConnCase, async: false+ use Bamboo.Test, shared: true+ use Plausible.Teams.Test++ import Phoenix.LiveViewTest+ import Plausible.Test.Support.HTML++ def team_general_path(), do: Routes.settings_path(PlausibleWeb.Endpoint, :team_general)+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "++ describe "/settings/team/general" do+ setup [:create_user, :log_in, :create_team, :setup_team]++ test "renders team management section", %{conn: conn} do+ resp =+ conn+ |> get(team_general_path())+ |> html_response(200)+ |> text()++ assert resp =~ "Add, remove or change your team memberships"++ refute element_exists?(resp, ~s|button[phx-click="save-team-layout"]|)+ end++ test "renders existing guests under Guest divider", %{conn: conn, user: user} do+ site = new_site(owner: user)+ add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))++ resp =+ conn+ |> get(team_general_path())+ |> html_response(200)++ assert element_exists?(resp, "#guests-hr")++ assert find(resp, "#{member_el()}:first-of-type") |> text() =~ "#{user.email}"+ assert find(resp, "#{guest_el()}:first-of-type") |> text() =~ "[email protected]"+ end++ test "does not render Guest divider when no guests found", %{conn: conn} do+ resp =+ conn+ |> get(team_general_path())+ |> html_response(200)++ refute element_exists?(resp, "#guests-hr")+ refute element_exists?(resp, "#guest-list")+ end+ end++ describe "live" do+ setup [:create_user, :log_in, :create_team, :setup_team]++ test "renders member, immediately delivers invitation", %{conn: conn, user: user, team: team} do+ {lv, html} = get_liveview(conn, with_html?: true)+ member_row1 = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ assert member_row1 =~ "#{user.name}"+ assert member_row1 =~ "#{user.email}"+ assert member_row1 =~ "You"++ add_invite(lv, "[email protected]", "admin")++ html = render(lv)++ member_row1 = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ assert member_row1 =~ "[email protected]"+ assert member_row1 =~ "Invited User"+ assert member_row1 =~ "Invitation Sent"++ member_row2 = find(html, "#{member_el()}:nth-of-type(2)") |> text()+ assert member_row2 =~ "#{user.name}"+ assert member_row2 =~ "#{user.email}"++ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )+ end++ test "allows updating membership role in place", %{conn: conn, team: team} do+ member2 = add_member(team, role: :admin)+ lv = get_liveview(conn)++ html = render(lv)++ assert text_of_element(+ html,+ "#{member_el()}:nth-of-type(1) button"+ ) == "Owner"++ assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Admin"++ change_role(lv, 2, "viewer")+ html = render(lv)++ assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Viewer"++ assert_no_emails_delivered()++ assert_team_membership(member2, team, :viewer)+ end++ test "allows updating guest membership so it moves sections", %{+ conn: conn,+ user: user+ } do+ site = new_site(owner: user)+ add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))++ lv = get_liveview(conn)++ html = render(lv)++ assert length(find(html, member_el())) == 1++ assert text_of_element(html, "#{guest_el()}:first-of-type button") == "Guest"++ change_role(lv, 1, "viewer", guest_el())+ html = render(lv)++ assert length(find(html, member_el())) == 2+ refute element_exists?(html, "#guest-list")+ end++ test "fails to save layout with limits breached", %{conn: conn, team: team} do+ lv = get_liveview(conn)+ add_invite(lv, "[email protected]", "admin")+ add_invite(lv, "[email protected]", "admin")+ add_invite(lv, "[email protected]", "admin")+ 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+ end++ test "fails to accept invitation to already existing e-mail", %{+ conn: conn,+ user: user+ } do+ lv = get_liveview(conn)+ add_invite(lv, user.email, "admin")++ assert lv |> render() |> text() =~+ "Error! Make sure the e-mail is valid and is not taken already"+ end++ test "allows removing any type of entry", %{+ conn: conn,+ user: user,+ team: team+ } do+ member2 = add_member(team, role: :admin)+ _invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)++ site = new_site(owner: user)++ guest =+ add_guest(site,+ role: :viewer,+ user: new_user(name: "Mr Guest", email: "[email protected]")+ )++ lv = get_liveview(conn)+ add_invite(lv, "[email protected]", "admin")++ html = render(lv)++ assert html |> find(member_el()) |> Enum.count() == 4+ assert html |> find(guest_el()) |> Enum.count() == 1++ pending = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ sent = find(html, "#{member_el()}:nth-of-type(2)") |> text()+ owner = find(html, "#{member_el()}:nth-of-type(3)") |> text()+ admin = find(html, "#{member_el()}:nth-of-type(4)") |> text()++ guest_member = find(html, "#{guest_el()}:first-of-type") |> text()++ assert pending =~ "Invitation Pending"+ assert sent =~ "Invitation Sent"+ assert owner =~ "You"+ assert admin =~ "Team Member"+ assert guest_member =~ "Guest"++ remove_member(lv, 1)+ # next becomes first+ remove_member(lv, 1)+ # last becomes second+ remove_member(lv, 2)++ # remove guest+ remove_member(lv, 1, guest_el())++ html = render(lv) |> text()++ refute html =~ "Invitation Pending"+ refute html =~ "Invitation Sent"+ refute html =~ "Team Member"+ refute html =~ "Guest"++ html = render(lv)++ assert html |> find(member_el()) |> Enum.count() == 1+ refute element_exists?(html, "#guest-list")++ assert_email_delivered_with(+ to: [nil: member2.email],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )++ assert_email_delivered_with(+ to: [nil: guest.email],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )++ assert_no_emails_delivered()+ end++ test "guest->owner promotion",+ %{+ conn: conn,+ user: user,+ team: team+ } do+ site = new_site(owner: user)++ member2 =+ add_guest(site,+ role: :viewer,+ user: new_user(name: "Mr Guest", email: "[email protected]")+ )++ lv = get_liveview(conn)++ change_role(lv, 1, "owner", guest_el())+ html = render(lv)++ refute html =~ "Error!"++ assert_team_membership(user, team, :owner)+ assert_team_membership(member2, team, :owner)+ end++ test "multiple-owners",+ %{+ conn: conn,+ team: team,+ user: user+ } do+ member2 = add_member(team, role: :admin)++ lv = get_liveview(conn)++ change_role(lv, 2, "owner")+ html = render(lv)++ refute html =~ "Error!"++ assert_team_membership(user, team, :owner)+ assert_team_membership(member2, team, :owner)+ end+ end++ describe "to be revisited" do+ setup [:create_user, :log_in, :create_team, :setup_team]++ @tag :capture_log+ test "billing role is currently not supported by the underlying services",+ %{+ conn: conn,+ team: team+ } do+ Process.flag(:trap_exit, true)+ _member2 = add_member(team, role: :admin)++ lv = get_liveview(conn)++ assert :unsupported == change_role(lv, 2, "billing")+ catch+ _, _ ->+ :unsupported+ end+ end++ defp change_role(lv, index, role, main_selector \\ member_el()) do+ lv+ |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-value-role="#{role}"]|)+ |> render_click()+ end++ defp remove_member(lv, index, main_selector \\ member_el()) do+ lv+ |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-click="remove-member"]|)+ |> render_click()+ end++ defp add_invite(lv, email, role) do+ lv+ |> element(~s|#input-role-picker a[phx-value-role="#{role}"]|)+ |> render_click()++ lv+ |> element("#team-layout-form")+ |> render_submit(%{+ "input-email" => email+ })+ end++ defp get_liveview(conn, opts \\ []) do+ conn = assign(conn, :live_module, PlausibleWeb.Live.TeamManagement)+ {:ok, lv, html} = live(conn, team_general_path())++ if Keyword.get(opts, :with_html?) do+ {lv, html}+ else+ lv+ end+ end++ defp member_el() do+ ~s|#member-list div[data-test-kind="member"]|+ end++ defp guest_el() do+ ~s|#guest-list div[data-test-kind="guest"]|+ end+enddiff --git a/test/plausible_web/live/team_setup_sync_test.exs b/test/plausible_web/live/team_setup_sync_test.exsdeleted file mode 100644index de5f47da28..0000000000--- a/test/plausible_web/live/team_setup_sync_test.exs+++ /dev/null@@ -1,76 +0,0 @@-defmodule PlausibleWeb.Live.TeamSetupSyncTest do- use PlausibleWeb.ConnCase, async: false- use Bamboo.Test, shared: true-- use Plausible.Teams.Test-- import Phoenix.LiveViewTest-- alias Plausible.Repo-- @url "/team/setup"-- describe "/team/setup - full integration" do- setup [:create_user, :log_in, :create_team]-- @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "-- test "setting up a team successfully creates invitations", %{- conn: conn,- user: user,- team: team- } do- site = new_site(owner: user)- guest = add_guest(site, role: :viewer)- guest2 = build(:user)-- {:ok, lv, _html} = live(conn, @url)-- type_into_input(lv, "team[name]", "New Team Name")-- type_into_combo(lv, "team-member-candidates", guest.email)- select_combo_option(lv, 1)-- type_into_combo(lv, "team-member-candidates", guest2.email)- select_combo_option(lv, 0)-- lv |> element(~s|button[phx-click="setup-team"]|) |> render_click()-- [i1, i2] = team |> Ecto.assoc(:team_invitations) |> Repo.all() |> Enum.sort_by(& &1.id)-- assert i1.email == guest.email- assert i2.email == guest2.email-- assert_email_delivered_with(- to: [nil: guest.email],- subject: @subject_prefix <> "You've been invited to \"New Team Name\" team"- )-- assert_email_delivered_with(- to: [nil: guest2.email],- subject: @subject_prefix <> "You've been invited to \"New Team Name\" team"- )- end- end-- defp type_into_input(lv, id, text) do- lv- |> element("form")- |> render_change(%{id => text})- end-- defp type_into_combo(lv, id, text) do- lv- |> element("input##{id}")- |> render_change(%{- "_target" => ["display-#{id}"],- "display-#{id}" => "#{text}"- })- end-- defp select_combo_option(lv, index) do- lv- |> element(~s/li#dropdown-team-member-candidates-option-#{index} a/)- |> render_click()- end-enddiff --git a/test/plausible_web/live/team_setup_test.exs b/test/plausible_web/live/team_setup_test.exsindex c230ad7625..f1726b21b7 100644--- a/test/plausible_web/live/team_setup_test.exs+++ b/test/plausible_web/live/team_setup_test.exs@@ -1,15 +1,16 @@defmodule PlausibleWeb.Live.TeamSetupTest do- use PlausibleWeb.ConnCase, async: true-- alias Plausible.Teams+ use PlausibleWeb.ConnCase, async: falseuse Plausible.Teams.Test+ use Bamboo.Test, shared: trueimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML+ alias Plausible.Teamsalias Plausible.Repo@url "/team/setup"+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "describe "/team/setup - edge cases" dosetup [:create_user, :log_in]@@ -27,231 +28,315 @@ defmodule PlausibleWeb.Live.TeamSetupTest dotest "does not redirect to /team/general if dev mode", %{conn: conn, user: user} do{:ok, team} = Teams.get_or_create(user)team |> Teams.Team.setup_changeset() |> Repo.update!()- assert {:ok, _, _} = live(conn, @url <> "?dev=1")+ assert {:ok, lv, _} = live(conn, @url <> "?dev=1")+ _ = render(lv)endend- describe "/team/setup - functional details" do+ describe "/team/setup - main differences from team management" dosetup [:create_user, :log_in, :create_team]test "renders form", %{conn: conn} do- {:ok, _, html} = live(conn, @url)- assert element_exists?(html, ~s|input#team_name[name="team[name]"]|)- assert element_exists?(html, ~s|input[name="team-member-candidate"]|)- assert element_exists?(html, ~s|button[phx-click="setup-team"]|)+ {:ok, lv, html} = live(conn, @url)+ assert element_exists?(html, ~s|input#update-team-form_name[name="team[name]"]|)+ assert element_exists?(html, ~s|button[phx-click="save-team-layout"]|)++ _ = render(lv)endtest "changing team name, updates team name in db", %{conn: conn, team: team} do{:ok, lv, _html} = live(conn, @url)type_into_input(lv, "team[name]", "New Team Name")assert Repo.reload!(team).name == "New Team Name"++ _ = render(lv)end+ end- test "existing guest is suggested from combobox dropdown", %{conn: conn, user: user} do- site = new_site(owner: user)- guest = add_guest(site, role: :viewer)+ describe "/team/setup - full integration" do+ setup [:create_user, :log_in, :create_team]- {:ok, lv, _html} = live(conn, @url)+ test "renders member, enqueues invitation, delivers it", %{conn: conn, user: user, team: team} do+ {lv, html} = get_child_lv(conn, with_html?: true)+ member_row1 = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ assert member_row1 =~ "#{user.name}"+ assert member_row1 =~ "#{user.email}"+ assert member_row1 =~ "You"- type_into_combo(lv, "team-member-candidates", guest.email)- select_combo_option(lv, 1)+ add_invite(lv, "[email protected]", "admin")- [member1_row, member2_row] =- lv- |> render()- |> find(".member")+ html = render(lv)++ member_row1 = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ assert member_row1 =~ "[email protected]"+ assert member_row1 =~ "Invited User"+ assert member_row1 =~ "Invitation Pending"++ member_row2 = find(html, "#{member_el()}:nth-of-type(2)") |> text()+ assert member_row2 =~ "#{user.name}"+ assert member_row2 =~ "#{user.email}"- assert text(member1_row) =~ user.name- assert text(member1_row) =~ "You"- assert text(member1_row) =~ user.email+ save_layout(lv)- assert text(member2_row) =~ guest.name- assert text(member2_row) =~ guest.email+ assert_redirect(lv, "/settings/team/general")- assert member1_row |> find(".role") |> text() =~ "Owner"- assert member2_row |> find(".role") |> text() =~ "Viewer"+ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )end- test "team member is added from input", %{conn: conn, user: user} do- new_member_email = build(:user).email+ test "allows updating pending invitation role in place", %{conn: conn, team: team} do+ lv = get_child_lv(conn)+ add_invite(lv, "[email protected]", "admin")- {:ok, lv, _html} = live(conn, @url)+ html = render(lv)- type_into_combo(lv, "team-member-candidates", new_member_email)- select_combo_option(lv, 0)+ assert text_of_element(html, "#{member_el()}:nth-of-type(1) button") == "Admin"+ assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Owner"- [member1_row, member2_row] =- lv- |> render()- |> find(".member")+ change_role(lv, 1, "viewer")+ html = render(lv)- assert text(member1_row) =~ user.name- assert text(member1_row) =~ "You"- assert text(member1_row) =~ user.email+ assert text_of_element(html, "#{member_el()}:nth-of-type(1) button") == "Viewer"- assert text(member2_row) =~ "Invited User"- assert text(member2_row) =~ new_member_email+ save_layout(lv)- assert member1_row |> find(".role") |> text() =~ "Owner"- assert member2_row |> find(".role") |> text() =~ "Viewer"+ assert_email_delivered_with(+ to: [nil: "[email protected]"],+ subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"+ )end- test "arbitrary invalid e-mail attempt", %{conn: conn} do- {:ok, lv, _html} = live(conn, @url)- type_into_combo(lv, "team-member-candidates", "invalid")+ test "allows updating membership role in place", %{conn: conn, team: team} do+ member2 = add_member(team, role: :admin)+ {lv, html} = get_child_lv(conn, with_html?: true)++ assert text_of_element(html, "#{member_el()}:nth-of-type(1) button") == "Owner"+ assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Admin"- refute lv |> render |> text() =~ "Sorry"+ change_role(lv, 2, "viewer")+ html = render(lv)- select_combo_option(lv, 0)+ assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Viewer"- assert lv |> render() |> text() =~- "Sorry, e-mail 'invalid' is invalid. Please type the address again."+ save_layout(lv)++ assert_no_emails_delivered()++ assert_team_membership(member2, team, :viewer)end- test "owner's own e-mail attempt", %{conn: conn, user: user} do- {:ok, lv, _html} = live(conn, @url)- type_into_combo(lv, "team-member-candidates", user.email)+ test "allows updating guest membership so it moves sections", %{+ conn: conn,+ user: user+ } do+ site = new_site(owner: user)+ add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))- refute lv |> render |> text() =~ "Sorry"+ lv = get_child_lv(conn)- select_combo_option(lv, 0)+ html = render(lv)- assert lv |> render() |> text() =~- "Sorry, e-mail '#{user.email}' is invalid. Please type the address again."+ assert length(find(html, member_el())) == 1++ assert text_of_element(html, "#{guest_el()}:first-of-type button") == "Guest"++ change_role(lv, 1, "viewer", guest_el())+ html = render(lv)++ assert length(find(html, member_el())) == 2+ refute element_exists?(html, "#guest-list")end- test "owner's role dropdown consists of inactive options", %{conn: conn} do- {:ok, _lv, html} = live(conn, @url)+ test "fails to save layout with limits breached", %{conn: conn} do+ lv = get_child_lv(conn)+ add_invite(lv, "[email protected]", "admin")+ add_invite(lv, "[email protected]", "admin")+ add_invite(lv, "[email protected]", "admin")+ add_invite(lv, "[email protected]", "admin")++ refute lv |> render() |> text() =~ "Your account is limited to 3 team members"++ save_layout(lv)- assert html- |> find(".member")- |> Enum.take(1)- |> find(".dropdown-items > *:not([^role=separator])")- |> Enum.all?(fn el ->- text_of_attr(el, "data-ui-state") == "disabled"- end)+ assert lv |> render() |> text() =~ "Your account is limited to 3 team members"end- test "candidate's role dropdown allows changing role", %{conn: conn} do- new_member_email = build(:user).email- {:ok, lv, _html} = live(conn, @url)+ test "all options are disabled for the sole owner", %{conn: conn} do+ lv = get_child_lv(conn)- type_into_combo(lv, "team-member-candidates", new_member_email)- select_combo_option(lv, 0)+ options =+ lv+ |> render()+ |> find("#{member_el()} a")- lv- |> element(~s|.member a[phx-click="update-role"][phx-value-role="admin"]|)- |> render_click()+ assert Enum.empty?(options)+ end- member2_row = lv |> render() |> find(".member:nth-of-type(2) .role") |> text()- assert member2_row =~ "Admin"+ test "in case of >1 owner, the one owner limit is still enforced", %{conn: conn, team: team} do+ _other_owner = add_member(team, role: :owner)+ lv = get_child_lv(conn)- lv- |> element(~s|.member a[phx-click="update-role"][phx-value-role="viewer"]|)- |> render_click()+ options =+ lv+ |> render()+ |> find("#{member_el()} a")++ refute Enum.empty?(options)- member2_row = lv |> render() |> find(".member:nth-of-type(2) .role") |> text()- assert member2_row =~ "Viewer"+ change_role(lv, 1, "viewer")++ html = lv |> render()++ assert [_ | _] = find(html, "#{member_el()}:nth-of-type(1) a")+ assert find(html, "#{member_el()}:nth-of-type(2) a") == []end- test "member candidate suggestion disappears when selected", %{conn: conn, user: user} do+ test "allows removing any type of entry", %{+ conn: conn,+ user: user,+ team: team+ } do+ member2 = add_member(team, role: :admin)+ _invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)+site = new_site(owner: user)- guest = add_guest(site, role: :viewer)- {:ok, lv, _html} = live(conn, @url)+ guest =+ add_guest(site,+ role: :viewer,+ user: new_user(name: "Mr Guest", email: "[email protected]")+ )- type_into_combo(lv, "team-member-candidates", guest.email)+ lv = get_child_lv(conn)+ add_invite(lv, "[email protected]", "admin")- assert lv- |> render()- |> find("#dropdown-team-member-candidates")- |> text() =~ guest.email+ html = render(lv)- select_combo_option(lv, 1)+ assert html |> find(member_el()) |> Enum.count() == 4+ assert html |> find(guest_el()) |> Enum.count() == 1- _ = render(lv)+ pending = find(html, "#{member_el()}:nth-of-type(1)") |> text()+ sent = find(html, "#{member_el()}:nth-of-type(2)") |> text()+ owner = find(html, "#{member_el()}:nth-of-type(3)") |> text()+ admin = find(html, "#{member_el()}:nth-of-type(4)") |> text()- refute lv- |> render()- |> find("#dropdown-team-member-candidates")- |> text() =~ guest.email- end+ guest_member = find(html, "#{guest_el()}:first-of-type") |> text()- test "member candidate can be removed", %{conn: conn, user: user} do- site = new_site(owner: user)+ assert pending =~ "Invitation Pending"+ assert sent =~ "Invitation Sent"+ assert owner =~ "You"+ assert admin =~ "Team Member"+ assert guest_member =~ "Guest"- guest = add_guest(site, role: :viewer)+ remove_member(lv, 1)+ # next becomes first+ remove_member(lv, 1)+ # last becomes second+ remove_member(lv, 2)- {:ok, lv, _html} = live(conn, @url)+ # remove guest+ remove_member(lv, 1, guest_el())- type_into_combo(lv, "team-member-candidates", guest.email)- select_combo_option(lv, 1)+ html = render(lv) |> text()- assert lv- |> render()- |> find(".member:nth-of-type(2)")- |> text() =~ guest.email+ refute html =~ "Invitation Pending"+ refute html =~ "Invitation Sent"+ refute html =~ "Team Member"+ refute html =~ "Guest"- lv- |> element(~s|.member a[phx-click="remove-member"][phx-value-email="#{guest.email}"]|)- |> render_click()+ save_layout(lv)- refute lv- |> render()- |> find(".member")- |> text() =~ guest.email- end- end+ assert_email_delivered_with(+ to: [nil: guest.email],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )- describe "/team/setup - full integration" do- setup [:create_user, :log_in, :create_team]+ assert_email_delivered_with(+ to: [nil: member2.email],+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"+ )- test "setting up team above plan member limits", %{+ assert_no_emails_delivered()+ end++ test "respawns membersip enqueued for deletion", %{conn: conn,- user: user,team: team} do- site = new_site(owner: user)- guest = add_guest(site, role: :viewer)+ member2 = add_member(team, role: :editor, user: new_user(email: "[email protected]"))- extra_guests = build_list(3, :user)+ lv = get_child_lv(conn)- {:ok, lv, _html} = live(conn, @url)+ remove_member(lv, 1)- type_into_combo(lv, "team-member-candidates", guest.email)- select_combo_option(lv, 1)+ add_invite(lv, "[email protected]", "viewer")- for g <- extra_guests do- type_into_combo(lv, "team-member-candidates", g.email)- select_combo_option(lv, 0)- end+ html = render(lv)- lv |> element(~s|button[phx-click="setup-team"]|) |> render_click()+ assert find(html, "#{member_el()}:nth-of-type(1)") |> text() =~ "Team Member"+ assert find(html, "#{member_el()}:nth-of-type(2)") |> text() =~ "You"- assert team |> Ecto.assoc(:team_invitations) |> Repo.aggregate(:count) == 0+ save_layout(lv)- assert lv |> render() |> text() =~ "Your account is limited to 3 team members"+ assert_no_emails_delivered()+ assert_team_membership(member2, team, :viewer)endenddefp type_into_input(lv, id, text) dolv- |> element("form")+ |> element("form#update-team-form")|> render_change(%{id => text})end- defp type_into_combo(lv, id, text) do+ defp add_invite(lv, email, role) do+ lv+ |> element(~s|#input-role-picker a[phx-value-role="#{role}"]|)+ |> render_click()+lv- |> element("input##{id}")- |> render_change(%{- "_target" => ["display-#{id}"],- "display-#{id}" => "#{text}"+ |> element("#team-layout-form")+ |> render_submit(%{+ "input-email" => email})end- defp select_combo_option(lv, index) do+ defp save_layout(lv) dolv- |> element(~s/li#dropdown-team-member-candidates-option-#{index} a/)+ |> element("button#save-layout")|> render_click()end++ defp change_role(lv, index, role, main_selector \\ member_el()) do+ lv+ |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-value-role="#{role}"]|)+ |> render_click()+ end++ defp get_child_lv(conn, opts \\ []) do+ {:ok, lv, _} = live(conn, @url)+ assert lv = find_live_child(lv, "team-management-setup")++ if Keyword.get(opts, :with_html?) do+ {lv, render(lv)}+ else+ lv+ end+ end++ defp remove_member(lv, index, main_selector \\ member_el()) do+ lv+ |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-click="remove-member"]|)+ |> render_click()+ end++ defp member_el() do+ ~s|#member-list div[data-test-kind="member"]|+ end++ defp guest_el() do+ ~s|#guest-list div[data-test-kind="guest"]|+ endenddiff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 3ac8c6d553..da5358c2a1 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -353,6 +353,21 @@ defmodule Plausible.Teams.Test do)end+ def assert_non_guest_membership(team, site, user) do+ assert team_membership =+ Repo.get_by(Plausible.Teams.Membership,+ user_id: user.id,+ team_id: team.id+ )++ assert team_membership.role != :guest++ refute Repo.get_by(Plausible.Teams.GuestMembership,+ team_membership_id: team_membership.id,+ site_id: site.id+ )+ end+def subscription_of(%Plausible.Auth.User{} = user) douser|> team_of()diff --git a/test/support/test_utils.ex b/test/support/test_utils.exindex eacc31f8cb..0707b72f15 100644--- a/test/support/test_utils.ex+++ b/test/support/test_utils.ex@@ -47,6 +47,15 @@ defmodule Plausible.TestUtils do{:ok, team: team}end+ def setup_team(%{team: team}) do+ team =+ team+ |> Plausible.Teams.Team.setup_changeset()+ |> Repo.update!()++ {:ok, team: team}+ end+def create_legacy_site_import(%{site: site}) docreate_site_import(%{site: site, create_legacy_import?: true})end