mirror
/
analytics
mirror of https://github.com/plausible/analytics.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove :consolidated_view feature flag (#5908)

This commit is contained in:
Adam Rutkowski 2025-11-24 12:42:15 +01:00 committed by GitHub
parent 2c00acc89b
commit 5fe2be8dc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extra/lib/plausible/consolidated_view.ex
View File

@ -16,11 +16,6 @@ defmodule Plausible.ConsolidatedView do
import Ecto.Query
@spec flag_enabled?(Team.t()) :: boolean()
def flag_enabled?(team) do
FunWithFlags.enabled?(:consolidated_view, for: team)
end
@spec cta_dismissed?(User.t(), Team.t()) :: boolean()
def cta_dismissed?(%User{} = user, %Team{} = team) do
{:ok, team_membership} = Teams.Memberships.get_team_membership(team, user)
@ -51,7 +46,6 @@ defmodule Plausible.ConsolidatedView do
@spec ok_to_display?(Team.t() | nil) :: boolean()
def ok_to_display?(team) do
is_struct(team, Team) and
flag_enabled?(team) and
view_enabled?(team) and
has_sites_to_consolidate?(team) and
Plausible.Billing.Feature.ConsolidatedView.check_availability(team) == :ok
@ -102,9 +96,6 @@ defmodule Plausible.ConsolidatedView do
not Teams.setup?(team) ->
{:error, :team_not_setup}
not flag_enabled?(team) ->
{:error, :unavailable}
true ->
do_enable(team)
end

38
lib/plausible_web/live/sites.ex
View File

@ -1118,30 +1118,22 @@ defmodule PlausibleWeb.Live.Sites do
end
defp init_consolidated_view_assigns(user, team) do
if ConsolidatedView.flag_enabled?(team) do
case ConsolidatedView.enable(team) do
{:ok, view} ->
%{
consolidated_view: view,
can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),
consolidated_stats: :loading,
no_consolidated_view_reason: nil,
consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)
}
case ConsolidatedView.enable(team) do
{:ok, view} ->
%{
consolidated_view: view,
can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),
consolidated_stats: :loading,
no_consolidated_view_reason: nil,
consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)
}
{:error, reason} ->
no_consolidated_view(
no_consolidated_view_reason: reason,
can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),
consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)
)
end
else
no_consolidated_view(
no_consolidated_view_reason: :unavailable,
can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),
consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)
)
{:error, reason} ->
no_consolidated_view(
no_consolidated_view_reason: reason,
can_manage_consolidated_view?: ConsolidatedView.can_manage?(user, team),
consolidated_view_cta_dismissed?: ConsolidatedView.cta_dismissed?(user, team)
)
end
end

2
priv/repo/seeds.exs
View File

@ -13,8 +13,6 @@ use Plausible
import Plausible.Teams.Test
FunWithFlags.enable(:consolidated_view)
words =
for i <- 0..(:erlang.system_info(:atom_count) - 1),
do: :erlang.binary_to_term(<<131, 75, i::24>>)

5
test/plausible/consolidated_view_test.exs
View File

@ -31,11 +31,6 @@ defmodule Plausible.ConsolidatedViewTest do
refute ConsolidatedView.ok_to_display?(nil)
end
test "returns false when feature flag is disabled", %{team: team} do
FunWithFlags.disable(:consolidated_view, for_actor: team)
refute ConsolidatedView.ok_to_display?(team)
end
test "returns false when consolidated view is not enabled", %{team: team} do
ConsolidatedView.disable(team)
refute ConsolidatedView.ok_to_display?(team)

46
test/plausible_web/live/sites_test.exs
View File

@ -331,52 +331,6 @@ defmodule PlausibleWeb.Live.SitesTest do
assert stats =~ "Views per visit 1.33"
end
test "consolidated view does not show up when flag is down (temp) during trial", %{
conn: conn,
user: user
} do
new_site(owner: user)
new_site(owner: user)
team = user |> team_of() |> Plausible.Teams.complete_setup()
FunWithFlags.disable(:consolidated_view, for_actor: team)
conn = set_current_team(conn, team)
{:ok, _lv, html} = live(conn, "/sites")
refute element_exists?(html, ~s|[data-test-id="consolidated-view-card"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-stats-loaded"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-chart-loaded"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-card-cta"]|)
end
test "consolidated view does not show up when flag is down (temp) after trial ends", %{
conn: conn,
user: user
} do
new_site(owner: user)
new_site(owner: user)
team =
user
|> team_of()
|> Plausible.Teams.Team.end_trial()
|> Plausible.Repo.update!()
FunWithFlags.disable(:consolidated_view, for_actor: team)
conn = set_current_team(conn, team)
{:ok, _lv, html} = live(conn, "/sites")
refute element_exists?(html, ~s|[data-test-id="consolidated-view-card"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-stats-loaded"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-chart-loaded"]|)
refute element_exists?(html, ~s|[data-test-id="consolidated-view-card-cta"]|)
end
test "consolidated view disappears when trial ends - CTA is shown instead", %{
conn: conn,
user: user

2
test/test_helper.exs
View File

@ -11,8 +11,6 @@ Mox.defmock(Plausible.DnsLookup.Mock,
Application.ensure_all_started(:double)
FunWithFlags.enable(:consolidated_view)
Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)
# warn about minio if it's included in tests but not running