Team Management UI

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}
     end
   end
@@ -86,4 +88,15 @@ defmodule Plausible.Teams.Memberships.UpdateRole do
   defp can_grant_role_to_other?(:admin, :viewer, :editor), do: true
   defp can_grant_role_to_other?(:admin, :viewer, :viewer), do: true
   defp 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
+  end
 end

test/plausible/teams/management/layout_test.exs

@@ -422,5 +422,24 @@ defmodule Plausible.Teams.Management.LayoutTest do
 
       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
 end

test/plausible_web/controllers/team_controller_test.exs

@@ -1,4 +1,5 @@
 defmodule PlausibleWeb.TeamControllerTest do
+  # XXX: remove this whole controller -> rewrite to UpdateRole tests
   use PlausibleWeb.ConnCase, async: true
   use Plausible.Repo
   use Plausible.Teams.Test

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) do
     user
     |> team_of()