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
Improve team manegement UX for member removal and role change (#6470)
Adam Rutkowskibc1954e7292b
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 3d71dfd415..58fd7d5a89 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file.### Fixed+- Improve team member removal/team role change- Validate empty filter clauses list in Stats API v2- Fixed Stats API timeseries returning time buckets falling outside the queried range- Fixed issue with all non-interactive events being counted as interactivediff --git a/lib/plausible_web/live/components/team.ex b/lib/plausible_web/live/components/team.exindex a8d48a947e..06d2a14218 100644--- a/lib/plausible_web/live/components/team.ex+++ b/lib/plausible_web/live/components/team.ex@@ -12,6 +12,7 @@ defmodule PlausibleWeb.Live.Components.Team doattr(:label, :string, default: nil)attr(:role, :atom, default: nil)attr(:my_role, :atom, required: true)+ attr(:me?, :boolean, default: false)attr(:disabled, :boolean, default: false)attr(:remove_disabled, :boolean, default: false)@@ -87,6 +88,7 @@ defmodule PlausibleWeb.Live.Components.Team dorole={:editor}disabled={@disabled or @role == :editor}dispatch_animation?={@role == :guest}+ data-confirm={if @me?, do: lower_role_warning()}>Create and view new sites</.role_item>@@ -98,6 +100,7 @@ defmodule PlausibleWeb.Live.Components.Team dorole={:billing}disabled={@disabled or @role == :billing}dispatch_animation?={@role == :guest}+ data-confirm={if @me?, do: lower_role_warning()}>Manage subscription</.role_item>@@ -109,6 +112,7 @@ defmodule PlausibleWeb.Live.Components.Team dorole={:viewer}disabled={@disabled or @role == :viewer}dispatch_animation?={@role == :guest}+ data-confirm={if @me?, do: lower_role_warning()}>View all sites under your team</.role_item>@@ -121,6 +125,7 @@ defmodule PlausibleWeb.Live.Components.Team dophx-click="remove-member"phx-value-email={@user.email}phx-value-name={@user.name}+ data-confirm="Are you sure you want to remove this member from the team?"><div class={not @remove_disabled &&@@ -185,4 +190,8 @@ defmodule PlausibleWeb.Live.Components.Team do</.dropdown_item>"""end++ 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?"+ endenddiff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 77b7456196..7ca901c166 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -122,6 +122,7 @@ defmodule PlausibleWeb.Live.TeamManagement douser={%User{email: entry.email, name: entry.name}}role={entry.role}label={entry_label(entry, @current_user)}+ me?={entry.id == @current_user.id}my_role={@my_role}remove_disabled={not Layout.removable?(@layout, email)}disabled={@@ -299,7 +300,18 @@ defmodule PlausibleWeb.Live.TeamManagement do){{:ok, _}, :team_management} ->- reset(socket)+ case Teams.Memberships.team_role(current_team, current_user) do+ {:ok, role} when role in [:viewer, :billing, :editor] ->+ redirect(socket,+ to: Routes.settings_path(socket, :team_general, __team: current_team.identifier)+ )++ {:ok, _} ->+ reset(socket)++ {:error, :not_a_member} ->+ redirect(socket, to: Routes.site_path(socket, :index, __team: "none"))+ end{{:error, :permission_denied}, _} ->socketdiff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 76aae48d4c..5b220d2857 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -387,6 +387,84 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert_team_membership(member2, team, :owner)end+ test "remove member items carry data-confirm for both self and others", %{+ conn: conn,+ team: team,+ user: user+ } do+ member2 = add_member(team, role: :owner)++ lv = get_liveview(conn)+ html = render(lv)++ assert attr_defined?(html, "##{:erlang.phash2(user.email)}-remove", "data-confirm")+ assert attr_defined?(html, "##{:erlang.phash2(member2.email)}-remove", "data-confirm")+ end++ test "self-demotion role items carry data-confirm, others do not", %{+ conn: conn,+ team: team,+ user: user+ } do+ # Second owner is required so the current user's own dropdown is not disabled+ member2 = add_member(team, role: :owner)++ lv = get_liveview(conn)+ html = render(lv)++ my_hash = :erlang.phash2(user.email)+ other_hash = :erlang.phash2(member2.email)++ for role <- ~w(editor billing viewer) do+ assert attr_defined?(html, "#option-#{my_hash}-#{role}", "data-confirm"),+ "expected data-confirm on self #{role} item"++ refute attr_defined?(html, "#option-#{other_hash}-#{role}", "data-confirm"),+ "expected no data-confirm on other member #{role} item"+ end++ for role <- ~w(owner admin) do+ refute attr_defined?(html, "#option-#{my_hash}-#{role}", "data-confirm"),+ "expected no data-confirm on self #{role} item"+ end+ end++ test "removes self, redirecting away from team", %{conn: conn, team: team} do+ _owner2 = add_member(team, role: :owner)++ lv = get_liveview(conn)++ remove_member(lv, 1)++ assert_redirect(lv, "/sites?__team=none")+ end++ test "demotes self to billing, redirecting to team general", %{+ conn: conn,+ team: team+ } do+ _owner2 = add_member(team, role: :owner)++ lv = get_liveview(conn)++ change_role(lv, 1, "billing")++ assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")+ end++ test "demotes self to viewer, redirecting to team general", %{+ conn: conn,+ team: team+ } do+ _owner2 = add_member(team, role: :owner)++ lv = get_liveview(conn)++ change_role(lv, 1, "viewer")++ assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")+ end+test "billing role is supported",%{conn: conn,@@ -400,24 +478,17 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert_team_membership(member2, team, :billing)end- test "degrading owner to non-admin makes everything read-only", %{conn: conn, team: team} do+ test "demotes self to editor, redirecting to team general", %{+ conn: conn,+ team: team+ } do_owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- change_role(lv, 1, "billing")-- html = render(lv)-- options =- lv- |> render()- |> find("#{member_el()} a")-- assert Enum.empty?(options)+ change_role(lv, 1, "editor")- assert attr_defined?(html, ~s|#team-layout-form input[name="input-email"]|, "readonly")- assert attr_defined?(html, ~s|#invite-member|, "disabled")+ assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")endend