Skip to content

[CLEAN] Synthetic Benchmark PR #5908 - Remove :consolidated_view feature flag #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomerqodo wants to merge 1 commit into
base: base_pr_5908_20251204_5181
Choose a base branch
from
Open

[CLEAN] Synthetic Benchmark PR #5908 - Remove :consolidated_view feature flag #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions extra/lib/plausible/consolidated_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -98,9 +92,6 @@ defmodule Plausible.ConsolidatedView do
not Teams.setup?(team) ->
{:error, :team_not_setup}

not flag_enabled?(team) ->
{:error, :unavailable}

true ->
do_enable(team)
end
Expand Down
38 changes: 15 additions & 23 deletions lib/plausible_web/live/sites.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,30 +1091,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

Expand Down
2 changes: 0 additions & 2 deletions priv/repo/seeds.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>)
Expand Down
5 changes: 0 additions & 5 deletions test/plausible/consolidated_view_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
46 changes: 0 additions & 46 deletions test/plausible_web/live/sites_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions test/test_helper.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down