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
Remove :consolidated_view feature flag (#5908)
Adam Rutkowski5fe2be8dc8b5
diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.exindex 3ebe12df4f..60d6c066fb 100644--- a/extra/lib/plausible/consolidated_view.ex+++ b/extra/lib/plausible/consolidated_view.ex@@ -16,11 +16,6 @@ defmodule Plausible.ConsolidatedView doimport 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) dois_struct(team, Team) and- flag_enabled?(team) andview_enabled?(team) andhas_sites_to_consolidate?(team) andPlausible.Billing.Feature.ConsolidatedView.check_availability(team) == :ok@@ -102,9 +96,6 @@ defmodule Plausible.ConsolidatedView donot Teams.setup?(team) ->{:error, :team_not_setup}- not flag_enabled?(team) ->- {:error, :unavailable}-true ->do_enable(team)enddiff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex dce32bb65c..7aae38a0e8 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -1118,30 +1118,22 @@ defmodule PlausibleWeb.Live.Sites doenddefp 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)+ )endenddiff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exsindex 7316a6c7a2..1522defcfc 100644--- a/priv/repo/seeds.exs+++ b/priv/repo/seeds.exs@@ -13,8 +13,6 @@ use Plausibleimport 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.exsindex 977f432769..b0057349d4 100644--- a/test/plausible/consolidated_view_test.exs+++ b/test/plausible/consolidated_view_test.exs@@ -31,11 +31,6 @@ defmodule Plausible.ConsolidatedViewTest dorefute 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} doConsolidatedView.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.exsindex e03a236cec..ca08308c27 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 doassert 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: userdiff --git a/test/test_helper.exs b/test/test_helper.exsindex 60dcf42866..e11ea3df95 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