From 667585bc850c846fc6929a38785db8a1ea066f0f Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Thu, 26 Oct 2023 14:52:50 +0200 Subject: [PATCH] Fix search consuming itself --- lib/plausible_web/live/sites.ex | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 663e2cfa7..facdac79a 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -26,6 +26,12 @@ defmodule PlausibleWeb.Live.Sites do |> assign_new(:params, fn -> params end) |> assign_new(:user, fn -> Repo.get!(Auth.User, user_id) end) |> load_sites() + |> assign_new(:has_sites?, fn %{sites: sites} -> + Enum.count(sites.entries) > 0 + end) + |> assign_new(:invitation_count, fn %{invitations_pre: invitations} -> + Enum.count(invitations) + end) |> assign_new(:needs_to_upgrade, fn %{user: user, sites: sites} -> user_owns_sites = Enum.any?(sites.entries, fn site -> List.first(site.memberships).role == :owner end) || @@ -38,12 +44,6 @@ defmodule PlausibleWeb.Live.Sites do end def render(assigns) do - assigns = - assign(assigns, - invitation_count: Enum.count(assigns.invitations), - has_sites?: not Enum.empty?(assigns.sites.entries ++ assigns.invitations) - ) - ~H"""
Enum.into(%{}) |> Jason.encode!}}"} @@ -361,6 +361,7 @@ defmodule PlausibleWeb.Live.Sites do