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
[Step 3]: Rework team layout persist (#6780)
RobertJoonas69b00ea56b91
diff --git a/e2e/tests/dashboard/team-management.spec.ts b/e2e/tests/dashboard/team-management.spec.tsindex 16d44d42e8..876d834d9c 100644--- a/e2e/tests/dashboard/team-management.spec.ts+++ b/e2e/tests/dashboard/team-management.spec.ts@@ -29,6 +29,9 @@ async function submitInviteForm(.getByRole('option', { name: roleOptionName }).click()await page.getByRole('button', { name: 'Invite' }).click()+ // so that tests continue without a flash+ await hasFlashMessage(page, `${email} has been invited`)+ await closeFlashMessage(page)}test('lowering your own role asks for confirmation', async ({diff --git a/lib/plausible/teams/invitations/update_role.ex b/lib/plausible/teams/invitations/update_role.exindex c152aaac27..072626e39c 100644--- a/lib/plausible/teams/invitations/update_role.ex+++ b/lib/plausible/teams/invitations/update_role.ex@@ -16,8 +16,7 @@ defmodule Plausible.Teams.Invitations.UpdateRole do| {:error,:permission_denied| :invitation_not_found- | :guest_invitation- | Ecto.Changeset.t()}+ | :guest_invitation}def update(%Teams.Team{} = team, invitation_id, new_role, current_user) dowith {:ok, invitation} <- Teams.Invitations.get_team_invitation(team, invitation_id),:ok <- ensure_team_invitation(invitation),@@ -28,9 +27,8 @@ defmodule Plausible.Teams.Invitations.UpdateRole doinvitation,new_role) do- invitation- |> Ecto.Changeset.change(role: new_role)- |> Repo.update()+ invitation = Repo.update!(Ecto.Changeset.change(invitation, role: new_role))+ {:ok, invitation}endenddiff --git a/lib/plausible/teams/management/layout/entry.ex b/lib/plausible/teams/management/layout/entry.exindex c0637e2068..30da6c735e 100644--- a/lib/plausible/teams/management/layout/entry.ex+++ b/lib/plausible/teams/management/layout/entry.ex@@ -116,7 +116,7 @@ defmodule Plausible.Teams.Management.Layout.Entry doPlausible.Teams.Memberships.UpdateRole.update(context.current_team,meta.user.id,- "#{role}",+ role,context.current_user)enddiff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.exindex 736cc33732..4ccbc4590f 100644--- a/lib/plausible/teams/memberships/update_role.ex+++ b/lib/plausible/teams/memberships/update_role.ex@@ -9,9 +9,7 @@ defmodule Plausible.Teams.Memberships.UpdateRole doalias Plausible.Teamsalias Plausible.Teams.Memberships- def update(%Teams.Team{} = team, user_id, new_role_str, current_user) do- new_role = String.to_existing_atom(new_role_str)-+ def update(%Teams.Team{} = team, user_id, new_role, current_user) dowith {:ok, team_membership} <- Memberships.get_team_membership(team, user_id),:ok <-Teams.TeamRolePermissions.ensure_can_grant_for_member(diff --git a/lib/plausible/teams/team_role_permissions.ex b/lib/plausible/teams/team_role_permissions.exindex 051abc3ef2..a5d0129db2 100644--- a/lib/plausible/teams/team_role_permissions.ex+++ b/lib/plausible/teams/team_role_permissions.ex@@ -23,6 +23,13 @@ defmodule Plausible.Teams.TeamRolePermissions do@type assignable_role() :: :owner | :admin | :editor | :viewer | :billing+ @doc """+ Whether someone with `role` may manage the team: invite people, change+ roles and remove members or invitations.+ """+ @spec can_manage_team?(Membership.role()) :: boolean()+ def can_manage_team?(role), do: role in [:owner, :admin]+@doc """Checks whether `granter` may change `membership`'s role to `to_role`.diff --git a/lib/plausible_web/live/components/team.ex b/lib/plausible_web/live/components/team.exindex e2ed689646..d34fac2d2b 100644--- a/lib/plausible_web/live/components/team.ex+++ b/lib/plausible_web/live/components/team.ex@@ -7,6 +7,7 @@ defmodule PlausibleWeb.Live.Components.Team doimport PlausibleWeb.Components.Genericalias Plausible.Auth.User+ alias Plausible.Teams.TeamRolePermissionsalias PlausibleWeb.Components.PrimaListbox@role_descriptions [@@ -35,6 +36,7 @@ defmodule PlausibleWeb.Live.Components.Team doattr(:pending?, :boolean, default: false)attr(:disabled, :boolean, default: false)attr(:remove_disabled, :boolean, default: false)+ attr(:role_change_disabled, :boolean, default: false)def member(assigns) do~H"""@@ -84,7 +86,7 @@ defmodule PlausibleWeb.Live.Components.Team dorole={@role}my_role={@my_role}me?={@me?}- disabled={@disabled}+ disabled={@disabled or @role_change_disabled}/><.delete_button@@ -137,7 +139,7 @@ defmodule PlausibleWeb.Live.Components.Team dodisplay={role_to_capitalized_string(role)}phx-hook="Confirm"data-confirm-message={- if @me? and role in [:editor, :billing, :viewer], do: lower_role_warning()+ if @me? and not TeamRolePermissions.can_manage_team?(role), do: lower_role_warning()}><div class="flex items-center justify-between gap-x-2">@@ -202,14 +204,11 @@ defmodule PlausibleWeb.Live.Components.Team doenddefp selectable_role_descriptions(my_role) do- Enum.reject(@role_descriptions, fn {role, _description} ->- role_change_disabled?(my_role, role)+ Enum.filter(@role_descriptions, fn {role, _description} ->+ TeamRolePermissions.ensure_can_grant_role(my_role, role) == :okend)end- defp role_change_disabled?(my_role, :owner), do: my_role != :owner- defp role_change_disabled?(my_role, _role), do: my_role not in [:owner, :admin]-defp lower_role_warning() do"You're about to lower your own role. Some team management features will no longer be accessible to you, and you'll need to ask a team owner to restore your access. Do you want to continue?"enddiff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 2c52448b35..22b66f985a 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -1,10 +1,11 @@defmodule PlausibleWeb.Live.TeamManagement do@moduledoc """- Live view for enqueuing and applying team membership adjustments.+ Live view for applying team membership adjustments."""use PlausibleWeb, :live_viewalias Plausible.Teams+ alias Plausible.Teams.TeamRolePermissionsalias Plausible.Auth.Userimport PlausibleWeb.Live.Components.Team@@ -24,7 +25,6 @@ defmodule PlausibleWeb.Live.TeamManagement doteam_members_limit: team_members_limit,layout: layout,my_role: my_role,- team_layout_changed?: false,input_email: "")end@@ -51,7 +51,10 @@ defmodule PlausibleWeb.Live.TeamManagement dovalue={@input_email}placeholder="Enter e-mail"phx-debounce={200}- readonly={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}+ readonly={+ at_limit?(@layout, @team_members_limit) or+ not TeamRolePermissions.can_manage_team?(@my_role)+ }/></div>@@ -65,7 +68,10 @@ defmodule PlausibleWeb.Live.TeamManagement do<.buttonid="invite-member"type="submit"- disabled={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}+ disabled={+ at_limit?(@layout, @team_members_limit) or+ not TeamRolePermissions.can_manage_team?(@my_role)+ }>Invite</.button>@@ -85,7 +91,7 @@ defmodule PlausibleWeb.Live.TeamManagement doremove_disabled={not Layout.removable?(@layout, email)}disabled={(entry.role == :owner && Layout.owners_count(@layout) == 1) or- @my_role not in [:owner, :admin]+ not TeamRolePermissions.can_manage_team?(@my_role)}/></div>@@ -108,13 +114,18 @@ defmodule PlausibleWeb.Live.TeamManagement dopending?={entry.type in [:invitation_pending, :invitation_sent]}my_role={@my_role}remove_disabled={not Layout.removable?(@layout, email)}- disabled={@my_role not in [:owner, :admin]}+ role_change_disabled={entry.type in [:invitation_pending, :invitation_sent]}+ disabled={not TeamRolePermissions.can_manage_team?(@my_role)}/></div></div>"""end+ @permission_denied_message "Permission denied"+ @not_found_message "This member or invitation doesn't exist anymore. Please reload the page"+ @only_one_owner_message "The team has to have at least one owner"+def handle_event("form-changed", params, socket) do{:noreply, assign(socket, input_email: params["input-email"])}end@@ -122,144 +133,199 @@ defmodule PlausibleWeb.Live.TeamManagement dodef handle_event("input-invitation",%{"input-email" => email, "input-role" => role},- %{assigns: %{layout: layout}} = socket+ %{assigns: %{current_team: team, current_user: current_user}} = socket) doemail = String.trim(email)role = role_to_atom(role)-- existing_entry = Map.get(layout, email)+ socket = assign(socket, input_email: 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(+ case Teams.Invitations.InviteToTeam.invite_all(reload(team), current_user, [+ %{email: email, role: role}+ ]) do+ {:ok, invitations} ->+ Teams.Invitations.InviteToTeam.send_invitation_emails(invitations)+ socket |> reset() |> put_live_flash(:success, "#{email} has been invited")++ {:error, reason} when reason in [:invalid_email, :already_a_member, :already_invited] ->+ put_live_flash(+ socket,:error,- "Make sure the e-mail is valid and is not taken already in your team layout"+ "Make sure the e-mail is valid and not already taken by an existing member or invitation")- 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, :already_a_guest} ->+ put_live_flash(+ socket,:error,- "Make sure the e-mail is valid and is not taken already in your team layout"+ "This e-mail belongs to a guest. Please change their role below, or delete and invite them again.")- end- {:noreply, socket}- end+ {:error, :already_invited_guest} ->+ put_live_flash(+ socket,+ :error,+ "This e-mail is already invited as a guest. To invite them to the team, please delete the guest invitation first."+ )- 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, :permission_denied} ->+ put_live_flash(socket, :error, @permission_denied_message)- {:error, message} ->- socket- |> put_live_flash(+ {:error, {:over_limit, limit}} ->+ put_live_flash(+ socket,:error,- message+ "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit")end{:noreply, socket}end+ def handle_event("remove-member", %{"email" => email}, %{assigns: %{layout: layout}} = socket) do+ {:noreply, remove(socket, Map.fetch!(layout, email))}+ end+def handle_event("update-role",%{"email" => email, "role" => role},%{assigns: %{layout: layout}} = socket) do- socket =- update_layout(socket, Layout.update_role(layout, email, role_to_atom(role)))- |> push_event("js-exec", %{- to: "#member-row-#{:erlang.phash2(email)}",- attr: "data-role-changed"- })-- {:noreply, socket}+ {:noreply, update_role(socket, Map.fetch!(layout, email), role_to_atom(role))}end- defp valid_email?(email) do- String.contains?(email, "@") and String.contains?(email, ".")- end+ defp remove(socket, %Layout.Entry{type: :membership, meta: membership}) do+ %{current_team: team, current_user: current_user} = socket.assigns+ myself? = membership.user.id == current_user.id++ case Teams.Memberships.Remove.remove(reload(team), membership.user.id, current_user) do+ {:ok, _} when myself? ->+ socket+ |> put_flash(:success, "You have left the team")+ |> redirect(to: ~p"/sites?#{[__team: "none"]}")++ {:ok, _} ->+ socket+ |> reset()+ |> put_live_flash(:success, "#{membership.user.email} has been removed from the team")- defp update_layout(socket, layout) do- socket- |> assign(layout: layout, team_layout_changed?: true)- |> save_team_layout()+ {:error, :membership_not_found} ->+ put_live_flash(socket, :error, @not_found_message)++ {:error, reason} when reason in [:permission_denied, :not_a_member] ->+ put_live_flash(socket, :error, @permission_denied_message)++ {:error, :only_one_owner} ->+ put_live_flash(socket, :error, @only_one_owner_message)+ endend- defp save_team_layout(- %{assigns: %{layout: layout, current_team: current_team, current_user: current_user}} =- socket- ) do- result =- Layout.persist(layout, %{- current_user: current_user,- current_team: Plausible.Repo.reload!(current_team)- })-- case result do+ defp remove(socket, %Layout.Entry{type: :invitation_sent, meta: invitation}) do+ %{current_team: team, current_user: current_user} = socket.assigns++ case Teams.Invitations.RemoveFromTeam.remove(+ reload(team),+ invitation.invitation_id,+ current_user+ ) do{:ok, _} ->- case Teams.Memberships.team_role(current_team, current_user) do- {:ok, role} when role in [:viewer, :billing, :editor] ->- redirect(socket,- to: ~p"/settings/team/general?#{[__team: current_team.identifier]}"- )+ socket+ |> reset()+ |> put_live_flash(:success, "The invitation for #{invitation.email} has been removed")++ {:error, :invitation_not_found} ->+ put_live_flash(socket, :error, @not_found_message)- {:ok, _} ->- reset(socket)+ {:error, reason} when reason in [:permission_denied, :not_a_member] ->+ put_live_flash(socket, :error, @permission_denied_message)+ end+ end- {:error, :not_a_member} ->- redirect(socket, to: ~p"/sites?#{[__team: "none"]}")- end+ defp update_role(socket, %Layout.Entry{type: :membership, meta: membership}, role) do+ %{current_team: team, current_user: current_user} = socket.assigns- {:error, :permission_denied} ->+ demoting_myself? =+ membership.user.id == current_user.id and+ not TeamRolePermissions.can_manage_team?(role)++ case Teams.Memberships.UpdateRole.update(+ reload(team),+ membership.user.id,+ role,+ current_user+ ) do+ {:ok, _} when demoting_myself? ->socket- |> put_live_flash(- :error,- "Permission denied"- )+ |> put_flash(:success, "Your role has been changed to #{role_name(role)}")+ |> redirect(to: ~p"/settings/team/general?#{[__team: team.identifier]}")- {:error, :only_one_owner} ->+ {:ok, _} ->socket+ |> reset()|> put_live_flash(- :error,- "The team has to have at least one owner"+ :success,+ "#{membership.user.email}'s role has been changed to #{role_name(role)}")+ |> animate_role_change(membership.user.email)++ {:error, :membership_not_found} ->+ put_live_flash(socket, :error, @not_found_message)++ {:error, :permission_denied} ->+ put_live_flash(socket, :error, @permission_denied_message)++ {:error, :only_one_owner} ->+ put_live_flash(socket, :error, @only_one_owner_message){:error, :disabled_2fa} ->+ put_live_flash(socket, :error, "User must have 2FA enabled to become an owner")+ end+ end++ defp update_role(socket, %Layout.Entry{type: :invitation_sent, meta: invitation}, role) do+ %{current_team: team, current_user: current_user} = socket.assigns++ case Teams.Invitations.UpdateRole.update(+ reload(team),+ invitation.invitation_id,+ role,+ current_user+ ) do+ {:ok, _} ->socket+ |> reset()|> put_live_flash(- :error,- "User must have 2FA enabled to become an owner"+ :success,+ "The invitation for #{invitation.email} now has the #{role_name(role)} role")+ |> animate_role_change(invitation.email)- {:error, {:over_limit, limit}} ->- socket- |> put_live_flash(+ {:error, :invitation_not_found} ->+ put_live_flash(socket, :error, @not_found_message)++ {:error, :guest_invitation} ->+ put_live_flash(+ socket,:error,- "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit"+ "A guest invitation can't be changed into a team invitation. Remove it and send a team invitation instead")++ {:error, :permission_denied} ->+ put_live_flash(socket, :error, @permission_denied_message)endend+ defp animate_role_change(socket, email) do+ push_event(socket, "js-exec", %{+ to: "#member-row-#{:erlang.phash2(email)}",+ attr: "data-role-changed"+ })+ end++ defp reload(team), do: Plausible.Repo.reload!(team)++ defp role_name(role), do: role |> to_string() |> String.capitalize()+defp entry_label(%Layout.Entry{role: :guest, type: :membership}, _), do: nildefp entry_label(%Layout.Entry{type: :invitation_pending}, _), do: "Invitation pending"defp entry_label(%Layout.Entry{type: :invitation_sent}, _), do: "Invitation sent"diff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exsindex 19651ff688..d34b0d92db 100644--- a/test/plausible/teams/memberships/update_role_test.exs+++ b/test/plausible/teams/memberships/update_role_test.exs@@ -14,7 +14,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest docollaborator = add_member(team, role: :editor)assert_team_membership(collaborator, team, :editor)- assert {:ok, _} = UpdateRole.update(team, collaborator.id, "viewer", user)+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, :viewer, user)assert_team_membership(collaborator, team, :viewer)end@@ -25,7 +25,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest doteam = team_of(user)_collaborator = add_member(team, role: :owner)- assert {:ok, _} = UpdateRole.update(team, user.id, "viewer", user)+ assert {:ok, _} = UpdateRole.update(team, user.id, :viewer, user)assert_team_membership(user, team, :viewer)assert_no_emails_delivered()@@ -36,7 +36,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do_site = new_site(owner: user)team = team_of(user)- assert {:error, :only_one_owner} = UpdateRole.update(team, user.id, "viewer", user)+ assert {:error, :only_one_owner} = UpdateRole.update(team, user.id, :viewer, user)assert_team_membership(user, team, :owner)assert_no_emails_delivered()@@ -50,7 +50,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do_admin = add_member(team, user: user, role: :admin)_another_owner = add_member(team, role: :owner)- assert {:error, :permission_denied} = UpdateRole.update(team, owner.id, "viewer", user)+ assert {:error, :permission_denied} = UpdateRole.update(team, owner.id, :viewer, user)assert_team_membership(owner, team, :owner)assert_no_emails_delivered()@@ -64,7 +64,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest doadd_guest(site, role: :viewer, user: user)- assert {:ok, _} = UpdateRole.update(team, user.id, "editor", owner)+ assert {:ok, _} = UpdateRole.update(team, user.id, :editor, owner)assert_email_delivered_with(to: [nil: user.email],@@ -87,7 +87,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest donew_identity(collaborator.name, collaborator.email, integration)|> Plausible.Auth.SSO.provision_user()- assert {:ok, _} = UpdateRole.update(team, collaborator.id, "editor", user)+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, :editor, user)assert_team_membership(collaborator, team, :editor)end@@ -103,7 +103,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest donew_identity(collaborator.name, collaborator.email, integration)|> Plausible.Auth.SSO.provision_user()- assert {:ok, _} = UpdateRole.update(team, collaborator.id, "owner", user)+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, :owner, user)assert_team_membership(collaborator, team, :owner)end@@ -126,7 +126,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do{:ok, collaborator, _} = Plausible.Auth.TOTP.initiate(collaborator){:ok, collaborator, _} = Plausible.Auth.TOTP.enable(collaborator, :skip_verify)- assert {:ok, _} = UpdateRole.update(team, collaborator.id, "owner", user)+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, :owner, user)assert_team_membership(collaborator, team, :owner)end@@ -145,7 +145,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest donew_identity(collaborator.name, collaborator.email, integration)|> Plausible.Auth.SSO.provision_user()- assert {:error, :disabled_2fa} = UpdateRole.update(team, collaborator.id, "owner", user)+ assert {:error, :disabled_2fa} = UpdateRole.update(team, collaborator.id, :owner, user)endendenddiff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex 29dc6023b0..778f7235f8 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -826,7 +826,7 @@ defmodule PlausibleWeb.AuthControllerTest doadd_member(team, role: :owner)assert {:ok, _} =- Plausible.Teams.Memberships.UpdateRole.update(team, user.id, "editor", user)+ Plausible.Teams.Memberships.UpdateRole.update(team, user.id, :editor, user)assert Plausible.Teams.Memberships.team_role(team, user) == {:ok, :editor}diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex ecab3ed1d1..b82f63c43d 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -37,6 +37,28 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert find(resp, "#{guest_el()}:first-of-type") |> text() =~ "[email protected]"end+ test "disables changing the role of a pending guest invitation, but not removing it", %{+ conn: conn,+ team: team,+ user: user+ } do+ site = new_site(team: team)+ invite_guest(site, "[email protected]", role: :viewer, inviter: user)+ add_guest(site, role: :viewer, user: new_user(email: "[email protected]"))++ resp =+ conn+ |> get(team_general_path())+ |> html_response(200)++ assert text_of_attr(resp, role_dropdown_el("[email protected]"), "data-disabled") ==+ "true"++ refute attr_defined?(resp, remove_button_el("[email protected]"), "disabled")++ refute attr_defined?(resp, role_dropdown_el("[email protected]"), "data-disabled")+ end+test "does not render Guest divider when no guests found", %{conn: conn} doresp =conn@@ -117,6 +139,8 @@ defmodule PlausibleWeb.Live.TeamMangementTest dohtml = render(lv)+ assert text(html) =~ "[email protected] has been invited"+member_row1 = find(html, "#{member_el()}:nth-of-type(1)") |> text()assert member_row1 =~ "[email protected]"assert member_row1 =~ "Pending invitation"@@ -147,6 +171,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest dohtml = render(lv)assert text_of_element(html, "#{member2_row} #{role_el()}") == "Viewer"+ assert text(html) =~ "#{member2.email}'s role has been changed to Viewer"assert_no_emails_delivered()@@ -187,7 +212,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert Enum.count(Plausible.Teams.Invitations.pending_team_invitations_for(team)) == 3end- test "fails to accept invitation to already existing e-mail", %{+ test "fails to invite an e-mail belonging to an existing team member (e.g. yourself)", %{conn: conn,user: user} do@@ -195,7 +220,95 @@ defmodule PlausibleWeb.Live.TeamMangementTest doadd_invite(lv, user.email, "admin")assert lv |> render() |> text() =~- "Error! Make sure the e-mail is valid and is not taken already"+ "Error! Make sure the e-mail is valid and not already taken by an existing member or invitation"+ end++ test "fails to invite an e-mail that already has a pending invitation", %{+ conn: conn,+ user: user,+ team: team+ } do+ invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)++ lv = get_liveview(conn)+ add_invite(lv, "[email protected]", "admin")++ assert lv |> render() |> text() =~+ "Error! Make sure the e-mail is valid and not already taken by an existing member or invitation"++ assert Plausible.Repo.reload!(invitation).role == :viewer+ end++ test "fails to invite a guest's e-mail", %{conn: conn, team: team} do+ site = new_site(team: team)+ add_guest(site, role: :viewer, user: new_user(email: "[email protected]"))++ lv = get_liveview(conn)+ add_invite(lv, "[email protected]", "admin")++ assert lv |> render() |> text() =~+ "This e-mail belongs to a guest. Please change their role below"++ assert [] =+ team+ |> Plausible.Teams.Invitations.pending_team_invitations_for()+ |> Enum.filter(&(&1.role != :guest))+ end++ test "fails to invite an e-mail with a pending guest invitation", %{+ conn: conn,+ user: user,+ team: team+ } do+ site = new_site(team: team)+ invite_guest(site, "[email protected]", role: :viewer, inviter: user)++ lv = get_liveview(conn)+ add_invite(lv, "[email protected]", "admin")++ assert lv |> render() |> text() =~+ "This e-mail is already invited as a guest. To invite them to the team, please delete the guest invitation first."++ assert [%{role: :guest}] = Plausible.Teams.Invitations.pending_team_invitations_for(team)+ end++ test "allows updating a pending invitation's role in place", %{+ conn: conn,+ user: user,+ team: team+ } do+ invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)++ lv = get_liveview(conn)+ change_role(lv, "[email protected]", "editor")++ assert lv |> render() |> text() =~+ "The invitation for [email protected] now has the Editor role"++ assert Plausible.Repo.reload!(invitation).role == :editor+ assert_no_emails_delivered()+ end++ test "shows a success message after removing a member", %{conn: conn, team: team} do+ member = add_member(team, role: :viewer)++ lv = get_liveview(conn)+ remove_member(lv, member.email)++ assert lv |> render() |> text() =~ "#{member.email} has been removed from the team"+ end++ test "shows a success message after removing a pending invitation", %{+ conn: conn,+ user: user,+ team: team+ } do+ invite_member(team, "[email protected]", inviter: user, role: :viewer)++ lv = get_liveview(conn)+ remove_member(lv, "[email protected]")++ assert lv |> render() |> text() =~ "The invitation for [email protected] has been removed"end@tag :ee_only@@ -204,8 +317,6 @@ defmodule PlausibleWeb.Live.TeamMangementTest douser: user,team: team} do- insert(:growth_subscription, team: team)-member2 = add_member(team, role: :admin)_invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)@@ -258,6 +369,11 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert elem_count(html, member_el()) == 1refute element_exists?(html, "#guest-list")+ 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: member2.email],subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"@@ -435,7 +551,9 @@ defmodule PlausibleWeb.Live.TeamMangementTest doremove_member(lv, user.email)- assert_redirect(lv, "/sites?__team=none")+ flash = assert_redirect(lv, "/sites?__team=none")+ assert flash["success"] == "You have left the team"+ assert {:error, :not_a_member} = Plausible.Teams.Memberships.team_role(team, user)endtest "demotes self to billing, redirecting to team general", %{@@ -537,4 +655,12 @@ defmodule PlausibleWeb.Live.TeamMangementTest dodefp role_el() do~s|[data-testid="role"]|end++ defp role_dropdown_el(email) do+ ~s|[id="role-dropdown-#{email}"]|+ end++ defp remove_button_el(email) do+ ~s|[id="#{:erlang.phash2(email)}-remove"]|+ endend