diff --git a/docs/csv-member-import-v1.md b/docs/csv-member-import-v1.md index 2bdbe69..bc8f99f 100644 --- a/docs/csv-member-import-v1.md +++ b/docs/csv-member-import-v1.md @@ -191,6 +191,26 @@ A **basic CSV member import feature** that allows administrators to upload a CSV - `/templates/member_import_de.csv` - In LiveView, link them using Phoenix static path helpers (e.g. `~p` or `Routes.static_path/2`, depending on Phoenix version). +**Example Usage in LiveView Templates:** + +```heex + +<.link href={~p"/templates/member_import_en.csv"} download> + <%= gettext("Download English Template") %> + + +<.link href={~p"/templates/member_import_de.csv"} download> + <%= gettext("Download German Template") %> + + + +<.link href={Routes.static_path(MvWeb.Endpoint, "/templates/member_import_en.csv")} download> + <%= gettext("Download English Template") %> + +``` + +**Note:** The `templates` directory must be included in `MvWeb.static_paths()` (configured in `lib/mv_web.ex`) for the files to be served. + ### File Limits - **Max file size:** 10 MB diff --git a/lib/mv_web.ex b/lib/mv_web.ex index 8589be1..08a3c23 100644 --- a/lib/mv_web.ex +++ b/lib/mv_web.ex @@ -17,7 +17,7 @@ defmodule MvWeb do those modules here. """ - def static_paths, do: ~w(assets fonts images favicon.ico robots.txt) + def static_paths, do: ~w(assets fonts images favicon.ico robots.txt templates) def router do quote do 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/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index abf6f8d..182a428 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -633,7 +633,6 @@ msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld" #: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" @@ -2059,6 +2058,11 @@ msgstr "" msgid "read_only - Read access to all data" msgstr "" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Additional Data Fields" +msgstr "Zusätzliche Datenfelder" + #~ #: lib/mv_web/live/custom_field_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Auto-generated identifier (immutable)" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index f7f0f0e..1be771a 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -634,7 +634,6 @@ msgstr "" #: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "" @@ -2059,3 +2058,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "read_only - Read access to all data" msgstr "" + +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Additional Data Fields" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 034392e..8b01f61 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -634,7 +634,6 @@ msgstr "" #: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format, fuzzy msgid "Custom Fields" msgstr "" @@ -2060,6 +2059,11 @@ msgstr "" msgid "read_only - Read access to all data" msgstr "" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Additional Data Fields" +msgstr "" + #~ #: lib/mv_web/live/components/payment_filter_component.ex #~ #, elixir-autogen, elixir-format #~ msgid "All payment statuses" diff --git a/priv/static/templates/member_import_de.csv b/priv/static/templates/member_import_de.csv new file mode 100644 index 0000000..3bcbeb5 --- /dev/null +++ b/priv/static/templates/member_import_de.csv @@ -0,0 +1,2 @@ +Vorname;Nachname;E-Mail;Straße;PLZ;Stadt +Max;Mustermann;max.mustermann@example.com;Hauptstraße;10115;Berlin diff --git a/priv/static/templates/member_import_en.csv b/priv/static/templates/member_import_en.csv new file mode 100644 index 0000000..d4e67f3 --- /dev/null +++ b/priv/static/templates/member_import_en.csv @@ -0,0 +1,2 @@ +first_name;last_name;email;street;postal_code;city +John;Doe;john.doe@example.com;Main Street;12345;Berlin 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..fdcfebb 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,22 @@ 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