Skip to content

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

CRM: Expose site transfer (#5418)

hq127933d0045c4
diff --git a/extra/lib/plausible_web/live/customer_support/live/site.ex b/extra/lib/plausible_web/live/customer_support/live/site.ex
index b51bf95c3b..269965fdb0 100644
--- a/extra/lib/plausible_web/live/customer_support/live/site.ex
+++ b/extra/lib/plausible_web/live/customer_support/live/site.ex
@@ -2,6 +2,10 @@ defmodule PlausibleWeb.CustomerSupport.Live.Site do
@moduledoc false
use Plausible.CustomerSupport.Resource, :component
+ alias PlausibleWeb.Live.Components.ComboBox
+ alias Plausible.Repo
+ import Ecto.Query
+
def update(%{resource_id: resource_id}, socket) do
site = Resource.Site.get(resource_id)
changeset = Plausible.Site.crm_changeset(site, %{})
@@ -25,6 +29,13 @@ defmodule PlausibleWeb.CustomerSupport.Live.Site do
{:ok, assign(socket, people: people, tab: "people")}
end
+ def update(%{tab: "rescue-zone"}, %{assigns: %{site: site}} = socket) do
+ first_owner =
+ hd(Repo.preload(site, :owners).owners)
+
+ {:ok, assign(socket, tab: "rescue-zone", first_owner: first_owner)}
+ end
+
def update(_, socket) do
{:ok, assign(socket, tab: "overview")}
end
@@ -85,6 +96,9 @@ defmodule PlausibleWeb.CustomerSupport.Live.Site do
<.tab to="people" tab={@tab}>
People
</.tab>
+ <.tab to="rescue-zone" tab={@tab}>
+ Rescue Zone
+ </.tab>
</nav>
</div>
</div>
@@ -171,6 +185,39 @@ defmodule PlausibleWeb.CustomerSupport.Live.Site do
</:tbody>
</.table>
</div>
+
+ <div :if={@tab == "rescue-zone"} class="mt-8">
+ <h1 class="text-xs font-semibold">Transfer Site</h1>
+ <form class="mt-4 mb-8" phx-target={@myself} phx-submit="init-transfer">
+ <.label for="inviter_email">
+ Initiate transfer as
+ </.label>
+ <.live_component
+ id="inviter_email"
+ submit_name="inviter_email"
+ class={[
+ "mb-4"
+ ]}
+ module={ComboBox}
+ suggest_fun={fn input, _ -> search_email(input) end}
+ selected={{@first_owner.email, "#{@first_owner.name} <#{@first_owner.email}>"}}
+ />
+
+ <.label for="invitee_email">
+ Send transfer invitation to
+ </.label>
+ <.live_component
+ id="invitee_email"
+ submit_name="invitee_email"
+ module={ComboBox}
+ suggest_fun={fn input, _ -> search_email(input) end}
+ creatable
+ />
+ <.button phx-target={@myself} type="submit">
+ Initiate Site Transfer
+ </.button>
+ </form>
+ </div>
</div>
"""
end
@@ -232,4 +279,40 @@ defmodule PlausibleWeb.CustomerSupport.Live.Site do
{:noreply, push_navigate(put_flash(socket, :success, "Site deleted"), to: "/cs")}
end
+
+ def handle_event("init-transfer", params, socket) do
+ inviter = Plausible.Repo.get_by!(Plausible.Auth.User, email: params["inviter_email"])
+
+ case Plausible.Teams.Invitations.InviteToSite.invite(
+ socket.assigns.site,
+ inviter,
+ params["invitee_email"],
+ :owner
+ ) do
+ {:ok, _transfer} ->
+ success(socket, "Transfer e-mail sent!")
+
+ error ->
+ failure(socket, inspect(error))
+ end
+
+ {:noreply, socket}
+ end
+
+ defp search_email(input) do
+ Repo.all(
+ from u in Plausible.Auth.User,
+ where: ilike(u.name, ^"%#{input}%") or ilike(u.email, ^"%#{input}%"),
+ limit: 20,
+ order_by: [
+ desc: fragment("?.name = ?", u, ^input),
+ desc: fragment("?.email = ?", u, ^input),
+ asc: u.name
+ ],
+ select: {u.email, u.name}
+ )
+ |> Enum.map(fn {email, name} ->
+ {email, "#{name} <#{email}>"}
+ end)
+ end
end
diff --git a/lib/plausible/teams/invitations/invite_to_site.ex b/lib/plausible/teams/invitations/invite_to_site.ex
index 08710c1fb6..c07f4a3403 100644
--- a/lib/plausible/teams/invitations/invite_to_site.ex
+++ b/lib/plausible/teams/invitations/invite_to_site.ex
@@ -37,6 +37,7 @@ defmodule Plausible.Teams.Invitations.InviteToSite do
end)
end
+ # XXX: remove with kaffy
@spec bulk_invite([Site.t()], User.t(), String.t(), atom(), Keyword.t()) ::
{:ok, [invitation]} | {:error, invite_error()}
def bulk_invite(sites, inviter, invitee_email, role, opts \\ []) do
diff --git a/lib/plausible/teams/sites/transfer.ex b/lib/plausible/teams/sites/transfer.ex
index 5deb29ce10..38b9278e0c 100644
--- a/lib/plausible/teams/sites/transfer.ex
+++ b/lib/plausible/teams/sites/transfer.ex
@@ -17,6 +17,7 @@ defmodule Plausible.Teams.Sites.Transfer do
| :multiple_teams
| :permission_denied
+ # XXX: remove with kaffy
@spec bulk_transfer([Site.t()], Auth.User.t(), Teams.Team.t() | nil) ::
{:ok, [Teams.Membership.t()]} | {:error, transfer_error()}
def bulk_transfer(sites, new_owner, team \\ nil) do
diff --git a/test/plausible_web/live/customer_support/sites_test.exs b/test/plausible_web/live/customer_support/sites_test.exs
index 015a0da2fb..e74518de57 100644
--- a/test/plausible_web/live/customer_support/sites_test.exs
+++ b/test/plausible_web/live/customer_support/sites_test.exs
@@ -1,20 +1,23 @@
defmodule PlausibleWeb.Live.CustomerSupport.SitesTest do
use PlausibleWeb.ConnCase, async: false
- use Plausible.Teams.Test
- use Plausible
@moduletag :ee_only
on_ee do
+ use Plausible.Teams.Test
+ use Plausible
+ use Bamboo.Test, shared: true
+
import Phoenix.LiveViewTest
import Plausible.Test.Support.HTML
- defp open_site(id) do
+ defp open_site(id, opts \\ []) do
Routes.customer_support_resource_path(
PlausibleWeb.Endpoint,
:details,
:sites,
:site,
- id
+ id,
+ opts
)
end
@@ -36,5 +39,66 @@ defmodule PlausibleWeb.Live.CustomerSupport.SitesTest do
end
end
end
+
+ describe "rescue zone" do
+ setup [:create_user, :log_in, :create_site]
+
+ setup %{user: user} do
+ patch_env(:super_admin_user_ids, [user.id])
+ end
+
+ test "form renders", %{site: site, conn: conn} do
+ {:ok, lv, _html} = live(conn, open_site(site.id, tab: "rescue-zone"))
+ html = render(lv)
+
+ form = ~s|form[phx-submit="init-transfer"]|
+
+ assert element_exists?(html, ~s|#{form} input#inviter_email|)
+
+ assert element_exists?(html, ~s|#{form} input#invitee_email|)
+
+ assert element_exists?(html, ~s|#{form} input#submit-inviter_email|)
+
+ assert element_exists?(html, ~s|#{form} input#submit-invitee_email|)
+
+ assert element_exists?(html, ~s|#{form} button[type="submit"]|)
+ end
+
+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
+ test "form submission creates invitation", %{user: user, site: site, conn: conn} do
+ {:ok, lv, _html} = live(conn, open_site(site.id, tab: "rescue-zone"))
+ render(lv)
+
+ type_into_combo(lv, "inviter_email", user.name)
+
+ lv
+ |> element("li#dropdown-inviter_email-option-1 a")
+ |> render_click()
+
+ type_into_combo(lv, "invitee_email", "[email protected]")
+
+ lv
+ |> element("li#dropdown-invitee_email-option-0 a")
+ |> render_click()
+
+ form = ~s|form[phx-submit="init-transfer"]|
+ lv |> element(form) |> render_submit()
+
+ assert_email_delivered_with(
+ to: [nil: "[email protected]"],
+ subject: @subject_prefix <> "Request to transfer ownership of #{site.domain}",
+ html_body: ~r/#{user.email}/
+ )
+ end
+ end
+
+ defp type_into_combo(lv, id, text) do
+ lv
+ |> element("input##{id}")
+ |> render_change(%{
+ "_target" => ["display-#{id}"],
+ "display-#{id}" => "#{text}"
+ })
+ end
end
end