Skip to content

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

Only show nag screen when the current team has any sites (#5257)

Adrian Gruntkowskiffa82176a273
diff --git a/lib/plausible/teams/users.ex b/lib/plausible/teams/users.ex
index 27fad0b310..45a00e2679 100644
--- a/lib/plausible/teams/users.ex
+++ b/lib/plausible/teams/users.ex
@@ -130,6 +130,7 @@ defmodule Plausible.Teams.Users do
def owns_sites?(user, opts \\ []) do
include_pending? = Keyword.get(opts, :include_pending?, false)
+ only_team = Keyword.get(opts, :only_team)
sites_query =
from(
@@ -148,6 +149,13 @@ defmodule Plausible.Teams.Users do
select: 1
)
+ owner_query =
+ if only_team do
+ where(owner_query, [tm], tm.team_id == ^only_team.id)
+ else
+ owner_query
+ end
+
query =
if include_pending? do
site_transfer_query =
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 69faa41306..74fa22599f 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -39,7 +39,8 @@ defmodule PlausibleWeb.Live.Sites do
current_user: current_user,
current_team: current_team
} ->
- Teams.Users.owns_sites?(current_user, include_pending?: true) &&
+ current_team &&
+ Teams.Users.owns_sites?(current_user, include_pending?: true, only_team: current_team) &&
Teams.Billing.check_needs_to_upgrade(current_team)
end)
diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs
index dd49ba7c2e..9bd040c37c 100644
--- a/test/plausible_web/live/sites_test.exs
+++ b/test/plausible_web/live/sites_test.exs
@@ -108,6 +108,83 @@ defmodule PlausibleWeb.Live.SitesTest do
assert get_in(invitation_data, ["invitations", transfer.transfer_id, "no_plan"])
end
+ @tag :ee_only
+ test "renders upgrade nag when current team has a site and trial expired", %{
+ conn: conn,
+ user: user
+ } do
+ team = new_site(owner: user).team
+
+ team
+ |> Ecto.Changeset.change(trial_expiry_date: Date.add(Date.utc_today(), -1))
+ |> Repo.update!()
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert html =~ "Payment required"
+ end
+
+ @tag :ee_only
+ test "renders upgrade nag when there's a pending transfer", %{
+ conn: conn,
+ user: user
+ } do
+ {:ok, personal_team} = Plausible.Teams.get_or_create(user)
+
+ another_user = new_user()
+ site = new_site(owner: another_user)
+
+ personal_team
+ |> Ecto.Changeset.change(trial_expiry_date: Date.add(Date.utc_today(), -1))
+ |> Repo.update!()
+
+ invite_transfer(site, user, inviter: another_user)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ assert html =~ "Payment required"
+ end
+
+ @tag :ee_only
+ test "does not render upgrade nag when there's no current team", %{conn: conn, user: user} do
+ team = new_site().team |> Plausible.Teams.complete_setup()
+ add_member(team, user: user, role: :owner)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ refute html =~ "Payment required"
+ end
+
+ @tag :ee_only
+ test "does not render upgrade nag when current team has no sites and user has no pending transfers",
+ %{conn: conn, user: user} do
+ {:ok, _personal_team} = Plausible.Teams.get_or_create(user)
+
+ team = new_site().team |> Plausible.Teams.complete_setup()
+ add_member(team, user: user, role: :owner)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ refute html =~ "Payment required"
+ end
+
+ @tag :ee_only
+ test "does not render upgrade nag if current team does not have any sites yet and user has no pending transfers",
+ %{conn: conn, user: user} do
+ {:ok, personal_team} = Plausible.Teams.get_or_create(user)
+
+ personal_team
+ |> Ecto.Changeset.change(trial_expiry_date: Date.add(Date.utc_today(), -1))
+ |> Repo.update!()
+
+ team = new_site().team |> Plausible.Teams.complete_setup()
+ add_member(team, user: user, role: :owner)
+
+ {:ok, _lv, html} = live(conn, "/sites")
+
+ refute html =~ "Payment required"
+ end
+
@tag :ee_only
test "renders ownership transfer invitation for a case with exceeded limits", %{
conn: conn,