https://github.com/bonfire-networks/bonfire-app/issues/900

bonfire-networks · Jan 8, 2025 · 1abd4f0 · 1abd4f0
1 parent 36a6bc5
commit 1abd4f0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/lib/web/components/set/set_boundaries_live.ex b/lib/web/components/set/set_boundaries_live.ex
@@ -30,7 +30,11 @@ defmodule Bonfire.UI.Boundaries.Web.SetBoundariesLive do
   def render(%{read_only: false, my_circles: nil} = assigns) do
     # TODO: only load this once per persistent session, or when we open the composer
     assigns
-    |> assign(:my_circles, list_my_circles(current_user(assigns[:__context__])))
+    |> assign(
+      :my_circles,
+      e(assigns[:__context__], :my_circles, nil) ||
+        list_my_circles(current_user(assigns[:__context__]))
+    )
     |> assign_new(:roles_for_dropdown, fn ->
       Bonfire.Boundaries.Roles.roles_for_dropdown(nil, scope: nil, context: assigns[:__context__])
     end)
@@ -76,13 +80,15 @@ defmodule Bonfire.UI.Boundaries.Web.SetBoundariesLive do
 
   def circles_for_multiselect(current_user, circle_field \\ :to_circles)
 
-  def circles_for_multiselect(current_user, circle_field) when not is_nil(current_user) do
-    list_my_circles(current_user)
-    |> results_for_multiselect(circle_field)
-  end
+  def circles_for_multiselect(context, circle_field) do
+    case current_user(context) do
+      nil ->
+        []
 
-  def circles_for_multiselect(_current_user, _circle_field) do
-    []
+      current_user ->
+        (e(context, :my_circles, nil) || list_my_circles(current_user))
+        |> results_for_multiselect(circle_field)
+    end
   end
 
   def results_for_multiselect(results, circle_field \\ :to_circles) do

diff --git a/lib/web/components/set/set_circles_permissions/set_circles_permissions_live.ex b/lib/web/components/set/set_circles_permissions/set_circles_permissions_live.ex
@@ -30,7 +30,11 @@ defmodule Bonfire.UI.Boundaries.Web.SetCirclesPermissionsLive do
   def render(%{read_only: false, my_circles: nil} = assigns) do
     # TODO: only load this once per persistent session, or when we open the composer
     assigns
-    |> assign(:my_circles, list_my_circles(current_user(assigns[:__context__])))
+    |> assign(
+      :my_circles,
+      e(assigns[:__context__], :my_circles, nil) ||
+        list_my_circles(current_user(assigns[:__context__]))
+    )
     |> assign_new(:roles_for_dropdown, fn ->
       Bonfire.Boundaries.Roles.roles_for_dropdown(nil, scope: nil, context: assigns[:__context__])
     end)