local-it/mitgliederverwaltung
2
3
Fork 0
Code Issues 68 Pull requests 8 Projects 1 Releases Packages 1 Activity Actions

fix: improve performance loading custom fields

Browse source
This commit is contained in:
carla 2025-12-23 17:07:38 +01:00
parent 5718a37aca
commit 8e58829e95
1 changed files with 72 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

119
lib/mv_web/live/member_live/show.ex
View file

@ -73,12 +73,7 @@ defmodule MvWeb.MemberLive.Show do
<%!-- Email --%>
<div>
<.data_field label={gettext("Email")}>
<a
href={"mailto:#{MvWeb.MemberLive.Index.format_member_email(@member)}"}
class="text-blue-700 hover:text-blue-800 underline"
>
{@member.email}
</a>
<.mailto_link email={@member.email} display={@member.email} />
</.data_field>
</div>
@ -131,26 +126,14 @@ defmodule MvWeb.MemberLive.Show do
</div>
<%!-- Custom Fields Section --%>
<%= if Enum.any?(@custom_fields_with_values) do %>
<%= if Enum.any?(@custom_fields) do %>
<div>
<.section_box title={gettext("Custom Fields")}>
<div class="grid grid-cols-2 gap-4">
<%= for {custom_field, cfv} <- @custom_fields_with_values do %>
<%= for custom_field <- @custom_fields do %>
<% cfv = find_custom_field_value(@member.custom_field_values, custom_field.id) %>
<.data_field label={custom_field.name}>
<%= if cfv && cfv.value do %>
<%= if custom_field.value_type == :email && cfv.value.value && String.trim(cfv.value.value) != "" do %>
<a
href={"mailto:#{cfv.value.value}"}
class="text-blue-700 hover:text-blue-800 underline"
>
{cfv.value.value}
</a>
<% else %>
{format_custom_field_value(cfv.value, custom_field.value_type)}
<% end %>
<% else %>
{format_custom_field_value(nil, custom_field.value_type)}
<% end %>
{format_custom_field_value(cfv, custom_field.value_type)}
</.data_field>
<% end %>
</div>
@ -186,11 +169,18 @@ defmodule MvWeb.MemberLive.Show do
@impl true
def mount(_params, _session, socket) do
{:ok, assign(socket, :custom_fields_with_values, [])}
{:ok, socket}
end
@impl true
def handle_params(%{"id" => id}, _, socket) do
# Load custom fields once using assign_new to avoid repeated queries
socket = assign_new(socket, :custom_fields, fn ->
Mv.Membership.CustomField
|> Ash.Query.sort(name: :asc)
|> Ash.read!()
end)
query =
Mv.Membership.Member
|> filter(id == ^id)
@ -198,28 +188,10 @@ defmodule MvWeb.MemberLive.Show do
member = Ash.read_one!(query)
# Load all custom fields to display all of them, even if they have no values
{:ok, custom_fields} = Mv.Membership.list_custom_fields()
# Create a map of custom_field_id -> custom_field_value for quick lookup
custom_field_values_map =
member.custom_field_values
|> Enum.map(fn cfv -> {cfv.custom_field_id, cfv} end)
|> Map.new()
# Match all custom fields with their values (if they exist)
custom_fields_with_values =
Enum.map(custom_fields, fn cf ->
cfv = Map.get(custom_field_values_map, cf.id)
{cf, cfv}
end)
|> Enum.sort_by(fn {cf, _cfv} -> cf.name end)
{:noreply,
socket
|> assign(:page_title, page_title(socket.assigns.live_action))
|> assign(:member, member)
|> assign(:custom_fields_with_values, custom_fields_with_values)}
|> assign(:member, member)}
end
defp page_title(:show), do: gettext("Show Member")
@ -265,6 +237,30 @@ defmodule MvWeb.MemberLive.Show do
"""
end
# Renders a mailto link if email is present, otherwise renders nothing
attr :email, :string, required: true
attr :display, :string, default: nil
defp mailto_link(assigns) do
display_text = assigns.display || assigns.email
if assigns.email && String.trim(assigns.email) != "" do
assigns = %{email: assigns.email, display: display_text}
~H"""
<a
href={"mailto:#{@email}"}
class="text-blue-700 hover:text-blue-800 underline"
>
{@display}
</a>
"""
else
~H"""
<span class="text-base-content/50 italic">—</span>
"""
end
end
# -----------------------------------------------------------------
# Helper Functions
# -----------------------------------------------------------------
@ -301,14 +297,28 @@ defmodule MvWeb.MemberLive.Show do
defp format_date(date), do: to_string(date)
# Finds custom field value for a given custom field id
defp find_custom_field_value(nil, _custom_field_id), do: nil
defp find_custom_field_value(custom_field_values, custom_field_id) when is_list(custom_field_values) do
Enum.find(custom_field_values, fn cfv ->
cfv.custom_field_id == custom_field_id or
(cfv.custom_field && cfv.custom_field.id == custom_field_id)
end)
end
defp find_custom_field_value(_custom_field_values, _custom_field_id), do: nil
# Formats custom field value based on type
# Returns empty string for nil/empty values (consistent with member fields behavior)
# Handles both CustomFieldValue structs and direct values
defp format_custom_field_value(nil, _type), do: render_empty_value()
defp format_custom_field_value(%Mv.Membership.CustomFieldValue{} = cfv, value_type) do
format_custom_field_value(cfv.value, value_type)
end
defp format_custom_field_value(%Ash.Union{value: value, type: type}, _expected_type) do
format_custom_field_value(value, type)
end
defp format_custom_field_value(nil, _type), do: ""
defp format_custom_field_value(value, :boolean) when is_boolean(value) do
if value, do: gettext("Yes"), else: gettext("No")
end
@ -318,7 +328,14 @@ defmodule MvWeb.MemberLive.Show do
end
defp format_custom_field_value(value, :email) when is_binary(value) do
if String.trim(value) == "", do: "", else: value
if String.trim(value) == "" do
render_empty_value()
else
assigns = %{email: value}
~H"""
<.mailto_link email={@email} display={@email} />
"""
end
end
defp format_custom_field_value(value, :integer) when is_integer(value) do
@ -326,8 +343,16 @@ defmodule MvWeb.MemberLive.Show do
end
defp format_custom_field_value(value, _type) when is_binary(value) do
if String.trim(value) == "", do: "", else: value
if String.trim(value) == "", do: render_empty_value(), else: value
end
defp format_custom_field_value(value, _type), do: to_string(value)
# Renders placeholder for empty custom field values
defp render_empty_value do
assigns = %{}
~H"""
<span class="text-base-content/50 italic">—</span>
"""
end
end