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
Refine team switching and switch from `my_team` to `current_team` (#5144)
Adrian Gruntkowski486a27249891
diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex 9314df1fc0..76a5a9aae4 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -145,7 +145,7 @@ defmodule Plausible.Billing do# this could result in assigning this new subscription to the newly owned team,# effectively "shadowing" any old one.#- # That's why we are always defaulting to creating a new "My Team" team regardless+ # That's why we are always defaulting to creating a new "My Personal Sites" team regardless# if they were owner of one before or not.Auth.User|> Repo.get!(user_id)diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex 1881b14c4e..5b18ff6c37 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -210,10 +210,10 @@ defmodule Plausible.SiteAdmin doteam_name =case site.owners do[owner] ->- if site.team.name == "My Team" do- owner.name- else+ if site.team.setup_complete dosite.team.name+ else+ owner.nameend[_ | _] ->diff --git a/lib/plausible/teams.ex b/lib/plausible/teams.exindex e49e966ebc..df6adaf829 100644--- a/lib/plausible/teams.ex+++ b/lib/plausible/teams.ex@@ -12,8 +12,25 @@ defmodule Plausible.Teams do@accept_traffic_until_free ~D[2135-01-01]+ @spec default_name() :: String.t()+ def default_name(), do: "My Personal Sites"++ @spec name(nil | Teams.Team.t()) :: String.t()+ def name(nil), do: default_name()+ def name(%{setup_complete: false}), do: default_name()+ def name(team), do: team.name++ @spec setup?(nil | Teams.Team.t()) :: boolean()+ def setup?(nil), do: false+ def setup?(%{setup_complete: setup_complete}), do: setup_complete++ @spec enabled?(nil | Teams.Team.t()) :: boolean()+ def enabled?(nil) do+ FunWithFlags.enabled?(:teams)+ end+def enabled?(team) do- not is_nil(team) and FunWithFlags.enabled?(:teams, for: team)+ FunWithFlags.enabled?(:teams, for: team)end@spec get(pos_integer() | binary() | nil) :: Teams.Team.t() | nil@@ -115,7 +132,7 @@ defmodule Plausible.Teams do@doc """Get or create user's team.- If the user has no non-guest membership yet, an implicit "My Team" team is+ If the user has no non-guest membership yet, an implicit "My Personal Sites" team iscreated with them as an owner.If the user already has an owner membership in an existing team,@@ -126,13 +143,13 @@ defmodule Plausible.Teams do"""@spec get_or_create(Auth.User.t()) :: {:ok, Teams.Team.t()} | {:error, :multiple_teams}def get_or_create(user) do- with {:error, :no_team} <- get_by_owner(user) do+ with {:error, :no_team} <- get_owned_team(user, only_not_setup?: true) docase create_my_team(user) do{:ok, team} ->{:ok, team}{:error, :exists_already} ->- get_by_owner(user)+ get_owned_team(user, only_not_setup?: true)endendend@@ -141,14 +158,7 @@ defmodule Plausible.Teams dodef force_create_my_team(user) do{:ok, team} =Repo.transaction(fn ->- Repo.update_all(- from(tm in Teams.Membership,- where: tm.user_id == ^user.id,- where: tm.is_autocreated == true- ),- set: [is_autocreated: false]- )-+ clear_autocreated(user){:ok, team} = create_my_team(user)teamend)@@ -156,32 +166,29 @@ defmodule Plausible.Teams doteamend- @spec get_by_owner(Auth.User.t() | pos_integer()) ::- {:ok, Teams.Team.t()} | {:error, :no_team | :multiple_teams}- def get_by_owner(user_id) when is_integer(user_id) do- result =- from(tm in Teams.Membership,- inner_join: t in assoc(tm, :team),- where: tm.user_id == ^user_id and tm.role == :owner,- select: t,- order_by: t.id- )- |> Repo.all()+ @spec complete_setup(Teams.Team.t()) :: Teams.Team.t()+ def complete_setup(team) do+ if not team.setup_complete do+ team =+ team+ |> Teams.Team.setup_changeset()+ |> Repo.update!()+ |> Repo.preload(:owners)- case result do- [] ->- {:error, :no_team}+ [owner] = team.owners- [team] ->- {:ok, team}+ clear_autocreated(owner)- _teams ->- {:error, :multiple_teams}+ team+ else+ teamendend- def get_by_owner(%Auth.User{} = user) do- get_by_owner(user.id)+ @spec get_by_owner(Auth.User.t()) ::+ {:ok, Teams.Team.t()} | {:error, :no_team | :multiple_teams}+ def get_by_owner(user) do+ get_owned_team(user)end@spec update_accept_traffic_until(Teams.Team.t()) :: Teams.Team.t()@@ -273,10 +280,55 @@ defmodule Plausible.Teams do)end+ defp get_owned_team(user, opts \\ []) do+ only_not_setup? = Keyword.get(opts, :only_not_setup?, false)++ query =+ from(tm in Teams.Membership,+ inner_join: t in assoc(tm, :team),+ as: :team,+ where: tm.user_id == ^user.id and tm.role == :owner,+ select: t,+ order_by: t.id+ )++ query =+ if only_not_setup? do+ where(query, [team: t], t.setup_complete == false)+ else+ query+ end++ result = Repo.all(query)++ case result do+ [] ->+ {:error, :no_team}++ [team] ->+ {:ok, team}++ _teams ->+ {:error, :multiple_teams}+ end+ end++ defp clear_autocreated(user) do+ Repo.update_all(+ from(tm in Teams.Membership,+ where: tm.user_id == ^user.id,+ where: tm.is_autocreated == true+ ),+ set: [is_autocreated: false]+ )++ :ok+ end+defp create_my_team(user) doteam =%Teams.Team{}- |> Teams.Team.changeset(%{name: "My Team"})+ |> Teams.Team.changeset(%{name: default_name()})|> Ecto.Changeset.put_change(:inserted_at, user.inserted_at)|> Ecto.Changeset.put_change(:updated_at, user.updated_at)|> Repo.insert!()diff --git a/lib/plausible/teams/management/layout.ex b/lib/plausible/teams/management/layout.exindex d8f3de0481..50de227cc0 100644--- a/lib/plausible/teams/management/layout.ex+++ b/lib/plausible/teams/management/layout.ex@@ -107,16 +107,12 @@ defmodule Plausible.Teams.Management.Layout doend)end- @spec persist(t(), %{current_user: User.t(), my_team: Teams.Team.t()}) ::+ @spec persist(t(), %{current_user: User.t(), current_team: Teams.Team.t()}) ::{:ok, integer()} | {:error, any()}def persist(layout, context) doresult =Repo.transaction(fn ->- if not context.my_team.setup_complete do- context.my_team- |> Teams.Team.setup_changeset()- |> Repo.update!()- end+ Teams.complete_setup(context.current_team)layout|> sorted_for_persistence()diff --git a/lib/plausible/teams/management/layout/entry.ex b/lib/plausible/teams/management/layout/entry.exindex 9b25c49e82..2f0a2227d1 100644--- a/lib/plausible/teams/management/layout/entry.ex+++ b/lib/plausible/teams/management/layout/entry.ex@@ -69,7 +69,7 @@ defmodule Plausible.Teams.Management.Layout.Entry docontext)when op in [:update, :send] do- Teams.Invitations.InviteToTeam.invite(context.my_team, context.current_user, email, role,+ Teams.Invitations.InviteToTeam.invite(context.current_team, context.current_user, email, role,send_email?: false)end@@ -78,7 +78,7 @@ defmodule Plausible.Teams.Management.Layout.Entry do%__MODULE__{type: :invitation_sent, email: email, role: role, queued_op: :update},context) do- Teams.Invitations.InviteToTeam.invite(context.my_team, context.current_user, email, role,+ Teams.Invitations.InviteToTeam.invite(context.current_team, context.current_user, email, role,send_email?: false)end@@ -88,7 +88,7 @@ defmodule Plausible.Teams.Management.Layout.Entry docontext) doPlausible.Teams.Invitations.Remove.remove(- context.my_team,+ context.current_team,meta.invitation_id,context.current_user)@@ -99,7 +99,7 @@ defmodule Plausible.Teams.Management.Layout.Entry docontext) doPlausible.Teams.Memberships.Remove.remove(- context.my_team,+ context.current_team,meta.user.id,context.current_user,send_email?: false@@ -111,7 +111,7 @@ defmodule Plausible.Teams.Management.Layout.Entry docontext) doPlausible.Teams.Memberships.UpdateRole.update(- context.my_team,+ context.current_team,meta.user.id,"#{role}",context.current_userdiff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.exindex b0a3b42304..01d3de8bc2 100644--- a/lib/plausible/teams/sites.ex+++ b/lib/plausible/teams/sites.ex@@ -15,27 +15,38 @@ defmodule Plausible.Teams.Sites dodomain_filter = Keyword.get(opts, :filter_by_domain)team = Keyword.get(opts, :team)- team_membership_query =- from(tm in Teams.Membership,- inner_join: t in assoc(tm, :team),- inner_join: s in assoc(t, :sites),- where: tm.user_id == ^user.id and tm.role != :guest,- select: %{site_id: s.id, entry_type: "site"}- )- |> maybe_filter_by_team(team)+ all_query =+ if Teams.setup?(team) do+ from(tm in Teams.Membership,+ inner_join: t in assoc(tm, :team),+ inner_join: s in assoc(t, :sites),+ where: tm.user_id == ^user.id and tm.role != :guest,+ where: tm.team_id == ^team.id,+ select: %{site_id: s.id, entry_type: "site"}+ )+ else+ my_team_query =+ from(tm in Teams.Membership,+ inner_join: t in assoc(tm, :team),+ inner_join: s in assoc(t, :sites),+ where: tm.user_id == ^user.id and tm.role != :guest,+ where: tm.is_autocreated == true,+ where: t.setup_complete == false,+ select: %{site_id: s.id, entry_type: "site"}+ )- guest_membership_query =- from tm in Teams.Membership,- inner_join: gm in assoc(tm, :guest_memberships),- inner_join: s in assoc(gm, :site),- where: tm.user_id == ^user.id and tm.role == :guest,- select: %{site_id: s.id, entry_type: "site"}+ guest_membership_query =+ from tm in Teams.Membership,+ inner_join: gm in assoc(tm, :guest_memberships),+ inner_join: s in assoc(gm, :site),+ where: tm.user_id == ^user.id and tm.role == :guest,+ select: %{site_id: s.id, entry_type: "site"}- union_query =- from s in team_membership_query,- union_all: ^guest_membership_query+ from s in my_team_query,+ union_all: ^guest_membership_query+ end- from(u in subquery(union_query),+ from(u in subquery(all_query),inner_join: s in Plausible.Site,on: u.site_id == s.id,as: :site,@@ -76,31 +87,6 @@ defmodule Plausible.Teams.Sites dodomain_filter = Keyword.get(opts, :filter_by_domain)team = Keyword.get(opts, :team)- team_membership_query =- from(tm in Teams.Membership,- inner_join: t in assoc(tm, :team),- inner_join: u in assoc(tm, :user),- as: :user,- inner_join: s in assoc(t, :sites),- as: :site,- where: tm.user_id == ^user.id and tm.role != :guest,- where:- not exists(- from st in Teams.SiteTransfer,- where: st.email == parent_as(:user).email,- where: st.site_id == parent_as(:site).id- ),- select: %{- site_id: s.id,- entry_type: "site",- guest_invitation_id: 0,- team_invitation_id: 0,- role: tm.role,- transfer_id: 0- }- )- |> maybe_filter_by_team(team)-guest_membership_query =from(tm in Teams.Membership,inner_join: u in assoc(tm, :user),@@ -197,10 +183,60 @@ defmodule Plausible.Teams.Sites do}union_query =- from s in team_membership_query,- union_all: ^guest_membership_query,- union_all: ^guest_invitation_query,- union_all: ^site_transfer_query+ if Teams.setup?(team) do+ team_membership_query =+ from(tm in Teams.Membership,+ inner_join: t in assoc(tm, :team),+ inner_join: u in assoc(tm, :user),+ as: :user,+ inner_join: s in assoc(t, :sites),+ as: :site,+ where: tm.user_id == ^user.id and tm.role != :guest,+ where: tm.team_id == ^team.id,+ where:+ not exists(+ from st in Teams.SiteTransfer,+ where: st.email == parent_as(:user).email,+ where: st.site_id == parent_as(:site).id+ ),+ select: %{+ site_id: s.id,+ entry_type: "site",+ guest_invitation_id: 0,+ team_invitation_id: 0,+ role: tm.role,+ transfer_id: 0+ }+ )++ from s in team_membership_query,+ union_all: ^site_transfer_query+ else+ my_team_query =+ from(tm in Teams.Membership,+ inner_join: t in assoc(tm, :team),+ inner_join: u in assoc(tm, :user),+ as: :user,+ inner_join: s in assoc(t, :sites),+ as: :site,+ where: tm.user_id == ^user.id and tm.role != :guest,+ where: tm.is_autocreated == true,+ where: t.setup_complete == false,+ select: %{+ site_id: s.id,+ entry_type: "site",+ guest_invitation_id: 0,+ team_invitation_id: 0,+ role: tm.role,+ transfer_id: 0+ }+ )++ from s in my_team_query,+ union_all: ^guest_membership_query,+ union_all: ^guest_invitation_query,+ union_all: ^site_transfer_query+ endfrom(u in subquery(union_query),inner_join: s in Plausible.Site,@@ -271,12 +307,6 @@ defmodule Plausible.Teams.Sites doend)end- defp maybe_filter_by_team(team_membership_query, %Teams.Team{} = team) do- where(team_membership_query, [tm], tm.team_id == ^team.id)- end-- defp maybe_filter_by_team(team_membership_query, _), do: team_membership_query-defp maybe_filter_by_domain(query, domain)when byte_size(domain) >= 1 and byte_size(domain) <= 64 dowhere(query, [site: s], ilike(s.domain, ^"%#{domain}%"))diff --git a/lib/plausible/teams/team.ex b/lib/plausible/teams/team.exindex d9a57aaab1..86be4b75b9 100644--- a/lib/plausible/teams/team.ex+++ b/lib/plausible/teams/team.ex@@ -73,6 +73,7 @@ defmodule Plausible.Teams.Team doteam|> cast(attrs, [:name])|> validate_required(:name)+ |> validate_exclusion(:name, [Plausible.Teams.default_name()])enddef setup_changeset(team, now \\ NaiveDateTime.utc_now(:second)) dodiff --git a/lib/plausible/teams/team_admin.ex b/lib/plausible/teams/team_admin.exindex 90ed12ed22..c9bae5d10a 100644--- a/lib/plausible/teams/team_admin.ex+++ b/lib/plausible/teams/team_admin.ex@@ -170,10 +170,10 @@ defmodule Plausible.Teams.TeamAdmin dodefp team_name(team) docase team.owners do[owner] ->- if team.name == "My Team" do- owner.name- else+ if team.setup_complete doteam.name+ else+ owner.nameend[_ | _] ->diff --git a/lib/plausible_web/components/billing/plan_box.ex b/lib/plausible_web/components/billing/plan_box.exindex 919428d43b..62ee886f3c 100644--- a/lib/plausible_web/components/billing/plan_box.ex+++ b/lib/plausible_web/components/billing/plan_box.ex@@ -175,7 +175,7 @@ defmodule PlausibleWeb.Components.Billing.PlanBox dochange_plan_link_text = change_plan_link_text(assigns)subscription =- Plausible.Teams.Billing.get_subscription(assigns.my_team)+ Plausible.Teams.Billing.get_subscription(assigns.current_team)billing_details_expired =Subscription.Status.in?(subscription, [@@ -225,10 +225,14 @@ defmodule PlausibleWeb.Components.Billing.PlanBox do|> assign(:confirm_message, losing_features_message(feature_usage_check))~H"""- <%= if @owned_plan && Plausible.Billing.Subscriptions.resumable?(@my_team.subscription) do %>+ <%= if @owned_plan && Plausible.Billing.Subscriptions.resumable?(@current_team.subscription) do %><.change_plan_link {assigns} /><% else %>- <PlausibleWeb.Components.Billing.paddle_button user={@current_user} team={@my_team} {assigns}>+ <PlausibleWeb.Components.Billing.paddle_button+ user={@current_user}+ team={@current_team}+ {assigns}+ >Upgrade</PlausibleWeb.Components.Billing.paddle_button><% end %>@@ -260,18 +264,18 @@ defmodule PlausibleWeb.Components.Billing.PlanBox dodefp check_usage_within_plan_limits(%{available: true,usage: usage,- my_team: my_team,+ current_team: current_team,plan_to_render: plan}) do# At this point, the user is *not guaranteed* to have a team,# with ongoing trial.trial_active_or_ended_recently? =- not is_nil(my_team) and not is_nil(my_team.trial_expiry_date) and- Plausible.Teams.trial_days_left(my_team) >= -10+ not is_nil(current_team) and not is_nil(current_team.trial_expiry_date) and+ Plausible.Teams.trial_days_left(current_team) >= -10limit_checking_opts =cond do- my_team && my_team.allow_next_upgrade_override ->+ current_team && current_team.allow_next_upgrade_override ->[ignore_pageview_limit: true]trial_active_or_ended_recently? && plan.volume == "10k" ->diff --git a/lib/plausible_web/controllers/admin_controller.ex b/lib/plausible_web/controllers/admin_controller.exindex b99a15f648..01b353ac66 100644--- a/lib/plausible_web/controllers/admin_controller.ex+++ b/lib/plausible_web/controllers/admin_controller.ex@@ -99,14 +99,13 @@ defmodule PlausibleWeb.AdminController doselect:fragment("""- case when ? = ? then+ case when ? = false thenstring_agg(concat(?, ' (', ?, ')'), ',')elseconcat(?, ' [', string_agg(concat(?, ' (', ?, ')'), ','), ']')end""",- t.name,- "My Team",+ t.setup_complete,o.name,o.email,t.name,@@ -156,14 +155,13 @@ defmodule PlausibleWeb.AdminController doselect: [fragment("""- case when ? = ? then+ case when ? = false thenconcat(string_agg(concat(?, ' (', ?, ')'), ','), ' - ', ?)elseconcat(concat(?, ' [', string_agg(concat(?, ' (', ?, ')'), ','), ']'), ' - ', ?)end""",- t.name,- "My Team",+ t.setup_complete,o.name,o.email,t.identifier,diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex a1a21509cd..9731e32c83 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -57,6 +57,7 @@ defmodule PlausibleWeb.AuthController dodef select_team(conn, _params) docurrent_user = conn.assigns.current_user+ current_team = conn.assigns[:current_team]owner_name_fn = fn owner ->if owner.id == current_user.id do@@ -69,8 +70,9 @@ defmodule PlausibleWeb.AuthController doteams =current_user|> Teams.Users.teams()+ |> Enum.filter(& &1.setup_complete)|> Enum.map(fn team ->- current_team? = team.id == conn.assigns.current_team.id+ current_team? = current_team && team.id == current_team.idowners =Enum.map_join(team.owners, ", ", &owner_name_fn.(&1))@@ -86,30 +88,7 @@ defmodule PlausibleWeb.AuthController do}end)- render(conn, "select_team.html", teams: teams)- end-- def switch_team(conn, params) do- current_user = conn.assigns.current_user- team = Teams.get(params["team_id"])-- if team do- case Teams.Memberships.team_role(team, current_user) do- {:ok, role} when role != :guest ->- conn- |> put_session("current_team_id", team.identifier)- |> redirect(to: Routes.site_path(conn, :index))-- _ ->- conn- |> put_flash(:error, "You have select an invalid team")- |> redirect(to: Routes.site_path(conn, :index))- end- else- conn- |> put_flash(:error, "You have select an invalid team")- |> redirect(to: Routes.site_path(conn, :index))- end+ render(conn, "select_team.html", teams_selection: teams)enddef activate_form(conn, params) dodiff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.exindex 5858bc83cd..6a6837be41 100644--- a/lib/plausible_web/controllers/billing_controller.ex+++ b/lib/plausible_web/controllers/billing_controller.ex@@ -9,15 +9,15 @@ defmodule PlausibleWeb.BillingController doplug PlausibleWeb.RequireAccountPlugdef ping_subscription(%Plug.Conn{} = conn, _params) do- subscribed? = Plausible.Teams.Billing.has_active_subscription?(conn.assigns.my_team)+ subscribed? = Plausible.Teams.Billing.has_active_subscription?(conn.assigns.current_team)json(conn, %{is_subscribed: subscribed?})enddef choose_plan(conn, _params) do- my_team = conn.assigns.my_team+ team = conn.assigns.current_team- if Plausible.Teams.Billing.enterprise_configured?(my_team) do+ if Plausible.Teams.Billing.enterprise_configured?(team) doredirect(conn, to: Routes.billing_path(conn, :upgrade_to_enterprise_plan))elserender(conn, "choose_plan.html",@@ -28,12 +28,12 @@ defmodule PlausibleWeb.BillingController doenddef upgrade_to_enterprise_plan(conn, _params) do- my_team = conn.assigns.my_team- subscription = Plausible.Teams.Billing.get_subscription(my_team)+ team = conn.assigns.current_team+ subscription = Plausible.Teams.Billing.get_subscription(team){latest_enterprise_plan, price} =Plausible.Teams.Billing.latest_enterprise_plan_with_price(- my_team,+ team,PlausibleWeb.RemoteIP.get(conn))@@ -70,9 +70,9 @@ defmodule PlausibleWeb.BillingController doenddef change_plan_preview(conn, %{"plan_id" => new_plan_id}) do- my_team = conn.assigns.my_team+ team = conn.assigns.current_teamcurrent_user = conn.assigns.current_user- subscription = Plausible.Teams.Billing.active_subscription_for(my_team)+ subscription = Plausible.Teams.Billing.active_subscription_for(team)case preview_subscription(subscription, new_plan_id) do{:ok, {subscription, preview_info}} ->@@ -91,7 +91,7 @@ defmodule PlausibleWeb.BillingController doextra: %{message: msg,new_plan_id: new_plan_id,- team_id: my_team.id,+ team_id: team.id,user_id: current_user.id})@@ -103,9 +103,9 @@ defmodule PlausibleWeb.BillingController doenddef change_plan(conn, %{"new_plan_id" => new_plan_id}) do- my_team = conn.assigns.my_team+ team = conn.assigns.current_team- case Plausible.Teams.Billing.change_plan(my_team, new_plan_id) do+ case Plausible.Teams.Billing.change_plan(team, new_plan_id) do{:ok, _subscription} ->conn|> put_flash(:success, "Plan changed successfully")@@ -133,7 +133,7 @@ defmodule PlausibleWeb.BillingController doerrors: inspect(e),message: msg,new_plan_id: new_plan_id,- team_id: my_team.id,+ team_id: team.id,user_id: conn.assigns.current_user.id})diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex 9279a22dfc..eee1724569 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -104,7 +104,7 @@ defmodule PlausibleWeb.InvitationController doenddef remove_team_invitation(conn, %{"invitation_id" => invitation_id}) do- %{my_team: team, current_user: current_user} = conn.assigns+ %{current_team: team, current_user: current_user} = conn.assignscase Plausible.Teams.Invitations.Remove.remove(team, invitation_id, current_user) do{:ok, invitation} ->diff --git a/lib/plausible_web/controllers/settings_controller.ex b/lib/plausible_web/controllers/settings_controller.exindex 116b971181..763ad0b6d3 100644--- a/lib/plausible_web/controllers/settings_controller.ex+++ b/lib/plausible_web/controllers/settings_controller.ex@@ -17,7 +17,7 @@ defmodule PlausibleWeb.SettingsController doenddef update_team_name(conn, %{"team" => params}) do- changeset = Plausible.Teams.Team.name_changeset(conn.assigns.my_team, params)+ changeset = Plausible.Teams.Team.name_changeset(conn.assigns.current_team, params)case Repo.update(changeset) do{:ok, _user} ->@@ -31,18 +31,23 @@ defmodule PlausibleWeb.SettingsController doenddefp render_team_general(conn, opts \\ []) do- name_changeset =- Keyword.get(- opts,- :team_name_changeset,- Plausible.Teams.Team.name_changeset(conn.assigns.my_team)- )+ if Plausible.Teams.setup?(conn.assigns.current_team) do+ name_changeset =+ Keyword.get(+ opts,+ :team_name_changeset,+ Plausible.Teams.Team.name_changeset(conn.assigns.current_team)+ )- render(conn, :team_general,- team_name_changeset: name_changeset,- layout: {PlausibleWeb.LayoutView, :settings},- connect_live_socket: true- )+ render(conn, :team_general,+ team_name_changeset: name_changeset,+ layout: {PlausibleWeb.LayoutView, :settings},+ connect_live_socket: true+ )+ else+ conn+ |> redirect(to: Routes.site_path(conn, :index))+ endenddef preferences(conn, _params) do@@ -54,23 +59,23 @@ defmodule PlausibleWeb.SettingsController doenddef subscription(conn, _params) do- my_team = conn.assigns.my_team- subscription = Teams.Billing.get_subscription(my_team)+ team = conn.assigns.current_team+ subscription = Teams.Billing.get_subscription(team)render(conn, :subscription,layout: {PlausibleWeb.LayoutView, :settings},subscription: subscription,pageview_limit: Teams.Billing.monthly_pageview_limit(subscription),- pageview_usage: Teams.Billing.monthly_pageview_usage(my_team),- site_usage: Teams.Billing.site_usage(my_team),- site_limit: Teams.Billing.site_limit(my_team),- team_member_limit: Teams.Billing.team_member_limit(my_team),- team_member_usage: Teams.Billing.team_member_usage(my_team)+ pageview_usage: Teams.Billing.monthly_pageview_usage(team),+ site_usage: Teams.Billing.site_usage(team),+ site_limit: Teams.Billing.site_limit(team),+ team_member_limit: Teams.Billing.team_member_limit(team),+ team_member_usage: Teams.Billing.team_member_usage(team))enddef invoices(conn, _params) do- subscription = Teams.Billing.get_subscription(conn.assigns.my_team)+ subscription = Teams.Billing.get_subscription(conn.assigns.current_team)invoices = Plausible.Billing.paddle_api().get_invoices(subscription)render(conn, :invoices, layout: {PlausibleWeb.LayoutView, :settings}, invoices: invoices)diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 5711fd6874..fc2713ad11 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -14,20 +14,19 @@ defmodule PlausibleWeb.SiteController dodef new(conn, params) doflow = params["flow"] || PlausibleWeb.Flows.register()- my_team = conn.assigns.my_team+ team = conn.assigns.current_teamrender(conn, "new.html",changeset: Plausible.Site.changeset(%Plausible.Site{}),- site_limit: Plausible.Teams.Billing.site_limit(my_team),- site_limit_exceeded?: Plausible.Teams.Billing.ensure_can_add_new_site(my_team) != :ok,+ site_limit: Plausible.Teams.Billing.site_limit(team),+ site_limit_exceeded?: Plausible.Teams.Billing.ensure_can_add_new_site(team) != :ok,form_submit_url: "/sites?flow=#{flow}",flow: flow)enddef create_site(conn, %{"site" => site_params}) do- current_team = conn.assigns.current_team- team = Plausible.Teams.get(site_params["team_id"]) || current_team+ team = conn.assigns.current_teamuser = conn.assigns.current_userfirst_site? = Plausible.Teams.Billing.site_usage(team) == 0flow = conn.params["flow"]diff --git a/lib/plausible_web/live/auth_context.ex b/lib/plausible_web/live/auth_context.exindex c823f1519a..b6d8356791 100644--- a/lib/plausible_web/live/auth_context.ex+++ b/lib/plausible_web/live/auth_context.ex@@ -38,7 +38,7 @@ defmodule PlausibleWeb.Live.AuthContext do%{current_user: user} ->if current_team_id = session["current_team_id"] douser.team_memberships- |> Enum.find(%{}, &(&1.team_id == current_team_id))+ |> Enum.find(%{}, &(&1.team.identifier == current_team_id))|> Map.get(:team)endend)@@ -46,34 +46,40 @@ defmodule PlausibleWeb.Live.AuthContext do%{current_user: nil} ->nil- %{current_user: user} = context ->- current_team = context.team_from_session+ %{current_user: user} ->+ user.team_memberships+ |> Enum.find(%{}, &(&1.role == :owner and &1.team.setup_complete == false))+ |> Map.get(:team)+ end)+ |> assign_new(:current_team, fn+ %{current_user: nil} ->+ nil- current_team_owner? =- (current_team || %{})- |> Map.get(:owners, [])- |> Enum.any?(&(&1.id == user.id))+ %{team_from_session: %{} = team_from_session} ->+ team_from_session- if current_team_owner? do- current_team- else- user.team_memberships- # NOTE: my_team should eventually only hold user's personal team. This requires- # additional adjustments, which will be done in follow-up work.- # |> Enum.find(%{}, &(&1.role == :owner and &1.team.setup_complete == false))- |> List.first(%{})- |> Map.get(:team)- end+ %{my_team: %{} = my_team} ->+ my_team++ _ ->+ nilend)- |> assign_new(:current_team, fn context ->- context.team_from_session || context.my_team+ |> assign_new(:teams, fn+ %{current_user: nil} ->+ []++ %{current_user: user} ->+ user.team_memberships+ |> Enum.sort_by(fn tm -> [tm.role != :owner, tm.team_id] end)+ |> Enum.map(&Map.fetch!(&1, :team))+ |> Enum.take(3)end)|> assign_new(:teams_count, fn%{current_user: nil} -> 0%{current_user: user} -> length(user.team_memberships)end)- |> assign_new(:multiple_teams?, fn context ->- context.teams_count > 1+ |> assign_new(:more_teams?, fn context ->+ context.teams_count > 3end){:cont, socket}diff --git a/lib/plausible_web/live/choose_plan.ex b/lib/plausible_web/live/choose_plan.exindex 6eef09e86d..28b155c461 100644--- a/lib/plausible_web/live/choose_plan.ex+++ b/lib/plausible_web/live/choose_plan.ex@@ -19,16 +19,16 @@ defmodule PlausibleWeb.Live.ChoosePlan doPlausible.Teams.Memberships.all_pending_site_transfers(current_user.email)end)|> assign_new(:usage, fn %{- my_team: my_team,+ current_team: current_team,pending_ownership_site_ids: pending_ownership_site_ids} ->- Plausible.Teams.Billing.quota_usage(my_team,+ Plausible.Teams.Billing.quota_usage(current_team,with_features: true,pending_ownership_site_ids: pending_ownership_site_ids)end)- |> assign_new(:subscription, fn %{my_team: my_team} ->- Plausible.Teams.Billing.get_subscription(my_team)+ |> assign_new(:subscription, fn %{current_team: current_team} ->+ Plausible.Teams.Billing.get_subscription(current_team)end)|> assign_new(:owned_plan, fn %{subscription: subscription} ->Plans.get_regular_plan(subscription, only_non_expired: true)diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex 6f64063730..943e04ec9d 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -8,6 +8,7 @@ defmodule PlausibleWeb.Live.Sites dorequire Loggeralias Plausible.Sites+ alias Plausible.Teamsdef mount(params, _session, socket) douri =@@ -19,7 +20,7 @@ defmodule PlausibleWeb.Live.Sites do|> assign(:uri, uri)|> assign(:team_invitations,- Plausible.Teams.Invitations.all(socket.assigns.current_user)+ Teams.Invitations.all(socket.assigns.current_user))|> assign(:filter_text, params["filter_text"] || "")@@ -32,14 +33,14 @@ defmodule PlausibleWeb.Live.Sites do|> assign(:params, params)|> load_sites()|> assign_new(:has_sites?, fn %{current_user: current_user} ->- Plausible.Teams.Users.has_sites?(current_user, include_pending?: true)+ Teams.Users.has_sites?(current_user, include_pending?: true)end)|> assign_new(:needs_to_upgrade, fn %{current_user: current_user,- my_team: my_team+ current_team: current_team} ->- Plausible.Teams.Users.owns_sites?(current_user, include_pending?: true) &&- Plausible.Teams.Billing.check_needs_to_upgrade(my_team)+ Teams.Users.owns_sites?(current_user, include_pending?: true) &&+ Teams.Billing.check_needs_to_upgrade(current_team)end){:noreply, socket}@@ -56,9 +57,19 @@ defmodule PlausibleWeb.Live.Sites do<PlausibleWeb.Live.Components.Visitors.gradient_defs /><.upgrade_nag_screen :if={@needs_to_upgrade == {:needs_to_upgrade, :no_active_subscription}} />- <div class="mt-6 pb-5 border-b border-gray-200 dark:border-gray-500 flex items-center justify-between">+ <div class="group mt-6 pb-5 border-b border-gray-200 dark:border-gray-500 flex items-center justify-between"><h2 class="text-2xl font-bold leading-7 text-gray-900 dark:text-gray-100 sm:text-3xl sm:leading-9 sm:truncate flex-shrink-0">- My Sites+ <span :if={Teams.enabled?(@current_team)}>+ {Teams.name(@current_team)}+ <.unstyled_link+ :if={Teams.setup?(@current_team)}+ data-test-id="team-settings-link"+ href={Routes.settings_path(@socket, :team_general)}+ >+ <Heroicons.cog_6_tooth class="hidden group-hover:inline size-4 dark:text-gray-100 text-gray-900" />+ </.unstyled_link>+ </span>+ <span :if={not Teams.enabled?(@current_team)}>My Sites</span></h2></div>@@ -711,7 +722,7 @@ defmodule PlausibleWeb.Live.Sites dodefp check_limits(invitation, _), do: %{invitation: invitation}- defdelegate ensure_can_take_ownership(site, team), to: Plausible.Teams.Invitations+ defdelegate ensure_can_take_ownership(site, team), to: Teams.Invitationsdef check_features(%{role: :owner, site: site} = invitation, team) docase check_feature_access(site, team) do@@ -731,7 +742,7 @@ defmodule PlausibleWeb.Live.Sites doon_ee dodefp check_feature_access(site, new_team) domissing_features =- Plausible.Teams.Billing.features_usage(nil, [site.id])+ Teams.Billing.features_usage(nil, [site.id])|> Enum.filter(&(&1.check_availability(new_team) != :ok))if missing_features == [] dodiff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex e377aab0dd..76b3e80da5 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -21,14 +21,14 @@ defmodule PlausibleWeb.Live.TeamManagement do{:ok, socket |> assign(mode: mode) |> reset()}end- defp reset(%{assigns: %{current_user: current_user, my_team: my_team}} = socket) do- {:ok, my_role} = Teams.Memberships.team_role(my_team, current_user)+ defp reset(%{assigns: %{current_user: current_user, current_team: current_team}} = socket) do+ {:ok, my_role} = Teams.Memberships.team_role(current_team, current_user)if my_role not in [:owner, :admin] doredirect(socket, to: Routes.settings_path(socket, :team_general))else- layout = Layout.init(my_team)- team_members_limit = Plausible.Teams.Billing.team_member_limit(my_team)+ layout = Layout.init(current_team)+ team_members_limit = Plausible.Teams.Billing.team_member_limit(current_team)assign(socket,team_members_limit: team_members_limit,@@ -49,7 +49,7 @@ defmodule PlausibleWeb.Live.TeamManagement do:if={at_limit?(@layout, @team_members_limit)}current_user={@current_user}billable_user={@current_user}- current_team={@my_team}+ current_team={@current_team}limit={@team_members_limit}resource="team members"class="mb-4"@@ -160,7 +160,7 @@ defmodule PlausibleWeb.Live.TeamManagement dophx-click="save-team-layout"class="mt-8 w-full">- Create Team+ Setup Team</.button></div>"""@@ -282,15 +282,18 @@ defmodule PlausibleWeb.Live.TeamManagement doenddefp save_team_layout(- %{assigns: %{layout: layout, my_team: my_team, current_user: current_user}} = socket+ %{assigns: %{layout: layout, current_team: current_team, current_user: current_user}} =+ socket) do- result = Layout.persist(layout, %{current_user: current_user, my_team: my_team})+ result = Layout.persist(layout, %{current_user: current_user, current_team: current_team})case {result, socket.assigns.mode} do{{:ok, _}, :team_setup} ->socket|> put_flash(:success, "Your team is now setup")- |> redirect(to: Routes.settings_path(socket, :team_general))+ |> redirect(+ to: Routes.settings_path(socket, :team_general, __team: current_team.identifier)+ ){{:ok, _}, :team_management} ->reset(socket)diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.exindex 7503bc9ca7..d46f8e3e18 100644--- a/lib/plausible_web/live/team_setup.ex+++ b/lib/plausible_web/live/team_setup.ex@@ -10,37 +10,44 @@ defmodule PlausibleWeb.Live.TeamSetup doalias Plausible.Teams.Management.Layoutalias PlausibleWeb.Router.Helpers, as: Routes- def mount(params, _session, socket) do- my_team = socket.assigns.my_team- enabled? = Teams.enabled?(my_team)+ def mount(_params, _session, socket) do+ current_team = socket.assigns.current_team+ enabled? = Teams.enabled?(current_team)- # XXX: remove dev param, once manual testing is considered donesocket =- case {enabled?, my_team, params["dev"]} do- {true, %Teams.Team{setup_complete: true}, nil} ->+ case {enabled?, current_team} do+ {true, %Teams.Team{setup_complete: true}} ->socket|> put_flash(:success, "Your team is now setup")|> redirect(to: Routes.settings_path(socket, :team_general))- {true, %Teams.Team{}, _} ->- team_name_changeset = Teams.Team.name_changeset(my_team)+ {true, %Teams.Team{}} ->+ current_user = socket.assigns.current_user- layout = Layout.init(my_team)+ team_name_form =+ current_team+ |> Teams.Team.name_changeset(%{name: "#{current_user.name}'s Team"})+ |> Repo.update!()+ |> Teams.Team.name_changeset(%{})+ |> to_form()++ layout = Layout.init(current_team)assign(socket,- team_name_changeset: team_name_changeset,- team_layout: layout+ team_name_form: team_name_form,+ team_layout: layout,+ current_team: current_team)- {false, _, _} ->+ {_, _} ->socket|> put_flash(:error, "You cannot set up any team just yet")|> redirect(to: Routes.site_path(socket, :index))endsocket =- if my_team do- {:ok, my_role} = Teams.Memberships.team_role(my_team, socket.assigns.current_user)+ if current_team do+ {:ok, my_role} = Teams.Memberships.team_role(current_team, socket.assigns.current_user)assign(socket, my_role: my_role)elsesocket@@ -52,20 +59,29 @@ defmodule PlausibleWeb.Live.TeamSetup dodef render(assigns) do~H"""<.focus_box>- <:title>Create a new team</:title>+ <:title>Setup a new team</:title><:subtitle>Add members and assign roles to manage different sites access efficiently</:subtitle><.form:let={f}- for={@team_name_changeset}+ for={@team_name_form}method="post"phx-change="update-team"+ phx-blur="update-team"id="update-team-form"class="mt-4 mb-8">- <.input type="text" field={f[:name]} label="Name" width="w-full" phx-debounce="500" />+ <.input+ type="text"+ placeholder={"#{@current_user.name}'s Team"}+ autofocus+ field={f[:name]}+ label="Name"+ width="w-full"+ phx-debounce="500"+ /></.form><.label class="mb-2">@@ -82,21 +98,18 @@ defmodule PlausibleWeb.Live.TeamSetup do"""end- def handle_event("update-team", %{"team" => params}, socket) do- team_name_changeset =- socket.assigns.my_team- |> Teams.Team.name_changeset(params)-- if team_name_changeset.valid? do- my_team = Repo.update!(team_name_changeset)-- {:noreply,- assign(socket,- team_name_changeset: team_name_changeset,- my_team: my_team- )}- else- {:noreply, socket}- end+ def handle_event("update-team", %{"team" => %{"name" => name}}, socket) do+ changeset = Teams.Team.name_changeset(socket.assigns.current_team, %{name: name})++ socket =+ case Repo.update(changeset) do+ {:ok, _team} ->+ assign(socket, team_name_form: to_form(changeset))++ {:error, changeset} ->+ assign(socket, team_name_form: to_form(changeset))+ end++ {:noreply, socket}endenddiff --git a/lib/plausible_web/plugs/auth_plug.ex b/lib/plausible_web/plugs/auth_plug.exindex 2f2027169a..6985c252a1 100644--- a/lib/plausible_web/plugs/auth_plug.ex+++ b/lib/plausible_web/plugs/auth_plug.ex@@ -19,34 +19,42 @@ defmodule PlausibleWeb.AuthPlug do{:ok, user_session} ->user = user_session.user- current_team_id = Plug.Conn.get_session(conn, "current_team_id")+ current_team_id_from_session = Plug.Conn.get_session(conn, "current_team_id")+ current_team_id = conn.params["__team"] || current_team_id_from_sessioncurrent_team =if current_team_id douser.team_memberships- |> Enum.find(%{}, &(&1.team_id == current_team_id))+ |> Enum.find(%{}, &(&1.team.identifier == current_team_id))|> Map.get(:team)end- current_team_owner? =- (current_team || %{})- |> Map.get(:owners, [])- |> Enum.any?(&(&1.id == user.id))+ conn =+ cond do+ current_team && current_team_id != current_team_id_from_session ->+ Plug.Conn.put_session(conn, "current_team_id", current_team_id)- my_team =- if current_team_owner? do- current_team- else- user.team_memberships- # NOTE: my_team should eventually only hold user's personal team. This requires- # additional adjustments, which will be done in follow-up work.- # |> Enum.find(%{}, &(&1.role == :owner and &1.team.setup_complete == false))- |> List.first(%{})- |> Map.get(:team)+ is_nil(current_team) && not is_nil(current_team_id_from_session) ->+ Plug.Conn.delete_session(conn, "current_team_id")++ true ->+ connend+ my_team =+ user.team_memberships+ |> Enum.find(%{}, &(&1.role == :owner and &1.team.setup_complete == false))+ |> Map.get(:team)+teams_count = length(user.team_memberships)+ teams =+ user.team_memberships+ |> Enum.filter(& &1.team.setup_complete)+ |> Enum.sort_by(fn tm -> [tm.role != :owner, tm.team_id] end)+ |> Enum.map(&Map.fetch!(&1, :team))+ |> Enum.take(3)+Plausible.OpenTelemetry.add_user_attributes(user)Sentry.Context.set_user_context(%{id: user.id, name: user.name, email: user.email})@@ -56,7 +64,8 @@ defmodule PlausibleWeb.AuthPlug do|> assign(:my_team, my_team)|> assign(:current_team, current_team || my_team)|> assign(:teams_count, teams_count)- |> assign(:multiple_teams?, teams_count > 1)+ |> assign(:teams, teams)+ |> assign(:more_teams?, teams_count > 3)_ ->conndiff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 9738e1148e..44acf6843a 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -404,7 +404,6 @@ defmodule PlausibleWeb.Router dodelete "/me", AuthController, :delete_meget "/team/select", AuthController, :select_team- post "/team/select/:team_id", AuthController, :switch_teamget "/auth/google/callback", AuthController, :google_auth_callbackdiff --git a/lib/plausible_web/templates/auth/select_team.html.heex b/lib/plausible_web/templates/auth/select_team.html.heexindex 6beca119ef..d2e571279e 100644--- a/lib/plausible_web/templates/auth/select_team.html.heex+++ b/lib/plausible_web/templates/auth/select_team.html.heex@@ -6,17 +6,14 @@<div><ul><li- :for={team <- @teams}- class={if team.current?, do: ["border-indigo-400 border-l-4 m-2"], else: ["m-2"]}+ :for={team <- @teams_selection}+ class={if team.current?, do: ["border-indigo-400 border-r-4 m-2"], else: ["m-2"]}>- <.unstyled_link- method={if team.current?, do: "get", else: "post"}- href={- if team.current?,- do: "#",- else: Routes.auth_path(@conn, :switch_team, team.identifier)- }- >+ <.unstyled_link href={+ if team.current?,+ do: "#",+ else: Routes.site_path(@conn, :index, __team: team.identifier)+ }><div class="hover:bg-indigo-100 dark:hover:bg-gray-700 p-4"><p class="truncate font-medium text-gray-900 dark:text-gray-100" role="none">{team.name}diff --git a/lib/plausible_web/templates/billing/upgrade_to_enterprise_plan.html.heex b/lib/plausible_web/templates/billing/upgrade_to_enterprise_plan.html.heexindex 515a36c0d2..fd1e2e852e 100644--- a/lib/plausible_web/templates/billing/upgrade_to_enterprise_plan.html.heex+++ b/lib/plausible_web/templates/billing/upgrade_to_enterprise_plan.html.heex@@ -67,7 +67,7 @@id="paddle-button"paddle_product_id={@latest_enterprise_plan.paddle_plan_id}user={@current_user}- team={@my_team}+ team={@current_team}><svg fill="currentColor" viewBox="0 0 20 20" class="inline w-4 h-4 mr-2"><pathdiff --git a/lib/plausible_web/templates/layout/_header.html.heex b/lib/plausible_web/templates/layout/_header.html.heexindex 050cc729d3..5df0b71802 100644--- a/lib/plausible_web/templates/layout/_header.html.heex+++ b/lib/plausible_web/templates/layout/_header.html.heex@@ -44,14 +44,14 @@</.styled_link></li><li- :if={ee?() and Plausible.Teams.on_trial?(@conn.assigns[:my_team])}+ :if={ee?() and Plausible.Teams.on_trial?(@conn.assigns[:current_team])}class="hidden mr-6 sm:block"><.styled_linkclass="text-sm text-yellow-900 dark:text-yellow-900 rounded px-3 py-2 rounded-md bg-yellow-100 dark:bg-yellow-100"href={Routes.settings_path(@conn, :subscription)}>- {trial_notification(@conn.assigns[:my_team])}+ {trial_notification(@conn.assigns[:current_team])}</.styled_link></li><li class="w-full sm:w-auto">@@ -72,22 +72,26 @@{@conn.assigns[:current_user].email}</p></.dropdown_item>- <.dropdown_item :if={@conn.assigns[:multiple_teams?]}>- <div class="text-xs text-gray-500 dark:text-gray-400">Team</div>- <p class="truncate font-medium text-gray-900 dark:text-gray-100" role="none">- {@current_team.name}- </p>- </.dropdown_item>-+ <.team_switcher+ :if={Plausible.Teams.enabled?(@current_team)}+ conn={@conn}+ teams={@teams}+ my_team={@my_team}+ current_team={@current_team}+ more_teams?={@more_teams?}+ /><.dropdown_divider /><.dropdown_item href={Routes.settings_path(@conn, :index)}>Account Settings</.dropdown_item>- <div :if={Plausible.Teams.enabled?(@my_team) and not @my_team.setup_complete}>+ <div :if={+ @my_team && Plausible.Teams.enabled?(@current_team) &&+ @my_team.id == @current_team.id+ }><.dropdown_item class="flex" href={Routes.team_setup_path(@conn, :setup)}><span class="flex-1">- Create a Team+ Setup a Team</span><span class="ml-1 bg-indigo-700 text-gray-100 text-xs p-1 rounded">NEW@@ -96,7 +100,10 @@<.dropdown_divider /></div>- <div :if={Plausible.Teams.enabled?(@my_team) and @my_team.setup_complete}>+ <div :if={+ Plausible.Teams.enabled?(@current_team) and+ Plausible.Teams.setup?(@current_team)+ }><.dropdown_itemclass="flex"href={Routes.settings_path(@conn, :team_general)}@@ -105,12 +112,6 @@Team Settings</span></.dropdown_item>- <.dropdown_item- :if={@conn.assigns[:multiple_teams?]}- href={Routes.auth_path(@conn, :select_team)}- >- Switch Team- </.dropdown_item><.dropdown_divider /></div><.dropdown_itemdiff --git a/lib/plausible_web/templates/layout/_notice.html.heex b/lib/plausible_web/templates/layout/_notice.html.heexindex faf826bf89..969c3d1364 100644--- a/lib/plausible_web/templates/layout/_notice.html.heex+++ b/lib/plausible_web/templates/layout/_notice.html.heex@@ -2,18 +2,18 @@{render("_flash.html", assigns)}<% end %>-<div :if={assigns[:my_team]} class="flex flex-col gap-y-2">+<div :if={assigns[:current_team]} class="flex flex-col gap-y-2"><Notice.active_grace_period- :if={Plausible.Teams.GracePeriod.active?(@my_team)}- enterprise?={Plausible.Teams.Billing.enterprise_configured?(@my_team)}- grace_period_end={grace_period_end(@my_team)}+ :if={Plausible.Teams.GracePeriod.active?(@current_team)}+ enterprise?={Plausible.Teams.Billing.enterprise_configured?(@current_team)}+ grace_period_end={grace_period_end(@current_team)}/>- <Notice.dashboard_locked :if={Plausible.Teams.GracePeriod.expired?(@my_team)} />+ <Notice.dashboard_locked :if={Plausible.Teams.GracePeriod.expired?(@current_team)} />- <Notice.subscription_cancelled subscription={@my_team.subscription} />+ <Notice.subscription_cancelled subscription={@current_team.subscription} />- <Notice.subscription_past_due subscription={@my_team.subscription} class="container" />+ <Notice.subscription_past_due subscription={@current_team.subscription} class="container" />- <Notice.subscription_paused subscription={@my_team.subscription} class="container" />+ <Notice.subscription_paused subscription={@current_team.subscription} class="container" /></div>diff --git a/lib/plausible_web/templates/layout/settings.html.heex b/lib/plausible_web/templates/layout/settings.html.heexindex 15c02bc076..00959bfdd0 100644--- a/lib/plausible_web/templates/layout/settings.html.heex+++ b/lib/plausible_web/templates/layout/settings.html.heex@@ -36,10 +36,14 @@<% end %></div>- <div :if={Plausible.Teams.enabled?(@my_team) and @my_team.setup_complete}>+ <div :if={+ Plausible.Teams.enabled?(@current_team) and Plausible.Teams.setup?(@current_team)+ }><div class="mb-4 mt-4 hidden lg:block"><h3 class="uppercase text-sm text-indigo-600 font-semibold">Team Settings</h3>- <p class="text-xs dark:text-gray-400 truncate">{@my_team.name}</p>+ <p class="text-xs dark:text-gray-400 truncate">+ {Plausible.Teams.name(@current_team)}+ </p></div><div class="hidden lg:block">diff --git a/lib/plausible_web/templates/settings/api_keys.html.heex b/lib/plausible_web/templates/settings/api_keys.html.heexindex c1d4a4ba5e..3a28fa1e96 100644--- a/lib/plausible_web/templates/settings/api_keys.html.heex+++ b/lib/plausible_web/templates/settings/api_keys.html.heex@@ -10,13 +10,13 @@<PlausibleWeb.Components.Billing.Notice.premium_featurebillable_user={@current_user}current_user={@current_user}- current_team={@my_team}+ current_team={@current_team}feature_mod={Plausible.Billing.Feature.StatsAPI}/><.filter_bar filtering_enabled?={false}><.button_link- :if={Plausible.Billing.Feature.StatsAPI.check_availability(@my_team) == :ok}+ :if={Plausible.Billing.Feature.StatsAPI.check_availability(@current_team) == :ok}href={Routes.settings_path(@conn, :new_api_key)}>New API Keydiff --git a/lib/plausible_web/templates/settings/danger_zone.html.heex b/lib/plausible_web/templates/settings/danger_zone.html.heexindex 074c5635a5..ea776d8920 100644--- a/lib/plausible_web/templates/settings/danger_zone.html.heex+++ b/lib/plausible_web/templates/settings/danger_zone.html.heex@@ -7,7 +7,7 @@<:title>Delete Account</:title><:subtitle>Deleting your account removes all sites and stats you've collected</:subtitle>- <%= if Plausible.Billing.Subscription.Status.active?(@my_team && @my_team.subscription) do %>+ <%= if Plausible.Billing.Subscription.Status.active?(@current_team && @current_team.subscription) do %><.notice theme={:gray} title="Cannot delete account at this time">Your account cannot be deleted because you have an active subscription. If you want to delete your account, please cancel your subscription first.</.notice>diff --git a/lib/plausible_web/templates/settings/subscription.html.heex b/lib/plausible_web/templates/settings/subscription.html.heexindex 52008ed437..3d0c411692 100644--- a/lib/plausible_web/templates/settings/subscription.html.heex+++ b/lib/plausible_web/templates/settings/subscription.html.heex@@ -33,7 +33,7 @@<div class="flex flex-col items-center justify-between sm:flex-row sm:items-start"><PlausibleWeb.Components.Billing.monthly_quota_box- team={@my_team}+ team={@current_team}subscription={@subscription}/><div class="w-full md:w-1/3 h-32 px-2 py-4 my-4 text-center bg-gray-100 rounded dark:bg-gray-900">diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex eb5e4c7426..d057dc0fa8 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -1,7 +1,7 @@<.settings_tiles><.tile><:title>- <a id="update-name">Team Name</a>+ <a id="update-name">Team Information</a></:title><:subtitle>Change the name of your team@@ -12,6 +12,14 @@for={@team_name_changeset}method="post">+ <div class="w-1/2">+ <.input_with_clipboard+ name="team-identifier"+ id="team-identifier"+ label="Team Identifier"+ value={@current_team.identifier}+ />+ </div><.input type="text" field={f[:name]} label="Name" width="w-1/2" /><.button type="submit">diff --git a/lib/plausible_web/templates/site/new.html.heex b/lib/plausible_web/templates/site/new.html.heexindex efc28c8d02..57f9bd12c0 100644--- a/lib/plausible_web/templates/site/new.html.heex+++ b/lib/plausible_web/templates/site/new.html.heex@@ -9,13 +9,13 @@<PlausibleWeb.Components.Billing.Notice.limit_exceeded:if={@site_limit_exceeded?}current_user={@current_user}- current_team={@my_team}+ current_team={@current_team}billable_user={@current_user}limit={@site_limit}resource="sites"/>- <%= if is_nil(@my_team) or is_nil(@my_team.trial_expiry_date) do %>+ <%= if is_nil(@current_team) or is_nil(@current_team.trial_expiry_date) do %><div class="rounded-md bg-blue-50 dark:bg-transparent dark:border border-blue-200 p-4"><div class="flex"><div class="flex-shrink-0">diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex 3d77b62a5d..0d9c25f296 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -1,6 +1,6 @@<.settings_tiles><PlausibleWeb.Team.Notice.inviting_banner :if={- @site_role in [:owner, :admin] and @my_team.setup_complete+ @site_role in [:owner, :admin] and Plausible.Teams.setup?(@current_team)} /><.tile docs="users-roles">@@ -17,7 +17,7 @@</.filter_bar><PlausibleWeb.Team.Notice.team_members_notice :if={- @site_role in [:owner, :admin] and @my_team.setup_complete+ @site_role in [:owner, :admin] and Plausible.Teams.setup?(@current_team)} /><div class="flow-root">diff --git a/lib/plausible_web/templates/stats/site_locked.html.heex b/lib/plausible_web/templates/stats/site_locked.html.heexindex 7964c8b0a3..a94eef734b 100644--- a/lib/plausible_web/templates/stats/site_locked.html.heex+++ b/lib/plausible_web/templates/stats/site_locked.html.heex@@ -49,7 +49,7 @@unlock the stats.</p><div- :if={not Plausible.Teams.enabled?(@conn.assigns[:my_team])}+ :if={not Plausible.Teams.enabled?(@conn.assigns[:current_team])}class="mt-6 text-sm text-gray-500"><p>Want to pay for this site with the account you're logged in with?</p>diff --git a/lib/plausible_web/user_auth.ex b/lib/plausible_web/user_auth.exindex de21f69343..758b4e234f 100644--- a/lib/plausible_web/user_auth.ex+++ b/lib/plausible_web/user_auth.ex@@ -134,10 +134,6 @@ defmodule PlausibleWeb.UserAuth doinner_join: u in assoc(us, :user),as: :user,left_join: tm in assoc(u, :team_memberships),- # NOTE: whenever my_team.subscription is used to prevent user action,- # we must check whether the team association is ownership.- # Otherwise regular members will be limited by team owner in cases- # like deleting their own account.on: tm.role != :guest,left_join: t in assoc(tm, :team),as: :team,diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex 1ae46cec8f..5576528977 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -1,6 +1,8 @@defmodule PlausibleWeb.LayoutView douse PlausibleWeb, :viewuse Plausible++ alias Plausible.Teamsalias PlausibleWeb.Components.Billing.Noticedef plausible_url do@@ -94,28 +96,104 @@ defmodule PlausibleWeb.LayoutView doenddef account_settings_sidebar(conn) do+ current_team = conn.assigns[:current_team]+options = %{- "Account Settings" => [- %{key: "Preferences", value: "preferences", icon: :cog_6_tooth},- %{key: "Security", value: "security", icon: :lock_closed},- %{key: "Subscription", value: "billing/subscription", icon: :circle_stack},- %{key: "Invoices", value: "billing/invoices", icon: :banknotes},- %{key: "API Keys", value: "api-keys", icon: :key},- %{key: "Danger Zone", value: "danger-zone", icon: :exclamation_triangle}- ]+ "Account Settings" =>+ [+ %{key: "Preferences", value: "preferences", icon: :cog_6_tooth},+ %{key: "Security", value: "security", icon: :lock_closed},+ if(not Teams.setup?(current_team),+ do: %{key: "Subscription", value: "billing/subscription", icon: :circle_stack}+ ),+ if(not Teams.setup?(current_team),+ do: %{key: "Invoices", value: "billing/invoices", icon: :banknotes}+ ),+ %{key: "API Keys", value: "api-keys", icon: :key},+ %{key: "Danger Zone", value: "danger-zone", icon: :exclamation_triangle}+ ]+ |> Enum.reject(&is_nil/1)}- if Plausible.Teams.enabled?(conn.assigns[:my_team]) do+ if Teams.enabled?(current_team) and Teams.setup?(current_team) doMap.put(options, "Team Settings", [- %{key: "General", value: "team/general", icon: :adjustments_horizontal}+ %{key: "General", value: "team/general", icon: :adjustments_horizontal},+ %{key: "Subscription", value: "billing/subscription", icon: :circle_stack},+ %{key: "Invoices", value: "billing/invoices", icon: :banknotes}])elseoptionsendend+ attr :conn, :map, required: true+ attr :teams, :list, required: true+ attr :my_team, :any, default: nil+ attr :current_team, :any, default: nil+ attr :more_teams?, :boolean, required: true++ def team_switcher(assigns) do+ teams = assigns[:teams]++ if teams && length(teams) > 0 do+ current_team = assigns[:current_team]+ my_team = assigns[:my_team]+ current_included? = current_team && Enum.any?(teams, &(&1.id == current_team.id))+ current_is_my? = current_team && my_team && current_team.id == my_team.id++ teams =+ if current_team && !current_included? && !current_is_my? do+ [current_team | teams]+ else+ teams+ end++ teams =+ if my_team do+ teams ++ [my_team]+ else+ teams ++ [%Teams.Team{identifier: "none", name: Teams.default_name()}]+ end++ selected_id = current_team && current_team.id++ assigns =+ assigns+ |> assign(:teams, teams)+ |> assign(:selected_id, selected_id)++ ~H"""+ <.dropdown_item>+ <div class="text-xs text-gray-500 dark:text-gray-400">Teams</div>+ </.dropdown_item>+ <.dropdown_item+ :for={team <- @teams}+ href={Routes.site_path(@conn, :index, __team: team.identifier)}+ >+ <p+ class={[+ if(team.id == @selected_id,+ do: "border-r-4 border-indigo-400 font-bold",+ else: "font-medium"+ ),+ "truncate text-gray-900 dark:text-gray-100 pr-4"+ ]}+ role="none"+ >+ {Teams.name(team)}+ </p>+ </.dropdown_item>+ <.dropdown_item :if={@more_teams?} href={Routes.auth_path(@conn, :select_team)}>+ Switch to Another Team+ </.dropdown_item>+ """+ else+ ~H""+ end+ end+def trial_notification(team) do- case Plausible.Teams.trial_days_left(team) do+ case Teams.trial_days_left(team) dodays when days > 1 ->"#{days} trial days left"diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exsindex 3b72db7577..dbec23c141 100644--- a/priv/repo/seeds.exs+++ b/priv/repo/seeds.exs@@ -62,6 +62,10 @@ site =add_guest(site, user: new_user(name: "Arnold Wallaby", password: "plausible"), role: :viewer)add_guest(site, user: new_user(name: "Lois Lane", password: "plausible"), role: :editor)+user2 = new_user(name: "Mary Jane", email: "[email protected]", password: "plausible")+site2 = new_site(domain: "computer.example.com", owner: user2)+invite_guest(site2, user, inviter: user2, role: :viewer)+Plausible.Factory.insert_list(29, :ip_rule, site: site)Plausible.Factory.insert(:country_rule, site: site, country_code: "PL")Plausible.Factory.insert(:country_rule, site: site, country_code: "EE")diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex d1db4644e3..fd10ee97dd 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -224,6 +224,113 @@ defmodule Plausible.SitesTest do} = Plausible.Teams.Sites.list_with_invitations(user, %{})end+ test "lists guest sites, site invitations and transfers when no current team set" do+ user1 = new_user()+ user2 = new_user()+ user3 = new_user()+ user4 = new_user()++ # owned site on a setup team+ site1 = new_site(owner: user1, domain: "own.example.com")+ Plausible.Teams.complete_setup(site1.team)++ # guest site access+ site2 = new_site(owner: user2, domain: "guest.example.com")+ add_guest(site2, user: user1, role: :editor)++ # site invitation+ site3 = new_site(owner: user3, domain: "invitation.example.com")+ invite_guest(site3, user1, role: :viewer, inviter: user3)++ # transfer+ site4 = new_site(domain: "transfer.example.com", owner: user3)+ invite_transfer(site4, user1, inviter: user2)++ # other team site access+ site5 = new_site(domain: "team.example.com", owner: user4)+ add_member(site5.team, user: user1, role: :editor)++ assert %{+ entries: [+ %{domain: "invitation.example.com"},+ %{domain: "transfer.example.com"},+ %{domain: "guest.example.com"}+ ]+ } =+ Sites.list_with_invitations(user1, %{})+ end++ test "lists guest sites, site invitations, transfers and team sites when current team set but not setup" do+ user1 = new_user()+ user2 = new_user()+ user3 = new_user()+ user4 = new_user()++ # owned site on a personal team+ site1 = new_site(owner: user1, domain: "own.example.com")++ # guest site access+ site2 = new_site(owner: user2, domain: "guest.example.com")+ add_guest(site2, user: user1, role: :editor)++ # site invitation+ site3 = new_site(owner: user3, domain: "invitation.example.com")+ invite_guest(site3, user1, role: :viewer, inviter: user3)++ # transfer+ site4 = new_site(domain: "transfer.example.com", owner: user3)+ invite_transfer(site4, user1, inviter: user2)++ # other team site access+ site5 = new_site(domain: "team.example.com", owner: user4)+ add_member(site5.team, user: user1, role: :editor)++ assert %{+ entries: [+ %{domain: "invitation.example.com"},+ %{domain: "transfer.example.com"},+ %{domain: "guest.example.com"},+ %{domain: "own.example.com"}+ ]+ } =+ Sites.list_with_invitations(user1, %{}, team: site1.team)+ end++ test "lists team sites and transfers when current team set and setup" do+ user1 = new_user()+ user2 = new_user()+ user3 = new_user()+ user4 = new_user()++ # owned site on a personal team+ new_site(owner: user1, domain: "own.example.com")++ # guest site access+ site2 = new_site(owner: user2, domain: "guest.example.com")+ add_guest(site2, user: user1, role: :editor)++ # site invitation+ site3 = new_site(owner: user3, domain: "invitation.example.com")+ invite_guest(site3, user1, role: :viewer, inviter: user3)++ # transfer+ site4 = new_site(domain: "transfer.example.com", owner: user3)+ invite_transfer(site4, user1, inviter: user2)++ # other team site access+ site5 = new_site(domain: "team.example.com", owner: user4)+ team5 = Plausible.Teams.complete_setup(site5.team)+ add_member(site5.team, user: user1, role: :editor)++ assert %{+ entries: [+ %{domain: "transfer.example.com"},+ %{domain: "team.example.com"}+ ]+ } =+ Sites.list_with_invitations(user1, %{}, team: team5)+ end+test "prioritizes pending transfer over pinned site with guest membership" doowner = new_user()pending_owner = new_user()@@ -470,12 +577,12 @@ defmodule Plausible.SitesTest doinvite_guest(site3, user1, role: :viewer, inviter: user3)invite_transfer(site2, user1, inviter: user2)- add_member(site4.team, user: user1, role: :editor)+ team4 = Plausible.Teams.complete_setup(site4.team)+ add_member(team4, user: user1, role: :editor)assert_matches %{entries: [- %{id: ^site1.id},- %{id: ^site4.id}+ %{id: ^site1.id}]} = Sites.list(user1, %{})@@ -483,8 +590,7 @@ defmodule Plausible.SitesTest doentries: [%{id: ^site3.id},%{id: ^site2.id},- %{id: ^site1.id},- %{id: ^site4.id}+ %{id: ^site1.id}]} = Sites.list_with_invitations(user1, %{})@@ -492,15 +598,14 @@ defmodule Plausible.SitesTest doentries: [%{id: ^site4.id}]- } = Sites.list(user1, %{}, team: site4.team)+ } = Sites.list(user1, %{}, team: team4)assert_matches %{entries: [- %{id: ^site3.id},%{id: ^site2.id},%{id: ^site4.id}]- } = Sites.list_with_invitations(user1, %{}, team: site4.team)+ } = Sites.list_with_invitations(user1, %{}, team: team4)endtest "handles pagination correctly" dodiff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exsindex 642f6d696a..c3599cfc37 100644--- a/test/plausible/teams/management/layout_test.exs+++ b/test/plausible/teams/management/layout_test.exs@@ -240,7 +240,7 @@ defmodule Plausible.Teams.Management.LayoutTest doassert {:ok, 0} =team|> Layout.init()- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert_no_emails_delivered()end@@ -249,7 +249,7 @@ defmodule Plausible.Teams.Management.LayoutTest dorefute team.setup_completerefute team.setup_at- team |> Layout.init() |> Layout.persist(%{current_user: user, my_team: team})+ team |> Layout.init() |> Layout.persist(%{current_user: user, current_team: team})team = Repo.reload!(team)@@ -268,7 +268,7 @@ defmodule Plausible.Teams.Management.LayoutTest doassert setup_at = team.setup_at- team |> Layout.init() |> Layout.persist(%{current_user: user, my_team: team})+ team |> Layout.init() |> Layout.persist(%{current_user: user, current_team: team})team = Repo.reload!(team)@@ -280,7 +280,7 @@ defmodule Plausible.Teams.Management.LayoutTest doteam|> Layout.init()|> Layout.schedule_send("[email protected]", :admin)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert_email_delivered_with(to: [nil: "[email protected]"],@@ -298,7 +298,7 @@ defmodule Plausible.Teams.Management.LayoutTest doteam|> Layout.init()|> Layout.schedule_delete("[email protected]")- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert_email_delivered_with(to: [nil: "[email protected]"],@@ -314,7 +314,7 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.schedule_send("[email protected]", :admin)|> Layout.schedule_send("[email protected]", :admin)|> Layout.schedule_send("[email protected]", :admin)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert {:error, :only_one_owner} =team@@ -322,19 +322,19 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.schedule_delete(user.email)|> put(invitation_pending("[email protected]", role: :owner))|> put(invitation_sent("[email protected]", role: :owner))- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert {:error, :only_one_owner} =team|> Layout.init()|> Layout.update_role(user.email, :viewer)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert {:error, :already_a_member} =team|> Layout.init()|> Layout.schedule_send(user.email, :admin)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert_no_emails_delivered()end@@ -350,7 +350,7 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.schedule_send("[email protected]", :admin)|> Layout.schedule_delete("[email protected]")|> Layout.schedule_delete("[email protected]")- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})endtest "multiple ops queue", %{user: user, team: team} do@@ -363,7 +363,7 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.schedule_send("[email protected]", :admin)|> Layout.schedule_delete("[email protected]")|> Layout.update_role("[email protected]", :viewer)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert {:error, :not_a_member} = Teams.Memberships.team_role(team, member1)assert {:ok, :viewer} = Teams.Memberships.team_role(team, member2)@@ -388,7 +388,7 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.init()|> Layout.schedule_send("[email protected]", :admin)|> Layout.schedule_delete("[email protected]")- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})endtest "idempotence", %{user: user, team: team} do@@ -404,7 +404,7 @@ defmodule Plausible.Teams.Management.LayoutTest do|> Layout.update_role("[email protected]", :viewer)|> Layout.schedule_delete("[email protected]")|> Layout.update_role("[email protected]", :viewer)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})assert_email_delivered_with(to: [nil: "[email protected]"],@@ -431,7 +431,7 @@ defmodule Plausible.Teams.Management.LayoutTest dolayout|> Layout.update_role(u2.email, :viewer)- |> Layout.persist(%{current_user: user, my_team: team})+ |> Layout.persist(%{current_user: user, current_team: team})refute team |> Layout.init() |> Layout.has_guests?()diff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exsindex 53ada585a6..4025dfe66c 100644--- a/test/plausible/teams_test.exs+++ b/test/plausible/teams_test.exs@@ -6,15 +6,35 @@ defmodule Plausible.TeamsTest doalias Plausible.Teamsalias Plausible.Repo+ describe "name/1" do+ test "returns default name when there's no team" do+ assert Teams.name(nil) == "My Personal Sites"+ end++ test "returns default name when team setup is not completed yet" do+ user = new_user(team: [setup_complete: false, name: "Foo"])+ team = team_of(user)++ assert Teams.name(team) == "My Personal Sites"+ end++ test "returns team name for a setup team" do+ user = new_user(team: [setup_complete: true, name: "Foo"])+ team = team_of(user)++ assert Teams.name(team) == "Foo"+ end+ end+describe "get_or_create/1" do- test "creates 'My Team' if user is a member of none" do+ test "creates 'My Personal Sites' if user is a member of no teams" dotoday = Date.utc_today()user = new_user()user_id = user.idassert {:ok, team} = Teams.get_or_create(user)- assert team.name == "My Team"+ assert team.name == "My Personal Sites"assert Date.compare(team.trial_expiry_date, today) == :gtassert [@@ -22,7 +42,7 @@ defmodule Plausible.TeamsTest do] = Repo.preload(team, :team_memberships).team_membershipsend- test "returns existing 'My Team' if user already owns one" do+ test "returns existing team if user already owns one" douser = new_user(trial_expiry_date: ~D[2020-04-01])user_id = user.idexisting_team = team_of(user)@@ -31,6 +51,7 @@ defmodule Plausible.TeamsTest doassert team.id == existing_team.idassert Date.compare(team.trial_expiry_date, ~D[2020-04-01])+ assert team.name == "My Personal Sites"assert [%{user_id: ^user_id, role: :owner, is_autocreated: true}@@ -58,7 +79,7 @@ defmodule Plausible.TeamsTest do|> Enum.sort_by(& &1.id)end- test "creates 'My Team' if user is a guest on another team" do+ test "creates 'My Personal Sites' if user is a guest on another team" douser = new_user()user_id = user.idsite = new_site()@@ -68,6 +89,7 @@ defmodule Plausible.TeamsTest doassert {:ok, team} = Teams.get_or_create(user)assert team.id != existing_team.id+ assert team.name == "My Personal Sites"assert [%{user_id: ^user_id, role: :owner, is_autocreated: true}] =team@@ -75,7 +97,7 @@ defmodule Plausible.TeamsTest do|> Map.fetch!(:team_memberships)end- test "creates 'My Team' if user is a non-owner member on existing teams" do+ test "creates 'My Personal Sites' if user is a non-owner member on existing teams" douser = new_user()user_id = user.idsite1 = new_site()@@ -146,7 +168,7 @@ defmodule Plausible.TeamsTest doassert {:error, :no_team} = Teams.get_by_owner(user)end- test "returns existing 'My Team' if user already owns one" do+ test "returns existing 'My Personal Sites' if user already owns one" douser = new_user(trial_expiry_date: ~D[2020-04-01])user_id = user.idexisting_team = team_of(user)@@ -155,6 +177,7 @@ defmodule Plausible.TeamsTest doassert team.id == existing_team.idassert Date.compare(team.trial_expiry_date, ~D[2020-04-01])+ assert team.name == "My Personal Sites"assert [%{user_id: ^user_id, role: :owner, is_autocreated: true}diff --git a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exsindex f76dad4ada..0aa44b2c89 100644--- a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs+++ b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs@@ -74,8 +74,10 @@ defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest dofor role <- [:viewer, :owner] dotest "returns list with personal and site segments for #{role}, avoiding segments from other site",%{conn: conn, user: user, site: site} do+ team = team_of(user)other_user = new_user(name: "Other User")- other_site = new_site(owner: other_user, team: team_of(user))+ other_site = new_site(team: team)+ add_member(team, user: other_user, role: :owner)insert_list(2, :segment,site: other_site,diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex cebacbb1d6..81835163c1 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -616,9 +616,7 @@ defmodule PlausibleWeb.AuthControllerTest douser: user,site: site} do- site.team- |> Plausible.Teams.Team.setup_changeset()- |> Repo.update!()+ Plausible.Teams.complete_setup(site.team)conn = delete(conn, "/me")@@ -635,9 +633,7 @@ defmodule PlausibleWeb.AuthControllerTest douser: user,site: site} do- site.team- |> Plausible.Teams.Team.setup_changeset()- |> Repo.update!()+ Plausible.Teams.complete_setup(site.team)another_owner = new_user()another_site = new_site(owner: another_owner)diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 54d5963946..6107dc7366 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -98,6 +98,7 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doother_owner = new_user() |> subscribe_to_growth_plan()new_team = team_of(other_owner)add_member(new_team, user: user, role: :viewer)+ conn = set_current_team(conn, new_team)transfer = invite_transfer(site, user, inviter: old_owner)@@ -284,6 +285,7 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do_site = new_site(owner: owner)team = team_of(owner)add_member(team, user: user, role: unquote(role))+ conn = set_current_team(conn, team)invitation =invite_member(team, "[email protected]", inviter: owner, role: unquote(invitee_role))@@ -354,6 +356,7 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do_site = new_site(owner: owner)team = team_of(owner)add_member(team, user: user, role: :editor)+ conn = set_current_team(conn, team)remove_invitation_path =Routes.invitation_path(diff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex 09371bfbd8..309fa043b7 100644--- a/test/plausible_web/controllers/settings_controller_test.exs+++ b/test/plausible_web/controllers/settings_controller_test.exs@@ -1118,7 +1118,8 @@ defmodule PlausibleWeb.SettingsControllerTest dotest "renders team settings, when team assigned and set up", %{conn: conn, user: user} do{:ok, team} = Plausible.Teams.get_or_create(user)- team |> Plausible.Teams.Team.setup_changeset() |> Repo.update!()+ team = Plausible.Teams.complete_setup(team)+ conn = set_current_team(conn, team)conn = get(conn, Routes.settings_path(conn, :preferences))html = html_response(conn, 200)assert html =~ "Team Settings"@@ -1129,17 +1130,20 @@ defmodule PlausibleWeb.SettingsControllerTest do{:ok, team} = Plausible.Teams.get_or_create(user)conn = get(conn, Routes.settings_path(conn, :preferences))html = html_response(conn, 200)- assert html =~ "Team Settings"+ refute html =~ "Team Settings"refute html =~ team.nameendtest "GET /settings/team/general", %{conn: conn, user: user} do{:ok, team} = Plausible.Teams.get_or_create(user)+ team = Plausible.Teams.complete_setup(team)+ conn = set_current_team(conn, team)conn = get(conn, Routes.settings_path(conn, :team_general))html = html_response(conn, 200)- assert html =~ "Team Name"+ assert html =~ "Team Information"assert html =~ "Change the name of your team"assert text_of_attr(html, "input#team_name", "value") == team.name+ assert text_of_attr(html, "input#team-identifier", "value") == team.identifierendtest "POST /settings/team/general/name", %{conn: conn, user: user} do@@ -1157,7 +1161,9 @@ defmodule PlausibleWeb.SettingsControllerTest doendtest "POST /settings/team/general/name - changeset error", %{conn: conn, user: user} do- {:ok, _team} = Plausible.Teams.get_or_create(user)+ {:ok, team} = Plausible.Teams.get_or_create(user)+ team = Plausible.Teams.complete_setup(team)+ conn = set_current_team(conn, team)conn =post(conn, Routes.settings_path(conn, :update_team_name), %{diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex f236917a05..dd5d393827 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -259,6 +259,7 @@ defmodule PlausibleWeb.SiteControllerTest dotest "fails to create site when not allowed to in selected team", %{conn: conn, user: user} dosite = new_site()add_member(site.team, user: user, role: :viewer)+ conn = set_current_team(conn, site.team)conn =post(conn, "/sites", %{@@ -591,7 +592,9 @@ defmodule PlausibleWeb.SiteControllerTest dorefute resp =~ "You can also invite people to your team"refute resp =~ "Team members automatically have access to this site."- user |> team_of() |> Teams.Team.setup_changeset() |> Repo.update!()+ team = team_of(user)+ Teams.complete_setup(team)+ conn = set_current_team(conn, team)resp = conn |> get("/#{site.domain}/settings/people") |> html_response(200)assert resp =~ "You can also invite people to your team"diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exsindex 2aacfd45f2..dd49ba7c2e 100644--- a/test/plausible_web/live/sites_test.exs+++ b/test/plausible_web/live/sites_test.exs@@ -13,9 +13,27 @@ defmodule PlausibleWeb.Live.SitesTest dotest "renders empty sites page", %{conn: conn} do{:ok, _lv, html} = live(conn, "/sites")+ assert text(html) =~ "My Personal Sites"+assert text(html) =~ "You don't have any sites yet"end+ test "renders settings link when current team is set", %{user: user, conn: conn} do+ {:ok, _lv, html} = live(conn, "/sites")++ refute element_exists?(html, ~s|a[data-test-id="team-settings-link"]|)++ new_site(owner: user)+ team = team_of(user)+ team = Plausible.Teams.complete_setup(team)++ conn = set_current_team(conn, team)++ {:ok, _lv, html} = live(conn, "/sites")++ assert element_exists?(html, ~s|a[data-test-id="team-settings-link"]|)+ end+test "renders team invitations", %{user: user, conn: conn} doowner1 = new_user(name: "G.I. Joe")new_site(owner: owner1)@@ -31,10 +49,10 @@ defmodule PlausibleWeb.Live.SitesTest do{:ok, _lv, html} = live(conn, "/sites")assert text_of_element(html, "#invitation-#{invitation1.invitation_id}") =~- "G.I. Joe has invited you to join the \"My Team\" as viewer member."+ "G.I. Joe has invited you to join the \"My Personal Sites\" as viewer member."assert text_of_element(html, "#invitation-#{invitation2.invitation_id}") =~- "G.I. Jane has invited you to join the \"My Team\" as editor member."+ "G.I. Jane has invited you to join the \"My Personal Sites\" as editor member."assert find(html,diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 3c983d0d3c..71482dcd19 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -24,8 +24,8 @@ defmodule PlausibleWeb.Live.TeamMangementTest dorefute element_exists?(resp, ~s|button[phx-click="save-team-layout"]|)end- test "renders existing guests under Guest divider", %{conn: conn, user: user} do- site = new_site(owner: user)+ test "renders existing guests under Guest divider", %{conn: conn, team: team, user: user} do+ site = new_site(team: team)add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))resp =@@ -102,11 +102,8 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert_team_membership(member2, team, :viewer)end- test "allows updating guest membership so it moves sections", %{- conn: conn,- user: user- } do- site = new_site(owner: user)+ test "allows updating guest membership so it moves sections", %{conn: conn, team: team} do+ site = new_site(team: team)add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))lv = get_liveview(conn)@@ -154,7 +151,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest domember2 = add_member(team, role: :admin)_invitation = invite_member(team, "[email protected]", inviter: user, role: :viewer)- site = new_site(owner: user)+ site = new_site(team: team)guest =add_guest(site,@@ -223,7 +220,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest douser: user,team: team} do- site = new_site(owner: user)+ site = new_site(team: team)member2 =add_guest(site,diff --git a/test/plausible_web/live/team_setup_test.exs b/test/plausible_web/live/team_setup_test.exsindex 195a924792..5c4fe28fb9 100644--- a/test/plausible_web/live/team_setup_test.exs+++ b/test/plausible_web/live/team_setup_test.exs@@ -21,21 +21,36 @@ defmodule PlausibleWeb.Live.TeamSetupTest dotest "redirects to /team/general if team is already set up", %{conn: conn, user: user} do{:ok, team} = Teams.get_or_create(user)- team |> Teams.Team.setup_changeset() |> Repo.update!()+ Teams.complete_setup(team)+ conn = set_current_team(conn, team)assert {:error, {:redirect, %{to: "/settings/team/general"}}} = live(conn, @url)end-- test "does not redirect to /team/general if dev mode", %{conn: conn, user: user} do- {:ok, team} = Teams.get_or_create(user)- team |> Teams.Team.setup_changeset() |> Repo.update!()- assert {:ok, lv, _} = live(conn, @url <> "?dev=1")- _ = render(lv)- endenddescribe "/team/setup - main differences from team management" dosetup [:create_user, :log_in, :create_team]+ test "renames the team on first render", %{conn: conn, team: team} do+ assert team.name == "My Personal Sites"+ {:ok, _lv, html} = live(conn, @url)++ assert text_of_attr(html, ~s|input#update-team-form_name[name="team[name]"]|, "value") ==+ "Jane Smith's Team"++ assert Repo.reload!(team).name == "Jane Smith's Team"+ end++ test "renames even if team already has non-default name", %{conn: conn, team: team} do+ assert team.name == "My Personal Sites"+ Repo.update!(Teams.Team.name_changeset(team, %{name: "Foo"}))+ {:ok, _lv, html} = live(conn, @url)++ assert text_of_attr(html, ~s|input#update-team-form_name[name="team[name]"]|, "value") ==+ "Jane Smith's Team"++ assert Repo.reload!(team).name == "Jane Smith's Team"+ end+test "renders form", %{conn: conn} do{:ok, lv, html} = live(conn, @url)assert element_exists?(html, ~s|input#update-team-form_name[name="team[name]"]|)@@ -51,6 +66,23 @@ defmodule PlausibleWeb.Live.TeamSetupTest do_ = render(lv)end++ test "setting team name to 'My Personal Sites' is reserved", %{+ conn: conn,+ team: team,+ user: user+ } do+ {:ok, lv, html} = live(conn, @url)++ assert text_of_attr(html, ~s|input#update-team-form_name[name="team[name]"]|, "value") ==+ "#{user.name}'s Team"++ type_into_input(lv, "team[name]", "Team Name 1")+ _ = render(lv)+ type_into_input(lv, "team[name]", "My Personal Sites")+ _ = render(lv)+ assert Repo.reload!(team).name == "Team Name 1"+ endenddescribe "/team/setup - full integration" do@@ -78,7 +110,9 @@ defmodule PlausibleWeb.Live.TeamSetupTest dosave_layout(lv)- assert_redirect(lv, "/settings/team/general")+ assert_redirect(lv, "/settings/team/general?__team=" <> team.identifier)++ team = Repo.reload!(team)assert_email_delivered_with(to: [nil: "[email protected]"],@@ -102,6 +136,8 @@ defmodule PlausibleWeb.Live.TeamSetupTest dosave_layout(lv)+ team = Repo.reload!(team)+assert_email_delivered_with(to: [nil: "[email protected]"],subject: @subject_prefix <> "You've been invited to \"#{team.name}\" team"@@ -252,6 +288,8 @@ defmodule PlausibleWeb.Live.TeamSetupTest dosave_layout(lv)+ team = Repo.reload!(team)+assert_email_delivered_with(to: [nil: guest.email],subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"diff --git a/test/plausible_web/plugs/auth_plug_test.exs b/test/plausible_web/plugs/auth_plug_test.exsindex 278daab612..fc8a55d349 100644--- a/test/plausible_web/plugs/auth_plug_test.exs+++ b/test/plausible_web/plugs/auth_plug_test.exs@@ -49,4 +49,59 @@ defmodule PlausibleWeb.AuthPlugTest doassert conn.assigns[:current_user].id == user.idassert conn.assigns[:my_team].subscription.paddle_plan_id == "456"end++ test "switches current team when `team` parameter provided", %{conn: conn, user: user} do+ subscribe_to_plan(user, "123", inserted_at: NaiveDateTime.utc_now())+ team = team_of(user)++ conn =+ conn+ |> Plug.Adapters.Test.Conn.conn(:get, "/", %{__team: team.identifier})+ |> AuthPlug.call(%{})++ assert conn.assigns[:current_team].id == team.id+ assert get_session(conn, "current_team_id") == team.identifier+ end++ test "does not switch to team provided via `team` the user doesn't belong to", %{conn: conn} do+ other_user = new_user()+ subscribe_to_plan(other_user, "123", inserted_at: NaiveDateTime.utc_now())+ team = team_of(other_user)++ conn =+ conn+ |> Plug.Adapters.Test.Conn.conn(:get, "/", %{team: team.identifier})+ |> AuthPlug.call(%{})++ refute conn.assigns[:current_team]+ refute get_session(conn, "current_team_id")+ end++ test "does not switch to a team from session when the user doesn't belong to it", %{conn: conn} do+ other_user = new_user()+ subscribe_to_plan(other_user, "123", inserted_at: NaiveDateTime.utc_now())+ team = team_of(other_user)++ conn =+ conn+ |> put_session("current_team_id", team.identifier)+ |> Plug.Adapters.Test.Conn.conn(:get, "/", %{})+ |> AuthPlug.call(%{})++ refute conn.assigns[:current_team]+ refute get_session(conn, "current_team_id")+ end++ test "falls back to my_team when there's no current team picked", %{conn: conn, user: user} do+ subscribe_to_plan(user, "123", inserted_at: NaiveDateTime.utc_now())+ team = team_of(user)++ conn =+ conn+ |> Plug.Adapters.Test.Conn.conn(:get, "/", %{})+ |> AuthPlug.call(%{})++ assert conn.assigns[:current_team].id == team.id+ refute get_session(conn, "current_team_id")+ endenddiff --git a/test/plausible_web/plugs/user_session_touch_test.exs b/test/plausible_web/plugs/user_session_touch_test.exsindex 8a2a3bf638..437873abe4 100644--- a/test/plausible_web/plugs/user_session_touch_test.exs+++ b/test/plausible_web/plugs/user_session_touch_test.exs@@ -18,6 +18,7 @@ defmodule PlausibleWeb.Plugs.UserSessionTouchTest doassert %{assigns: %{current_user_session: user_session}} =conn+ |> Plug.Conn.fetch_query_params()|> AuthPlug.call([])|> UserSessionTouch.call([])diff --git a/test/support/factory.ex b/test/support/factory.exindex 8bde583a61..2e1383a6b7 100644--- a/test/support/factory.ex+++ b/test/support/factory.ex@@ -5,7 +5,7 @@ defmodule Plausible.Factory dodef team_factory do%Plausible.Teams.Team{- name: "My Team",+ name: Plausible.Teams.default_name(),trial_expiry_date: Timex.today() |> Timex.shift(days: 30),setup_complete: true,setup_at: NaiveDateTime.utc_now()diff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 05f7240f0f..69fe85c87d 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -17,21 +17,30 @@ defmodule Plausible.Teams.Test doendend+ def set_current_team(conn, team) do+ Plug.Conn.put_session(conn, :current_team_id, team.identifier)+ end+def new_site(args \\ []) doargs =- if user = args[:owner] do- {owner, args} = Keyword.pop(args, :owner)- {:ok, team} = Teams.get_or_create(user)+ cond do+ user = args[:owner] ->+ {owner, args} = Keyword.pop(args, :owner)+ {:ok, team} = Teams.get_or_create(user)- args- |> Keyword.put(:owners, [owner])- |> Keyword.put(:team, team)- else- user = new_user()- {:ok, team} = Teams.get_or_create(user)+ args+ |> Keyword.put(:owners, [owner])+ |> Keyword.put(:team, team)- args- |> Keyword.put(:team, team)+ args[:team] ->+ args++ true ->+ user = new_user()+ {:ok, team} = Teams.get_or_create(user)++ args+ |> Keyword.put(:team, team)end:sitediff --git a/test/support/test_utils.ex b/test/support/test_utils.exindex f404457aa7..6e2ad60de8 100644--- a/test/support/test_utils.ex+++ b/test/support/test_utils.ex@@ -47,13 +47,14 @@ defmodule Plausible.TestUtils do{:ok, team: team}end- def setup_team(%{team: team}) do- team =- team- |> Plausible.Teams.Team.setup_changeset()- |> Repo.update!()+ def setup_team(%{conn: conn, team: team}) do+ team = Plausible.Teams.complete_setup(team)- {:ok, team: team}+ conn =+ conn+ |> Plug.Conn.put_session(:current_team_id, team.identifier)++ {:ok, conn: conn, team: team}enddef create_legacy_site_import(%{site: site}) do