diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex index 997cb1a..5aa4d93 100644 --- a/lib/mv_web/live/member_live/show.ex +++ b/lib/mv_web/live/member_live/show.ex @@ -148,9 +148,9 @@ defmodule MvWeb.MemberLive.Show do <%!-- Custom Fields Section --%> - <%= if Enum.any?(@custom_fields) do %> + <%= if is_list(@custom_fields) && Enum.any?(@custom_fields) do %>
- <.section_box title={gettext("Custom Fields")}> + <.section_box title={gettext("Additional Data Fields")}>
<%= for custom_field <- @custom_fields do %> <% cfv = find_custom_field_value(@member.custom_field_values, custom_field.id) %> @@ -233,13 +233,15 @@ 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) + # Load custom fields for display + # Note: Each page load starts a new LiveView process, so caching with + # assign_new is not necessary here (mount creates a fresh socket each time) + custom_fields = + Mv.Membership.CustomField + |> Ash.Query.sort(name: :asc) + |> Ash.read!() + + socket = assign(socket, :custom_fields, custom_fields) query = Mv.Membership.Member diff --git a/test/mv_web/member_live/index_display_name_test.exs b/test/mv_web/member_live/index_display_name_test.exs deleted file mode 100644 index 7a11235..0000000 --- a/test/mv_web/member_live/index_display_name_test.exs +++ /dev/null @@ -1,141 +0,0 @@ -defmodule MvWeb.Helpers.MemberHelpersTest do - @moduledoc """ - Tests for the display_name/1 helper function in MemberHelpers. - """ - use Mv.DataCase, async: true - - alias Mv.Membership.Member - alias MvWeb.Helpers.MemberHelpers - - describe "display_name/1" do - test "returns full name when both first_name and last_name are present" do - member = %Member{ - first_name: "John", - last_name: "Doe", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "John Doe" - end - - test "returns email when both first_name and last_name are nil" do - member = %Member{ - first_name: nil, - last_name: nil, - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "returns first_name only when last_name is nil" do - member = %Member{ - first_name: "John", - last_name: nil, - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "John" - end - - test "returns last_name only when first_name is nil" do - member = %Member{ - first_name: nil, - last_name: "Doe", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "Doe" - end - - test "returns email when first_name and last_name are empty strings" do - member = %Member{ - first_name: "", - last_name: "", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "returns email when first_name and last_name are whitespace only" do - member = %Member{ - first_name: " ", - last_name: " \t ", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "trims whitespace from name parts" do - member = %Member{ - first_name: " John ", - last_name: " Doe ", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "John Doe" - end - - test "handles one empty string and one nil" do - member = %Member{ - first_name: "", - last_name: nil, - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "handles one nil and one empty string" do - member = %Member{ - first_name: nil, - last_name: "", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "handles one whitespace and one nil" do - member = %Member{ - first_name: " ", - last_name: nil, - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "john@example.com" - end - - test "handles one valid name and one whitespace" do - member = %Member{ - first_name: "John", - last_name: " ", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "John" - end - - test "handles member with only first_name containing whitespace" do - member = %Member{ - first_name: " John ", - last_name: nil, - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "John" - end - - test "handles member with only last_name containing whitespace" do - member = %Member{ - first_name: nil, - last_name: " Doe ", - email: "john@example.com" - } - - assert MemberHelpers.display_name(member) == "Doe" - end - end -end diff --git a/test/mv_web/member_live/show_test.exs b/test/mv_web/member_live/show_test.exs index 1e04559..33505ec 100644 --- a/test/mv_web/member_live/show_test.exs +++ b/test/mv_web/member_live/show_test.exs @@ -7,13 +7,13 @@ defmodule MvWeb.MemberLive.ShowTest do - Custom Fields section visibility (Issue #282 regression test) - Custom field values formatting - ## Note on async: false - Tests use `async: false` (not `async: true`) to prevent PostgreSQL deadlocks - when creating members and custom fields concurrently. This is intentional and - documented here to avoid confusion in commit messages. + ## Note on async + Tests can run with `async: true` because: + - Each test explicitly manages its own custom fields (creates/deletes as needed) + - The SQL Sandbox provides proper isolation between parallel tests + - Custom field cleanup in tests ensures no interference between tests """ - # async: false to prevent PostgreSQL deadlocks when creating members and custom fields - use MvWeb.ConnCase, async: false + use MvWeb.ConnCase, async: true import Phoenix.LiveViewTest require Ash.Query use Gettext, backend: MvWeb.Gettext @@ -113,11 +113,21 @@ defmodule MvWeb.MemberLive.ShowTest do conn: conn, member: member } do + # Ensure no custom fields exist for this test + # This ensures test isolation even if previous tests created custom fields + existing_custom_fields = Ash.read!(CustomField) + for cf <- existing_custom_fields do + Ash.destroy!(cf) + end + + # Verify no custom fields exist + assert Ash.read!(CustomField) == [] + conn = conn_with_oidc_user(conn) {:ok, _view, html} = live(conn, ~p"/members/#{member}") # Custom Fields section should NOT be visible - refute html =~ gettext("Custom Fields") + refute html =~ gettext("Additional Data Fields") end end