Skip to content

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

Remove `teams` feature flag and fix seeds (#5276)

Adrian Gruntkowskid31a175c4065
diff --git a/lib/plausible/teams.ex b/lib/plausible/teams.ex
index eb9c375d55..d3672d1213 100644
--- a/lib/plausible/teams.ex
+++ b/lib/plausible/teams.ex
@@ -25,15 +25,6 @@ defmodule Plausible.Teams do
def setup?(nil), do: false
def setup?(%{setup_complete: setup_complete}), do: setup_complete
- @spec enabled?(nil | Auth.User.t()) :: boolean()
- def enabled?(nil) do
- FunWithFlags.enabled?(:teams)
- end
-
- def enabled?(user) do
- FunWithFlags.enabled?(:teams, for: user)
- end
-
@spec get(pos_integer() | binary() | nil) :: Teams.Team.t() | nil
def get(nil), do: nil
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 39fa8fe583..d485aa3b3c 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -62,17 +62,14 @@ defmodule PlausibleWeb.Live.Sites do
<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">
- <span :if={Teams.enabled?(@current_user)}>
- {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_user)}>My Sites</span>
+ {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>
</h2>
</div>
diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.ex
index f2b38145fb..b73cec83ad 100644
--- a/lib/plausible_web/live/team_setup.ex
+++ b/lib/plausible_web/live/team_setup.ex
@@ -13,18 +13,15 @@ defmodule PlausibleWeb.Live.TeamSetup do
def mount(_params, _session, socket) do
current_user = socket.assigns.current_user
current_team = socket.assigns.current_team
- enabled? = Teams.enabled?(current_user)
socket =
- case {enabled?, current_team} do
- {true, %Teams.Team{setup_complete: true}} ->
+ case current_team do
+ %Teams.Team{setup_complete: true} ->
socket
|> put_flash(:success, "Your team is now created")
|> redirect(to: Routes.settings_path(socket, :team_general))
- {true, %Teams.Team{}} ->
- current_user = socket.assigns.current_user
-
+ %Teams.Team{} ->
team_name_form =
current_team
|> Teams.Team.name_changeset(%{name: "#{current_user.name}'s Team"})
@@ -40,7 +37,7 @@ defmodule PlausibleWeb.Live.TeamSetup do
current_team: current_team
)
- {_, _} ->
+ _ ->
socket
|> put_flash(:error, "You cannot create any team just yet")
|> redirect(to: Routes.site_path(socket, :index))
@@ -48,7 +45,7 @@ defmodule PlausibleWeb.Live.TeamSetup do
socket =
if current_team do
- {:ok, my_role} = Teams.Memberships.team_role(current_team, socket.assigns.current_user)
+ {:ok, my_role} = Teams.Memberships.team_role(current_team, current_user)
assign(socket, my_role: my_role)
else
socket
diff --git a/lib/plausible_web/plugs/authorize_team_access.ex b/lib/plausible_web/plugs/authorize_team_access.ex
index 2ce086b2d7..cf260e9a27 100644
--- a/lib/plausible_web/plugs/authorize_team_access.ex
+++ b/lib/plausible_web/plugs/authorize_team_access.ex
@@ -21,10 +21,9 @@ defmodule Plausible.Plugs.AuthorizeTeamAccess do
end
def call(conn, roles \\ @all_roles) do
- current_user = conn.assigns[:current_user]
current_team = conn.assigns[:current_team]
- if current_team && Plausible.Teams.enabled?(current_user) do
+ if current_team do
current_team_role = conn.assigns[:current_team_role]
if current_team_role in roles do
diff --git a/lib/plausible_web/templates/layout/_header.html.heex b/lib/plausible_web/templates/layout/_header.html.heex
index 52e2d45dfc..eee6613f64 100644
--- a/lib/plausible_web/templates/layout/_header.html.heex
+++ b/lib/plausible_web/templates/layout/_header.html.heex
@@ -73,7 +73,6 @@
</p>
</.dropdown_item>
<.team_switcher
- :if={Plausible.Teams.enabled?(@current_user)}
conn={@conn}
teams={@teams}
my_team={@my_team}
@@ -85,10 +84,7 @@
Account Settings
</.dropdown_item>
- <div :if={
- @my_team && Plausible.Teams.enabled?(@current_user) &&
- @my_team.id == @current_team.id
- }>
+ <div :if={@my_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
@@ -100,10 +96,7 @@
<.dropdown_divider />
</div>
- <div :if={
- Plausible.Teams.enabled?(@current_user) and
- Plausible.Teams.setup?(@current_team)
- }>
+ <div :if={Plausible.Teams.setup?(@current_team)}>
<.dropdown_item
class="flex"
href={Routes.settings_path(@conn, :team_general)}
diff --git a/lib/plausible_web/templates/layout/settings.html.heex b/lib/plausible_web/templates/layout/settings.html.heex
index 5b75719217..a4b73791c3 100644
--- a/lib/plausible_web/templates/layout/settings.html.heex
+++ b/lib/plausible_web/templates/layout/settings.html.heex
@@ -32,9 +32,7 @@
)}
<% end %>
- <div :if={
- Plausible.Teams.enabled?(@current_user) and Plausible.Teams.setup?(@current_team)
- }>
+ <div :if={Plausible.Teams.setup?(@current_team)}>
<h3 class="uppercase text-sm text-indigo-600 font-semibold mt-6">Team Settings</h3>
<p class="text-xs dark:text-gray-400 truncate mb-4">
{Plausible.Teams.name(@current_team)}
diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex
index 4d8730ad36..ca80cdc6fe 100644
--- a/lib/plausible_web/views/layout_view.ex
+++ b/lib/plausible_web/views/layout_view.ex
@@ -96,7 +96,6 @@ defmodule PlausibleWeb.LayoutView do
end
def account_settings_sidebar(conn) do
- current_user = conn.assigns[:current_user]
current_team = conn.assigns[:current_team]
current_team_role = conn.assigns[:current_team_role]
@@ -119,7 +118,7 @@ defmodule PlausibleWeb.LayoutView do
|> Enum.reject(&is_nil/1)
}
- if Teams.enabled?(current_user) and Teams.setup?(current_team) do
+ if Teams.setup?(current_team) do
Map.put(
options,
"Team Settings",
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 3baa8be38e..126a7f19d9 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -9,9 +9,9 @@
#
# We recommend using the bang functions (`insert!`, `update!`
# and so on) as they will fail if something goes wrong.
-import Plausible.Teams.Test
+use Plausible
-FunWithFlags.enable(:teams)
+import Plausible.Teams.Test
words =
for i <- 0..(:erlang.system_info(:atom_count) - 1),
@@ -101,7 +101,7 @@ seeded_token = Plausible.Plugins.API.Token.generate("seed-token")
{:ok, _goal5} = Plausible.Goals.create(site, %{"page_path" => Enum.random(long_random_paths)})
{:ok, outbound} = Plausible.Goals.create(site, %{"event_name" => "Outbound Link: Click"})
-if Plausible.ee?() do
+if ee?() do
{:ok, _funnel} =
Plausible.Funnels.create(site, "From homepage to login", [
%{"goal_id" => goal1.id},
diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exs
index 1a51b196b2..90061a7bd0 100644
--- a/test/plausible/billing/billing_test.exs
+++ b/test/plausible/billing/billing_test.exs
@@ -318,7 +318,6 @@ defmodule Plausible.BillingTest do
assert subscription.next_bill_amount == "12.00"
end
- @tag :teams
test "updates subscription with user/team passthrough" do
user = new_user()
subscribe_to_growth_plan(user)
diff --git a/test/plausible/site/site_removal_test.exs b/test/plausible/site/site_removal_test.exs
index 2a6bc7e0c0..2256873bb6 100644
--- a/test/plausible/site/site_removal_test.exs
+++ b/test/plausible/site/site_removal_test.exs
@@ -13,7 +13,6 @@ defmodule Plausible.Site.SiteRemovalTest do
refute Sites.get_by_domain(site.domain)
end
- @tag :teams
test "site deletion prunes team guest memberships" do
owner = new_user()
site = new_site(owner: owner)
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 1fbe5e797d..9db91e446b 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -8,7 +8,6 @@ Application.ensure_all_started(:double)
FunWithFlags.enable(:channels)
FunWithFlags.enable(:scroll_depth)
-FunWithFlags.enable(:teams)
Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)