Skip to content

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

Fix several flaky LV tests logging connection errors (#6091)

Adam Rutkowskib48bb69e6663
diff --git a/extra/lib/plausible_web/live/funnel_settings.ex b/extra/lib/plausible_web/live/funnel_settings.ex
index 3497c49999..4b79dd945a 100644
--- a/extra/lib/plausible_web/live/funnel_settings.ex
+++ b/extra/lib/plausible_web/live/funnel_settings.ex
@@ -6,7 +6,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do
use Plausible.Funnel
- alias Plausible.{Goals, Funnels}
+ alias Plausible.{Goals, Funnels, Teams}
def mount(
_params,
@@ -34,7 +34,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do
{:ok,
assign(socket,
- site_team: socket.assigns.site.team,
+ site_team: Teams.with_subscription(socket.assigns.site.team),
domain: domain,
displayed_funnels: socket.assigns.all_funnels,
setup_funnel?: false,
diff --git a/lib/plausible_web/components/site/toggle_live.ex b/lib/plausible_web/components/site/toggle_live.ex
index 2ede2f90c0..c374fd84bc 100644
--- a/lib/plausible_web/components/site/toggle_live.ex
+++ b/lib/plausible_web/components/site/toggle_live.ex
@@ -7,8 +7,10 @@ defmodule PlausibleWeb.Components.Site.Feature.ToggleLive do
def update(assigns, socket) do
site = Plausible.Repo.preload(assigns.site, :team)
+ team = Plausible.Teams.with_subscription(site.team)
+ site = %{site | team: team}
current_setting = assigns.feature_mod.enabled?(site)
- disabled? = assigns.feature_mod.check_availability(site.team) !== :ok
+ disabled? = assigns.feature_mod.check_availability(team) !== :ok
{:ok,
socket
diff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.ex
index fc168888b8..3ac88bd2ab 100644
--- a/lib/plausible_web/live/goal_settings.ex
+++ b/lib/plausible_web/live/goal_settings.ex
@@ -4,7 +4,7 @@ defmodule PlausibleWeb.Live.GoalSettings do
"""
use PlausibleWeb, :live_view
- alias Plausible.Goals
+ alias Plausible.{Goals, Teams}
alias PlausibleWeb.Live.Components.Modal
def mount(
@@ -15,11 +15,14 @@ defmodule PlausibleWeb.Live.GoalSettings do
socket =
socket
|> assign_new(:site, fn %{current_user: current_user} ->
- current_user
- |> Plausible.Sites.get_for_user!(domain,
- roles: [:owner, :admin, :editor, :super_admin],
- include_consolidated?: true
- )
+ site =
+ current_user
+ |> Plausible.Sites.get_for_user!(domain,
+ roles: [:owner, :admin, :editor, :super_admin],
+ include_consolidated?: true
+ )
+
+ %{site | team: Teams.with_subscription(site.team)}
end)
|> assign_new(:all_goals, fn %{site: site} ->
Goals.for_site(site, preload_funnels?: true)
@@ -36,15 +39,20 @@ defmodule PlausibleWeb.Live.GoalSettings do
)
end)
+ team = socket.assigns.site.team
+
{:ok,
assign(socket,
- site_team: socket.assigns.site.team,
+ site_team: team,
site_id: site_id,
domain: domain,
displayed_goals: socket.assigns.all_goals,
filter_text: "",
form_goal: nil,
- goal_type: nil
+ goal_type: nil,
+ revenue_goals_enabled?:
+ Plausible.Billing.Feature.RevenueGoals.check_availability(team) == :ok,
+ props_available?: Plausible.Billing.Feature.Props.check_availability(team) == :ok
)}
end
@@ -111,6 +119,8 @@ defmodule PlausibleWeb.Live.GoalSettings do
domain={@domain}
filter_text={@filter_text}
site={@site}
+ revenue_goals_enabled?={@revenue_goals_enabled?}
+ props_available?={@props_available?}
/>
</.tile>
</div>
diff --git a/lib/plausible_web/live/goal_settings/list.ex b/lib/plausible_web/live/goal_settings/list.ex
index 8fb660b893..d8084e81b0 100644
--- a/lib/plausible_web/live/goal_settings/list.ex
+++ b/lib/plausible_web/live/goal_settings/list.ex
@@ -13,18 +13,11 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
attr(:domain, :string, required: true)
attr(:filter_text, :string)
attr(:site, Plausible.Site, required: true)
+ attr(:revenue_goals_enabled?, :boolean, required: true)
+ attr(:props_available?, :boolean, required: true)
def render(assigns) do
- revenue_goals_enabled? = Plausible.Billing.Feature.RevenueGoals.enabled?(assigns.site)
-
- props_available? =
- Plausible.Billing.Feature.Props.check_availability(assigns.site.team) == :ok
-
- assigns =
- assigns
- |> assign(:revenue_goals_enabled?, revenue_goals_enabled?)
- |> assign(:props_available?, props_available?)
- |> assign(:searching?, String.trim(assigns.filter_text) != "")
+ assigns = assign(assigns, :searching?, String.trim(assigns.filter_text) != "")
~H"""
<div class="flex flex-col gap-4">