tmp: see if postgrex errors go away

Author: aerosol

extra/lib/plausible_web/live/funnel_settings/form.ex

@@ -226,7 +226,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
     step_ids = List.delete(socket.assigns.step_ids, idx)
     selections_made = drop_selection(socket.assigns.selections_made, idx)
 
-    send(self(), :evaluate_funnel)
+    if connected?(socket), do: send(self(), :evaluate_funnel)
 
     {:noreply,
      assign(socket, step_ids: step_ids, selections_made: selections_made, funnel_modified?: true)}
@@ -286,14 +286,14 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do
   end
 
   def handle_event("cancel-add-funnel", _value, socket) do
-    send(socket.parent_pid, :cancel_setup_funnel)
+    if connected?(socket), do: send(socket.parent_pid, :cancel_setup_funnel)
     {:noreply, socket}
   end
 
   def handle_info({:selection_made, %{submit_value: goal_id, by: combo_box}}, socket) do
     selections_made = store_selection(socket.assigns, combo_box, goal_id)
 
-    send(self(), :evaluate_funnel)
+    if connected?(socket), do: send(self(), :evaluate_funnel)
 
     {:noreply,
      assign(socket,

lib/plausible/sites.ex

@@ -467,7 +467,7 @@ defmodule Plausible.Sites do
         |> Repo.one!()
       end
 
-    Repo.preload(site, :team)
+    Repo.preload(site, team: [subscription: Plausible.Teams.last_subscription_query()])
   end
 
   def get_for_user(user, domain, opts \\ []) do
@@ -482,6 +482,7 @@ defmodule Plausible.Sites do
       |> get_for_user_query(domain, List.delete(roles, :super_admin), opts)
       |> Repo.one()
     end
+    |> Repo.preload(team: [subscription: Plausible.Teams.last_subscription_query()])
   end
 
   defp get_for_user_query(user_id, domain, roles, opts) do