Merge branch 'main' into feature/280_membership_fee_ui

lib/mv_web/live/member_live/show.ex

@@ -153,15 +153,14 @@ defmodule MvWeb.MemberLive.Show do
           </div>
 
           <%!-- Custom Fields Section --%>
-          <%= if Enum.any?(@member.custom_field_values) do %>
+          <%= if Enum.any?(@custom_fields) do %>
             <div>
               <.section_box title={gettext("Custom Fields")}>
                 <div class="grid grid-cols-2 gap-4">
-                  <%= for cfv <- sort_custom_field_values(@member.custom_field_values) do %>
-                    <% custom_field = cfv.custom_field %>
-                    <% value_type = custom_field && custom_field.value_type %>
-                    <.data_field label={custom_field && custom_field.name}>
-                      {format_custom_field_value(cfv.value, value_type)}
+                  <%= for custom_field <- @custom_fields do %>
+                    <% cfv = find_custom_field_value(@member.custom_field_values, custom_field.id) %>
+                    <.data_field label={custom_field.name}>
+                      {format_custom_field_value(cfv, custom_field.value_type)}
                     </.data_field>
                   <% end %>
                 </div>
@@ -239,6 +238,14 @@ defmodule MvWeb.MemberLive.Show do
 
   @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)
@@ -318,12 +325,35 @@ defmodule MvWeb.MemberLive.Show do
     """
   end
 
+  # Renders a mailto link if email is present, otherwise renders empty value placeholder
+  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
+      render_empty_value()
+    end
+  end
+
   # -----------------------------------------------------------------
   # Helper Functions
   # -----------------------------------------------------------------
 
-  defp display_value(nil), do: ""
-  defp display_value(""), do: ""
+  defp display_value(nil), do: render_empty_value()
+  defp display_value(""), do: render_empty_value()
   defp display_value(value), do: value
 
   defp format_status_label(:paid), do: gettext("Paid")
@@ -373,20 +403,34 @@ defmodule MvWeb.MemberLive.Show do
 
   defp format_date(date), do: to_string(date)
 
-  # Sorts custom field values by custom field name
-  defp sort_custom_field_values(custom_field_values) do
-    Enum.sort_by(custom_field_values, fn cfv ->
-      (cfv.custom_field && cfv.custom_field.name) || ""
+  # Finds custom field value for a given custom field id
+  # Returns the value (not the CustomFieldValue struct) or nil
+  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_value(custom_field_values, fn cfv ->
+      if cfv.custom_field_id == custom_field_id or
+           (cfv.custom_field && cfv.custom_field.id == custom_field_id) do
+        cfv.value
+      end
     end)
   end
 
+  defp find_custom_field_value(_custom_field_values, _custom_field_id), do: nil
+
   # Formats custom field value based on type
+  # 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
@@ -396,11 +440,15 @@ defmodule MvWeb.MemberLive.Show do
   end
 
   defp format_custom_field_value(value, :email) when is_binary(value) do
-    assigns = %{email: value}
+    if String.trim(value) == "" do
+      render_empty_value()
+    else
+      assigns = %{email: value}
 
-    ~H"""
-    <a href={"mailto:#{@email}"} class="text-blue-700 hover:text-blue-800 underline">{@email}</a>
-    """
+      ~H"""
+      <.mailto_link email={@email} display={@email} />
+      """
+    end
   end
 
   defp format_custom_field_value(value, :integer) when is_integer(value) do
@@ -408,8 +456,22 @@ 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 accessible placeholder for empty values
+  # Uses translated text for screen readers while maintaining visual consistency
+  # The visual "—" is hidden from screen readers, while the translated text is only visible to screen readers
+  defp render_empty_value do
+    assigns = %{text: gettext("Not set")}
+
+    ~H"""
+    <span class="text-base-content/50 italic">
+      <span aria-hidden="true">—</span>
+      <span class="sr-only">{@text}</span>
+    </span>
+    """
+  end
 end