diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.ex index 3c9e5aa4f3ec..7de5d95acee4 100644 --- a/extra/lib/plausible/consolidated_view.ex +++ b/extra/lib/plausible/consolidated_view.ex @@ -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 @@ -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 diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index d0c7d93fff4c..58c2888272db 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -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 diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 7316a6c7a23f..1522defcfcc5 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -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>>) diff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exs index 07f5dc9d4700..8ff7a296e678 100644 --- a/test/plausible/consolidated_view_test.exs +++ b/test/plausible/consolidated_view_test.exs @@ -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) diff --git a/test/plausible_web/live/sites_test.exs b/test/plausible_web/live/sites_test.exs index afb14d696c57..7c3c3c3b390a 100644 --- a/test/plausible_web/live/sites_test.exs +++ b/test/plausible_web/live/sites_test.exs @@ -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 diff --git a/test/test_helper.exs b/test/test_helper.exs index 60dcf4286664..e11ea3df954d 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -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