From a6f6f402af6fb4780026e69a484f08861a9dd4e6 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 5 May 2026 17:01:10 +0200 Subject: [PATCH 01/22] test: add tests for custom field labels --- test/mv_web/live/join_live_test.exs | 28 ++++++++ .../live/join_request_live/show_test.exs | 71 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 test/mv_web/live/join_request_live/show_test.exs diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 4772e48..383b413 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -135,6 +135,34 @@ defmodule MvWeb.JoinLiveTest do end end + describe "join field labels" do + @tag role: :unauthenticated + test "renders custom field name as label for custom field IDs", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + system_actor = Mv.Helpers.SystemActor.get_system_actor() + + {:ok, custom_field} = + Membership.create_custom_field( + %{ + name: "Preferred Pronouns", + value_type: :string + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", custom_field.id], + join_form_field_required: %{"email" => true, custom_field.id => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "label[for='join-field-#{custom_field.id}'] .label-text", custom_field.name) + end + end + defp enable_join_form(enabled) do {:ok, settings} = Membership.get_settings() {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled}) diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs new file mode 100644 index 0000000..35e87dc --- /dev/null +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -0,0 +1,71 @@ +defmodule MvWeb.JoinRequestLive.ShowTest do + @moduledoc """ + Tests for join request detail view label rendering. + + Focus: applicant data labels for custom fields should use custom field names, + not raw UUIDs. + """ + use MvWeb.ConnCase, async: false + + import Phoenix.LiveViewTest + + alias Mv.Fixtures + alias Mv.Membership + + setup do + {:ok, settings} = Membership.get_settings() + + saved = %{ + join_form_enabled: settings.join_form_enabled, + join_form_field_ids: settings.join_form_field_ids, + join_form_field_required: settings.join_form_field_required + } + + on_exit(fn -> + {:ok, current_settings} = Membership.get_settings() + + Membership.update_settings(current_settings, %{ + join_form_enabled: saved.join_form_enabled, + join_form_field_ids: saved.join_form_field_ids || [], + join_form_field_required: saved.join_form_field_required || %{} + }) + end) + + :ok + end + + describe "custom field labels in applicant data" do + @tag role: :normal_user + test "renders custom field name instead of custom field UUID", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, custom_field} = + Membership.create_custom_field( + %{ + name: "Emergency contact", + value_type: :string + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", custom_field.id], + join_form_field_required: %{"email" => true, custom_field.id => false} + }) + + join_request = + Fixtures.submitted_join_request_fixture(%{ + form_data: %{custom_field.id => "Alice Example"} + }) + + {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") + + assert has_element?(view, "span", "#{custom_field.name}:") + assert has_element?(view, "span", "Alice Example") + refute has_element?(view, "span", "#{custom_field.id}:") + end + end +end From 0a7bbc7fa6d135c8fb1b6230098aa16524d1113c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:05:28 +0200 Subject: [PATCH 02/22] fix: labels for custom fields in join requests --- lib/mv_web/components/layouts.ex | 2 +- lib/mv_web/live/join_live.ex | 31 +++++++++++- lib/mv_web/live/join_request_live/show.ex | 61 +++++++++++++++++++---- test/mv_web/live/join_live_test.exs | 6 ++- 4 files changed, 88 insertions(+), 12 deletions(-) diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 54f589d..9aff23c 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -138,7 +138,7 @@ defmodule MvWeb.Layouts do # Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query. %{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings() - # TODO: unprocessed count runs on every page load when join form enabled; consider + # NOTE: Unprocessed count runs on every page load when join form is enabled; consider # loading only on navigation or caching briefly if performance becomes an issue. unprocessed_join_requests_count = get_unprocessed_join_requests_count(assigns.current_user, join_form_enabled) diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index 3b8db05..d3d66f0 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -216,19 +216,48 @@ defmodule MvWeb.JoinLive do defp build_join_fields_with_labels(allowlist) do member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) + custom_field_name_by_id = custom_field_name_map(allowlist, member_field_strings) Enum.map(allowlist, fn %{id: id, required: required} -> label = if id in member_field_strings do MemberFields.label(String.to_existing_atom(id)) else - gettext("Field") + Map.get(custom_field_name_by_id, id, gettext("Field")) end %{id: id, label: label, required: required} end) end + defp custom_field_name_map(allowlist, member_field_strings) do + custom_field_ids = + allowlist + |> Enum.map(& &1.id) + |> Enum.reject(&(&1 in member_field_strings)) + + case custom_field_ids do + [] -> + %{} + + ids -> + Mv.Membership.CustomField + |> Ash.Query.select([:id, :name]) + |> Ash.read(domain: Mv.Membership, authorize?: false) + |> case do + {:ok, fields} -> + allowed_ids = MapSet.new(ids) + + fields + |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) + |> Map.new(&{&1.id, &1.name}) + + {:error, _} -> + %{} + end + end + end + defp initial_form_params(join_fields) do join_fields |> Enum.map(fn f -> {f.id, ""} end) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 304cb6a..2aab87d 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -31,6 +31,7 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, socket |> assign(:join_request, nil) + |> assign(:custom_field_name_by_id, %{}) |> assign(:join_form_field_ids, []) |> Layouts.assign_page_title(gettext("Join request"))} else @@ -53,9 +54,13 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, request} -> field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id) + custom_field_name_by_id = + custom_field_name_map(field_ids ++ Map.keys(request.form_data || %{}), actor) + {:noreply, socket |> assign(:join_request, request) + |> assign(:custom_field_name_by_id, custom_field_name_by_id) |> assign(:join_form_field_ids, field_ids) |> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))} @@ -132,7 +137,12 @@ defmodule MvWeb.JoinRequestLive.Show do

{gettext("Applicant data")}

- <%= for {label, value} <- applicant_data_rows(@join_request, @join_form_field_ids || []) do %> + <%= for {label, value} <- + applicant_data_rows( + @join_request, + @join_form_field_ids || [], + @custom_field_name_by_id || %{} + ) do %> <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> <% end %>
@@ -230,7 +240,7 @@ defmodule MvWeb.JoinRequestLive.Show do # Builds a single list of {label, display_value} for all applicant-provided data in join form # order. Typed fields (email, first_name, last_name) and form_data are merged; legacy # form_data keys (not in current join form config) are appended at the end. - defp applicant_data_rows(join_request, ordered_field_ids) do + defp applicant_data_rows(join_request, ordered_field_ids, custom_field_name_by_id) do member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) form_data = join_request.form_data || %{} @@ -244,7 +254,7 @@ defmodule MvWeb.JoinRequestLive.Show do ordered_field_ids |> Enum.map(fn key -> value = Map.get(typed, key) || Map.get(form_data, key) - label = field_key_to_label(key, member_field_strings) + label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) {label, format_applicant_value(value)} end) @@ -258,7 +268,7 @@ defmodule MvWeb.JoinRequestLive.Show do legacy_entries = Enum.map(legacy_keys, fn key -> - label = field_key_to_label(key, member_field_strings) + label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) {label, format_applicant_value(form_data[key])} end) @@ -299,11 +309,44 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw) defp format_applicant_value_simple(_raw, value), do: to_string(value) - defp field_key_to_label(key, member_field_strings) when is_binary(key) do - if key in member_field_strings, - do: MemberFieldsTranslations.label(String.to_existing_atom(key)), - else: key + defp field_key_to_label(key, member_field_strings, custom_field_name_by_id) + when is_binary(key) do + if key in member_field_strings do + MemberFieldsTranslations.label(String.to_existing_atom(key)) + else + Map.get(custom_field_name_by_id, key, key) + end end - defp field_key_to_label(key, _), do: to_string(key) + defp field_key_to_label(key, _, _), do: to_string(key) + + defp custom_field_name_map(field_keys, actor) do + member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + custom_field_ids = + field_keys + |> Enum.uniq() + |> Enum.reject(&(&1 in member_field_strings)) + + case custom_field_ids do + [] -> + %{} + + ids -> + Mv.Membership.CustomField + |> Ash.Query.select([:id, :name]) + |> Ash.read(actor: actor, domain: Mv.Membership) + |> case do + {:ok, fields} -> + allowed_ids = MapSet.new(ids) + + fields + |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) + |> Map.new(&{&1.id, &1.name}) + + {:error, _} -> + %{} + end + end + end end diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 383b413..273e786 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -159,7 +159,11 @@ defmodule MvWeb.JoinLiveTest do {:ok, view, _html} = live(conn, "/join") - assert has_element?(view, "label[for='join-field-#{custom_field.id}'] .label-text", custom_field.name) + assert has_element?( + view, + "label[for='join-field-#{custom_field.id}'] .label-text", + custom_field.name + ) end end From 95b666f04f77e9e1253974352d55f782421a617a Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:14:09 +0200 Subject: [PATCH 03/22] test: verify that join view respects custom field types --- test/mv_web/live/join_live_test.exs | 123 ++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 273e786..20cd5cf 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -167,6 +167,120 @@ defmodule MvWeb.JoinLiveTest do end end + describe "join field input types" do + @tag role: :unauthenticated + test "renders boolean custom field as checkbox input", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Subscribe to newsletter", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id], + join_form_field_required: %{"email" => true, boolean_field.id => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "#join-form") + assert has_element?(view, "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']") + assert has_element?(view, "input#join-field-#{boolean_field.id}[type='checkbox']") + refute has_element?(view, "input#join-field-#{boolean_field.id}[type='text']") + end + + @tag role: :unauthenticated + test "renders typed custom fields with matching HTML input types", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, integer_field} = + Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, actor: system_actor) + + {:ok, date_field} = + Membership.create_custom_field(%{name: "Birth date", value_type: :date}, actor: system_actor) + + {:ok, email_field} = + Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, actor: system_actor) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", integer_field.id, date_field.id, email_field.id], + join_form_field_required: %{ + "email" => true, + integer_field.id => false, + date_field.id => false, + email_field.id => false + } + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "input#join-field-#{integer_field.id}[type='number']") + assert has_element?(view, "input#join-field-#{date_field.id}[type='date']") + assert has_element?(view, "input#join-field-#{email_field.id}[type='email']") + end + end + + describe "submit join form with typed custom fields" do + setup do + reset_rate_limiter() + :ok + end + + @tag role: :unauthenticated + test "persists checked boolean custom field and ignores non-allowlisted field", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Receive announcements", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id], + join_form_field_required: %{"email" => true, boolean_field.id => false} + }) + + count_before = count_join_requests() + {:ok, view, _html} = live(conn, "/join") + + view + |> element("#join-form") + |> render_submit(%{ + "email" => "typed#{System.unique_integer([:positive])}@example.com", + "website" => "", + boolean_field.id => "on", + "not_allowlisted" => "should-not-be-persisted" + }) + + Process.sleep(400) + + assert count_join_requests() == count_before + 1 + assert view |> element("[data-testid='join-success-message']") |> has_element?() + + form_data = latest_join_request_form_data() + assert Map.get(form_data, boolean_field.id) == "on" + refute Map.has_key?(form_data, "not_allowlisted") + end + end + defp enable_join_form(enabled) do {:ok, settings} = Membership.get_settings() {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled}) @@ -189,6 +303,15 @@ defmodule MvWeb.JoinLiveTest do Repo.one(from j in "join_requests", select: count(j.id)) || 0 end + defp latest_join_request_form_data do + Repo.one( + from j in "join_requests", + order_by: [desc: j.inserted_at], + limit: 1, + select: j.form_data + ) || %{} + end + defp reset_rate_limiter do :ets.delete_all_objects(MvWeb.JoinRateLimit) rescue From 6327ea00ebe0cb1488f30fd3bfb37f55b14a7f69 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:37:40 +0200 Subject: [PATCH 04/22] feat: respect field types in join requests --- lib/mv_web/live/join_live.ex | 110 +++++++++++++++++++++------- test/mv_web/live/join_live_test.exs | 36 ++++++++- 2 files changed, 115 insertions(+), 31 deletions(-) diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index d3d66f0..430a6fe 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -5,6 +5,7 @@ defmodule MvWeb.JoinLive do """ use MvWeb, :live_view + alias Ash.Resource.Info alias Mv.Membership alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -54,10 +55,6 @@ defmodule MvWeb.JoinLive do {gettext("Become a member")} -

- {gettext("Please enter your details for the membership application here.")} -

- <%= if @submitted do %>

@@ -67,6 +64,9 @@ defmodule MvWeb.JoinLive do

<% else %> +

+ {gettext("Please enter your details for the membership application here.")} +

<.form for={@form} id="join-form" @@ -80,18 +80,31 @@ defmodule MvWeb.JoinLive do <% end %> <%= for field <- @join_fields do %> -
+
- + <%= if field.input_type == "checkbox" do %> + + <% else %> + + <% end %>
<% end %> @@ -216,21 +229,27 @@ defmodule MvWeb.JoinLive do defp build_join_fields_with_labels(allowlist) do member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) - custom_field_name_by_id = custom_field_name_map(allowlist, member_field_strings) + custom_field_by_id = custom_field_map(allowlist, member_field_strings) Enum.map(allowlist, fn %{id: id, required: required} -> - label = - if id in member_field_strings do - MemberFields.label(String.to_existing_atom(id)) - else - Map.get(custom_field_name_by_id, id, gettext("Field")) - end - - %{id: id, label: label, required: required} + build_join_field(id, required, member_field_strings, custom_field_by_id) end) end - defp custom_field_name_map(allowlist, member_field_strings) do + defp build_join_field(id, required, member_field_strings, custom_field_by_id) do + if id in member_field_strings do + label = MemberFields.label(String.to_existing_atom(id)) + %{id: id, label: label, required: required, input_type: member_field_input_type(id)} + else + custom_field = Map.get(custom_field_by_id, id) + label = if custom_field, do: custom_field.name, else: gettext("Field") + input_type = custom_field_input_type(custom_field && custom_field.value_type) + + %{id: id, label: label, required: required, input_type: input_type} + end + end + + defp custom_field_map(allowlist, member_field_strings) do custom_field_ids = allowlist |> Enum.map(& &1.id) @@ -242,7 +261,7 @@ defmodule MvWeb.JoinLive do ids -> Mv.Membership.CustomField - |> Ash.Query.select([:id, :name]) + |> Ash.Query.select([:id, :name, :value_type]) |> Ash.read(domain: Mv.Membership, authorize?: false) |> case do {:ok, fields} -> @@ -250,7 +269,7 @@ defmodule MvWeb.JoinLive do fields |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1.name}) + |> Map.new(&{&1.id, &1}) {:error, _} -> %{} @@ -265,8 +284,45 @@ defmodule MvWeb.JoinLive do |> Map.put(@honeypot_field, "") end - defp input_type("email"), do: "email" - defp input_type(_), do: "text" + defp member_field_input_type("email"), do: "email" + + defp member_field_input_type(field_id) when is_binary(field_id) do + case member_field_atom(field_id) do + nil -> + "text" + + field_atom -> + Mv.Membership.Member + |> Info.attribute(field_atom) + |> attribute_to_input_type() + end + end + + defp member_field_input_type(_), do: "text" + + defp member_field_atom(field_id) when is_binary(field_id) do + Mv.Constants.member_fields() + |> Enum.find(&(Atom.to_string(&1) == field_id)) + end + + defp custom_field_input_type(type), do: attribute_to_input_type(%{type: type}) + + defp attribute_to_input_type(%{type: type}) when type in [:date, Ash.Type.Date], do: "date" + + defp attribute_to_input_type(%{type: type}) when type in [:integer, Ash.Type.Integer], + do: "number" + + defp attribute_to_input_type(%{type: type}) when type in [:boolean, Ash.Type.Boolean], + do: "checkbox" + + defp attribute_to_input_type(%{type: type}) when type in [:email, Mv.Membership.Email], + do: "email" + + defp attribute_to_input_type(%{type: _}), do: "text" + defp attribute_to_input_type(nil), do: "text" + + defp checkbox_checked?(value) when value in [true, "true", "on", "1"], do: true + defp checkbox_checked?(_), do: false defp build_submit_attrs(params, join_fields) do allowlist_ids = MapSet.new(Enum.map(join_fields, & &1.id)) diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 20cd5cf..7bac60f 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -192,7 +192,12 @@ defmodule MvWeb.JoinLiveTest do {:ok, view, _html} = live(conn, "/join") assert has_element?(view, "#join-form") - assert has_element?(view, "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']") + + assert has_element?( + view, + "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']" + ) + assert has_element?(view, "input#join-field-#{boolean_field.id}[type='checkbox']") refute has_element?(view, "input#join-field-#{boolean_field.id}[type='text']") end @@ -203,13 +208,19 @@ defmodule MvWeb.JoinLiveTest do {:ok, settings} = Membership.get_settings() {:ok, integer_field} = - Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, actor: system_actor) + Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, + actor: system_actor + ) {:ok, date_field} = - Membership.create_custom_field(%{name: "Birth date", value_type: :date}, actor: system_actor) + Membership.create_custom_field(%{name: "Birth date", value_type: :date}, + actor: system_actor + ) {:ok, email_field} = - Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, actor: system_actor) + Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, + actor: system_actor + ) {:ok, _} = Membership.update_settings(settings, %{ @@ -229,6 +240,23 @@ defmodule MvWeb.JoinLiveTest do assert has_element?(view, "input#join-field-#{date_field.id}[type='date']") assert has_element?(view, "input#join-field-#{email_field.id}[type='email']") end + + @tag role: :unauthenticated + test "renders standard date member fields with date input type", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", "join_date"], + join_form_field_required: %{"email" => true, "join_date" => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "input#join-field-join_date[type='date']") + refute has_element?(view, "input#join-field-join_date[type='text']") + end end describe "submit join form with typed custom fields" do From 15e9a52bc9ca53964263e5755c5d83b03c05eb8c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:52:48 +0200 Subject: [PATCH 05/22] fix: wrap field labels in join request view --- lib/mv_web/live/join_request_live/show.ex | 10 +++++----- test/mv_web/live/join_request_live/show_test.exs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 2aab87d..cdc6521 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -222,9 +222,9 @@ defmodule MvWeb.JoinRequestLive.Show do defp field_row(assigns) do ~H""" -
- {@label}: - +
+
{@label}:
+
<%= if @value && @value != "" do %> {@value} <% else %> @@ -232,8 +232,8 @@ defmodule MvWeb.JoinRequestLive.Show do {@empty_text || gettext("Not specified")} <% end %> - -
+ + """ end diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs index 35e87dc..5497d22 100644 --- a/test/mv_web/live/join_request_live/show_test.exs +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -63,9 +63,9 @@ defmodule MvWeb.JoinRequestLive.ShowTest do {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") - assert has_element?(view, "span", "#{custom_field.name}:") - assert has_element?(view, "span", "Alice Example") - refute has_element?(view, "span", "#{custom_field.id}:") + assert has_element?(view, "dt", "#{custom_field.name}:") + assert has_element?(view, "dd", "Alice Example") + refute has_element?(view, "dt", "#{custom_field.id}:") end end end From 0159d5352a2d936a8c8d1e2504f2235d3555bbb5 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:02:58 +0200 Subject: [PATCH 06/22] fix: joinrequest field formats --- lib/mv_web/live/join_request_live/show.ex | 43 ++++++++++++--- .../live/join_request_live/show_test.exs | 53 +++++++++++++++++++ 2 files changed, 89 insertions(+), 7 deletions(-) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index cdc6521..644dbbe 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -156,14 +156,16 @@ defmodule MvWeb.JoinRequestLive.Show do label={gettext("Submitted at")} value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} /> -
- {gettext("Status")}: - +
+
+ {gettext("Status")}: +
+
<.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}> {JoinRequestHelpers.format_status(@join_request.status)} - -
+ + <%= if @join_request.status in [:approved, :rejected] do %> <%= if @join_request.approved_at do %> <.field_row @@ -285,11 +287,38 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value(value) when is_boolean(value), do: if(value, do: gettext("Yes"), else: gettext("No")) - defp format_applicant_value(value) when is_binary(value) or is_number(value), - do: to_string(value) + defp format_applicant_value(value) when is_binary(value), + do: format_binary_applicant_value(value) + + defp format_applicant_value(value) when is_number(value), do: to_string(value) defp format_applicant_value(value), do: to_string(value) + defp format_binary_applicant_value(value) do + trimmed_value = String.trim(value) + + cond do + trimmed_value == "" -> + nil + + String.downcase(trimmed_value) in ["on", "true", "1"] -> + gettext("Yes") + + String.downcase(trimmed_value) in ["off", "false", "0"] -> + gettext("No") + + true -> + format_iso_date_string(trimmed_value) + end + end + + defp format_iso_date_string(value) do + case Date.from_iso8601(value) do + {:ok, date} -> DateFormatter.format_date(date) + _ -> value + end + end + defp format_applicant_value_from_map(value) do raw = Map.get(value, "_union_value") || Map.get(value, "value") type = Map.get(value, "_union_type") || Map.get(value, "type") diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs index 5497d22..40d5d5d 100644 --- a/test/mv_web/live/join_request_live/show_test.exs +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -11,6 +11,7 @@ defmodule MvWeb.JoinRequestLive.ShowTest do alias Mv.Fixtures alias Mv.Membership + alias MvWeb.Helpers.DateFormatter setup do {:ok, settings} = Membership.get_settings() @@ -67,5 +68,57 @@ defmodule MvWeb.JoinRequestLive.ShowTest do assert has_element?(view, "dd", "Alice Example") refute has_element?(view, "dt", "#{custom_field.id}:") end + + @tag role: :normal_user + test "formats boolean/date values and renders status in aligned row", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Privacy accepted", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, date_field} = + Membership.create_custom_field( + %{ + name: "Birth date", + value_type: :date + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id, date_field.id], + join_form_field_required: %{ + "email" => true, + boolean_field.id => false, + date_field.id => false + } + }) + + join_request = + Fixtures.submitted_join_request_fixture(%{ + form_data: %{ + boolean_field.id => "on", + date_field.id => "2000-01-12" + } + }) + + {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") + + assert has_element?(view, "dt", "Privacy accepted:") + assert has_element?(view, "dd", "Yes") + assert has_element?(view, "dt", "Birth date:") + assert has_element?(view, "dd", DateFormatter.format_date(~D[2000-01-12])) + assert has_element?(view, "dt", "Status:") + assert has_element?(view, "dd", "Submitted") + end end end From d0d7d38c03ddaff2c5daf7c5a53a01df220e9f20 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:14:22 +0200 Subject: [PATCH 07/22] feat: add open button to join link in settings --- lib/mv_web/live/global_settings_live.ex | 10 ++++++++++ priv/gettext/de/LC_MESSAGES/default.po | 8 +++++++- priv/gettext/default.pot | 6 ++++++ priv/gettext/en/LC_MESSAGES/default.po | 6 ++++++ test/mv_web/live/global_settings_live_test.exs | 15 +++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index cb57631..b6f232b 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -186,6 +186,16 @@ defmodule MvWeb.GlobalSettingsLive do <.icon name="hero-clipboard-document" class="size-4" /> {gettext("Copy")} + <.link + href={@join_url} + target="_blank" + rel="noopener noreferrer" + class="btn btn-secondary btn-sm" + aria-label={gettext("Open join page URL in a new tab")} + > + <.icon name="hero-arrow-top-right-on-square" class="size-4" /> + {gettext("Open")} +
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 383fb1c..432fd33 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -2396,10 +2396,11 @@ msgstr "Nur Administrator*innen oder die verknüpfte*n Benutzer*in(nen) können msgid "Only possible if no members are assigned to this type." msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind." +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" -msgstr "Offen" +msgstr "Öffnen" #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format @@ -3905,3 +3906,8 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert." #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 3e2eb5d..5039253 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -2397,6 +2397,7 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" @@ -3905,3 +3906,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 21314a5..b63ce04 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -2397,6 +2397,7 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" @@ -3905,3 +3906,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 92da11b..2edaf74 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -64,6 +64,21 @@ defmodule MvWeb.GlobalSettingsLiveTest do assert html =~ "must be present" end + + test "shows open button for join page URL in same row as copy", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: true}) + + {:ok, view, _html} = live(conn, ~p"/settings") + + assert has_element?(view, "#copy-join-url-btn") + + assert has_element?( + view, + "a[href][target=\"_blank\"][rel=\"noopener noreferrer\"]", + "Open" + ) + end end describe "SMTP / E-Mail section" do From 104d945dd1fd38daf5f4d2f65951b42ceb61f804 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:26:10 +0200 Subject: [PATCH 08/22] chore: update change notes --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd65692..c17ea39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- **Join request display and settings workflow** – Improved join request rendering and related settings behavior in one cohesive update: + - Join request fields now respect their configured field types in the details view. + - Custom field labels in join request views were standardized. + - Join request field formatting was corrected for more consistent output. + - Join link settings now include a direct "Open" action in addition to copy/share workflows. + ### Fixed - **Runtime ENV handling** – Empty or invalid environment variables (e.g. `SMTP_PORT=`, `PORT=`, `POOL_SIZE=`, `DATABASE_PORT=`) no longer cause `ArgumentError` at boot. Instead raises clear errors for required vars set but empty (e.g. DATABASE_HOST, PHX_HOST/DOMAIN, SECRET_KEY_BASE). +- **PostgreSQL 18 Docker volume path** – Corrected the database volume path to match PostgreSQL 18 expectations. + +### Dependency updates +- Mix dependencies were updated. +- Renovate Docker image was updated to `v43.165`. +- Rauthy Docker image was updated to `v0.35.1`. +- `just` was updated to `v1.50.0`. ## [1.1.1] - 2026-03-16 From cc1df449c6fb55ee27d90934d99fc567e24080a6 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 13:54:22 +0200 Subject: [PATCH 09/22] refactor: fix review blockers --- lib/mv/membership/custom_field_lookup.ex | 56 +++++ lib/mv_web/live/global_settings_live.ex | 2 +- lib/mv_web/live/join_live.ex | 45 ++-- lib/mv_web/live/join_request_live/show.ex | 198 +++++++++--------- .../show/membership_fees_component.ex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 18 +- priv/gettext/default.pot | 18 +- priv/gettext/en/LC_MESSAGES/default.po | 18 +- test/mv_web/live/join_live_test.exs | 57 +++-- 9 files changed, 253 insertions(+), 161 deletions(-) create mode 100644 lib/mv/membership/custom_field_lookup.ex diff --git a/lib/mv/membership/custom_field_lookup.ex b/lib/mv/membership/custom_field_lookup.ex new file mode 100644 index 0000000..9d9b9f3 --- /dev/null +++ b/lib/mv/membership/custom_field_lookup.ex @@ -0,0 +1,56 @@ +defmodule Mv.Membership.CustomFieldLookup do + @moduledoc """ + Shared helper for loading custom fields by ID. + """ + + alias Mv.Constants + alias Mv.Membership + + @spec fetch_map_by_ids([String.t()], keyword()) :: map() + def fetch_map_by_ids(field_ids, opts \\ []) when is_list(field_ids) do + member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + custom_field_ids = + field_ids + |> Enum.uniq() + |> Enum.reject(&(&1 in member_field_strings)) + + if custom_field_ids == [] do + %{} + else + select = Keyword.get(opts, :select, [:id, :name, :value_type]) + + query = + Membership.CustomField + |> Ash.Query.select(select) + + read_opts = + [domain: Membership] + |> maybe_put_actor(opts) + |> maybe_put_authorize(opts) + + case Ash.read(query, read_opts) do + {:ok, fields} -> + allowed_ids = MapSet.new(custom_field_ids) + fields |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) |> Map.new(&{&1.id, &1}) + + {:error, _} -> + %{} + end + end + end + + defp maybe_put_actor(opts, read_opts) do + case Keyword.fetch(read_opts, :actor) do + {:ok, actor} -> Keyword.put(opts, :actor, actor) + :error -> opts + end + end + + defp maybe_put_authorize(opts, read_opts) do + case Keyword.fetch(read_opts, :authorize?) do + {:ok, authorize?} -> Keyword.put(opts, :authorize?, authorize?) + :error -> opts + end + end +end diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index b6f232b..492c813 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -194,7 +194,7 @@ defmodule MvWeb.GlobalSettingsLive do aria-label={gettext("Open join page URL in a new tab")} > <.icon name="hero-arrow-top-right-on-square" class="size-4" /> - {gettext("Open")} + {pgettext("action", "Open")} diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index 430a6fe..e3bc444 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -6,6 +6,7 @@ defmodule MvWeb.JoinLive do use MvWeb, :live_view alias Ash.Resource.Info + alias Mv.Membership.CustomFieldLookup alias Mv.Membership alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -87,6 +88,7 @@ defmodule MvWeb.JoinLive do {field.label}{if field.required, do: " *"} <%= if field.input_type == "checkbox" do %> + Enum.map(& &1.id) - |> Enum.reject(&(&1 in member_field_strings)) - - case custom_field_ids do - [] -> - %{} - - ids -> - Mv.Membership.CustomField - |> Ash.Query.select([:id, :name, :value_type]) - |> Ash.read(domain: Mv.Membership, authorize?: false) - |> case do - {:ok, fields} -> - allowed_ids = MapSet.new(ids) - - fields - |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1}) - - {:error, _} -> - %{} - end - end + defp custom_field_map(allowlist, _member_field_strings) do + allowlist + |> Enum.map(& &1.id) + |> CustomFieldLookup.fetch_map_by_ids(authorize?: false, select: [:id, :name, :value_type]) end defp initial_form_params(join_fields) do @@ -342,9 +322,12 @@ defmodule MvWeb.JoinLive do } form_data = - params - |> Enum.filter(fn {key, _} -> key in allowlist_ids and key not in typed end) - |> Map.new(fn {k, v} -> {k, String.trim(to_string(v))} end) + join_fields + |> Enum.filter(&(&1.id not in typed)) + |> Map.new(fn field -> + {field.id, normalize_join_field_value(params[field.id], field.input_type)} + end) + |> Map.take(MapSet.to_list(allowlist_ids)) attrs = %{attrs | form_data: form_data} {:ok, attrs} @@ -356,6 +339,10 @@ defmodule MvWeb.JoinLive do if is_binary(v), do: String.trim(v), else: nil end + defp normalize_join_field_value(raw, _input_type) when is_binary(raw), do: String.trim(raw) + defp normalize_join_field_value(_raw, "checkbox"), do: "off" + defp normalize_join_field_value(_raw, _input_type), do: "" + # Prefer X-Forwarded-For / X-Real-IP when behind a reverse proxy; fall back to peer_data. # Uses :inet.ntoa/1 for correct IPv4 and IPv6 string representation. defp client_ip_from_socket(socket) do diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 644dbbe..d634f53 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -21,6 +21,7 @@ defmodule MvWeb.JoinRequestLive.Show do alias Mv.Constants alias Mv.Membership + alias Mv.Membership.CustomFieldLookup alias MvWeb.Helpers.DateFormatter alias MvWeb.JoinRequestLive.Helpers, as: JoinRequestHelpers alias MvWeb.Translations.MemberFields, as: MemberFieldsTranslations @@ -31,7 +32,7 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, socket |> assign(:join_request, nil) - |> assign(:custom_field_name_by_id, %{}) + |> assign(:custom_field_by_id, %{}) |> assign(:join_form_field_ids, []) |> Layouts.assign_page_title(gettext("Join request"))} else @@ -54,13 +55,16 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, request} -> field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id) - custom_field_name_by_id = - custom_field_name_map(field_ids ++ Map.keys(request.form_data || %{}), actor) + custom_field_by_id = + CustomFieldLookup.fetch_map_by_ids(field_ids ++ Map.keys(request.form_data || %{}), + actor: actor, + select: [:id, :name, :value_type] + ) {:noreply, socket |> assign(:join_request, request) - |> assign(:custom_field_name_by_id, custom_field_name_by_id) + |> assign(:custom_field_by_id, custom_field_by_id) |> assign(:join_form_field_ids, field_ids) |> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))} @@ -136,59 +140,58 @@ defmodule MvWeb.JoinRequestLive.Show do <%!-- Single block: all applicant-provided data in join form order --%>

{gettext("Applicant data")}

-
- <%= for {label, value} <- +
+
+ <%= for {label, value} <- applicant_data_rows( @join_request, @join_form_field_ids || [], - @custom_field_name_by_id || %{} + @custom_field_by_id || %{} ) do %> - <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> - <% end %> + <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> + <% end %> +
<%!-- Status and review (submitted_at, status; if decided: approved/rejected at, reviewed by) --%>

{gettext("Status and review")}

-
- <.field_row - label={gettext("Submitted at")} - value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} - /> +
-
- {gettext("Status")}: -
-
+ <.field_row + label={gettext("Submitted at")} + value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} + /> + <.field_row label={gettext("Status")}> <.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}> {JoinRequestHelpers.format_status(@join_request.status)} -
+ + <%= if @join_request.status in [:approved, :rejected] do %> + <%= if @join_request.approved_at do %> + <.field_row + label={gettext("Approved at")} + value={ + DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone) + } + /> + <% end %> + <%= if @join_request.rejected_at do %> + <.field_row + label={gettext("Rejected at")} + value={ + DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone) + } + /> + <% end %> + <.field_row + label={gettext("Review by")} + value={JoinRequestHelpers.reviewer_display(@join_request)} + empty_text="-" + /> + <% end %>
- <%= if @join_request.status in [:approved, :rejected] do %> - <%= if @join_request.approved_at do %> - <.field_row - label={gettext("Approved at")} - value={ - DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone) - } - /> - <% end %> - <%= if @join_request.rejected_at do %> - <.field_row - label={gettext("Rejected at")} - value={ - DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone) - } - /> - <% end %> - <.field_row - label={gettext("Review by")} - value={JoinRequestHelpers.reviewer_display(@join_request)} - empty_text="-" - /> - <% end %>
@@ -221,28 +224,30 @@ defmodule MvWeb.JoinRequestLive.Show do attr :label, :string, required: true attr :value, :any, default: nil attr :empty_text, :string, default: nil + slot :inner_block defp field_row(assigns) do ~H""" -
-
{@label}:
-
- <%= if @value && @value != "" do %> +
{@label}:
+
+ <%= cond do %> + <% @inner_block != [] -> %> + {render_slot(@inner_block)} + <% @value && @value != "" -> %> {@value} - <% else %> + <% true -> %> {@empty_text || gettext("Not specified")} - <% end %> -
-
+ <% end %> + """ end # Builds a single list of {label, display_value} for all applicant-provided data in join form # order. Typed fields (email, first_name, last_name) and form_data are merged; legacy # form_data keys (not in current join form config) are appended at the end. - defp applicant_data_rows(join_request, ordered_field_ids, custom_field_name_by_id) do + defp applicant_data_rows(join_request, ordered_field_ids, custom_field_by_id) do member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) form_data = join_request.form_data || %{} @@ -256,8 +261,9 @@ defmodule MvWeb.JoinRequestLive.Show do ordered_field_ids |> Enum.map(fn key -> value = Map.get(typed, key) || Map.get(form_data, key) - label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) - {label, format_applicant_value(value)} + label = field_key_to_label(key, member_field_strings, custom_field_by_id) + value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id) + {label, format_applicant_value(value, value_type)} end) legacy_keys = @@ -270,31 +276,32 @@ defmodule MvWeb.JoinRequestLive.Show do legacy_entries = Enum.map(legacy_keys, fn key -> - label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) - {label, format_applicant_value(form_data[key])} + label = field_key_to_label(key, member_field_strings, custom_field_by_id) + value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id) + {label, format_applicant_value(form_data[key], value_type)} end) in_order ++ legacy_entries end - defp format_applicant_value(nil), do: nil - defp format_applicant_value(""), do: nil - defp format_applicant_value(%Date{} = date), do: DateFormatter.format_date(date) + defp format_applicant_value(nil, _type), do: nil + defp format_applicant_value("", _type), do: nil + defp format_applicant_value(%Date{} = date, _type), do: DateFormatter.format_date(date) - defp format_applicant_value(value) when is_map(value), - do: format_applicant_value_from_map(value) + defp format_applicant_value(value, type) when is_map(value), + do: format_applicant_value_from_map(value, type) - defp format_applicant_value(value) when is_boolean(value), + defp format_applicant_value(value, _type) when is_boolean(value), do: if(value, do: gettext("Yes"), else: gettext("No")) - defp format_applicant_value(value) when is_binary(value), - do: format_binary_applicant_value(value) + defp format_applicant_value(value, type) when is_binary(value), + do: format_binary_applicant_value(value, type) - defp format_applicant_value(value) when is_number(value), do: to_string(value) + defp format_applicant_value(value, _type) when is_number(value), do: to_string(value) - defp format_applicant_value(value), do: to_string(value) + defp format_applicant_value(value, _type), do: to_string(value) - defp format_binary_applicant_value(value) do + defp format_binary_applicant_value(value, type) do trimmed_value = String.trim(value) cond do @@ -307,8 +314,11 @@ defmodule MvWeb.JoinRequestLive.Show do String.downcase(trimmed_value) in ["off", "false", "0"] -> gettext("No") - true -> + type in [:date, Ash.Type.Date] -> format_iso_date_string(trimmed_value) + + true -> + trimmed_value end end @@ -319,12 +329,13 @@ defmodule MvWeb.JoinRequestLive.Show do end end - defp format_applicant_value_from_map(value) do + defp format_applicant_value_from_map(value, fallback_type) do raw = Map.get(value, "_union_value") || Map.get(value, "value") type = Map.get(value, "_union_type") || Map.get(value, "type") + effective_type = type || fallback_type - if raw && type in ["date", :date] do - format_applicant_value(raw) + if raw && effective_type in ["date", :date, Ash.Type.Date] do + format_applicant_value(raw, :date) else format_applicant_value_simple(raw, value) end @@ -338,44 +349,39 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw) defp format_applicant_value_simple(_raw, value), do: to_string(value) - defp field_key_to_label(key, member_field_strings, custom_field_name_by_id) + defp field_key_to_label(key, member_field_strings, custom_field_by_id) when is_binary(key) do if key in member_field_strings do MemberFieldsTranslations.label(String.to_existing_atom(key)) else - Map.get(custom_field_name_by_id, key, key) + case Map.get(custom_field_by_id, key) do + %{name: name} -> name + _ -> key + end end end defp field_key_to_label(key, _, _), do: to_string(key) - defp custom_field_name_map(field_keys, actor) do - member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + defp field_key_to_value_type("email", _member_field_strings, _custom_field_by_id), do: :string - custom_field_ids = - field_keys - |> Enum.uniq() - |> Enum.reject(&(&1 in member_field_strings)) + defp field_key_to_value_type("first_name", _member_field_strings, _custom_field_by_id), + do: :string - case custom_field_ids do - [] -> - %{} + defp field_key_to_value_type("last_name", _member_field_strings, _custom_field_by_id), + do: :string - ids -> - Mv.Membership.CustomField - |> Ash.Query.select([:id, :name]) - |> Ash.read(actor: actor, domain: Mv.Membership) - |> case do - {:ok, fields} -> - allowed_ids = MapSet.new(ids) - - fields - |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1.name}) - - {:error, _} -> - %{} - end + defp field_key_to_value_type(key, member_field_strings, custom_field_by_id) + when is_binary(key) do + if key in member_field_strings do + :string + else + case Map.get(custom_field_by_id, key) do + %{value_type: value_type} -> value_type + _ -> nil + end end end + + defp field_key_to_value_type(_key, _member_field_strings, _custom_field_by_id), do: nil end diff --git a/lib/mv_web/live/member_live/show/membership_fees_component.ex b/lib/mv_web/live/member_live/show/membership_fees_component.ex index 370d4aa..e8ddff4 100644 --- a/lib/mv_web/live/member_live/show/membership_fees_component.ex +++ b/lib/mv_web/live/member_live/show/membership_fees_component.ex @@ -1291,7 +1291,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do defp translate_receipt_status("paid"), do: gettext("Paid") defp translate_receipt_status("unpaid"), do: gettext("Unpaid") defp translate_receipt_status("suspended"), do: gettext("Suspended") - defp translate_receipt_status("open"), do: gettext("Open") + defp translate_receipt_status("open"), do: pgettext("status", "Open") defp translate_receipt_status("cancelled"), do: gettext("Cancelled") defp translate_receipt_status("draft"), do: gettext("Draft") defp translate_receipt_status("incompleted"), do: gettext("Incomplete") diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 432fd33..4b047fd 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -2396,12 +2396,6 @@ msgstr "Nur Administrator*innen oder die verknüpfte*n Benutzer*in(nen) können msgid "Only possible if no members are assigned to this type." msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind." -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "Öffnen" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "Öffnen" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "Offen" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5039253..bd94594 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -2397,12 +2397,6 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index b63ce04..40a321e 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -2397,12 +2397,6 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "Open" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "Open" diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 7bac60f..d0efee9 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -12,10 +12,9 @@ defmodule MvWeb.JoinLiveTest do # async: false → shared sandbox; all processes (including LiveView) share the DB connection. use MvWeb.ConnCase, async: false import Phoenix.LiveViewTest - import Ecto.Query alias Mv.Membership - alias Mv.Repo + alias Mv.Membership.JoinRequest describe "GET /join" do @tag role: :unauthenticated @@ -55,11 +54,12 @@ defmodule MvWeb.JoinLiveTest do }) |> render_submit() - # Anti-enumeration delay is applied in LiveView via send_after (100–300 ms); wait for success UI. - Process.sleep(400) + assert_eventually(fn -> count_join_requests() == count_before + 1 end) + + assert_eventually(fn -> + view |> element("[data-testid='join-success-message']") |> has_element?() + end) - assert count_join_requests() == count_before + 1 - assert view |> element("[data-testid='join-success-message']") |> has_element?() assert render(view) =~ "saved your details" assert render(view) =~ "click the link" end @@ -298,10 +298,11 @@ defmodule MvWeb.JoinLiveTest do "not_allowlisted" => "should-not-be-persisted" }) - Process.sleep(400) + assert_eventually(fn -> count_join_requests() == count_before + 1 end) - assert count_join_requests() == count_before + 1 - assert view |> element("[data-testid='join-success-message']") |> has_element?() + assert_eventually(fn -> + view |> element("[data-testid='join-success-message']") |> has_element?() + end) form_data = latest_join_request_form_data() assert Map.get(form_data, boolean_field.id) == "on" @@ -328,16 +329,40 @@ defmodule MvWeb.JoinLiveTest do end defp count_join_requests do - Repo.one(from j in "join_requests", select: count(j.id)) || 0 + case Ash.count(JoinRequest, domain: Membership, authorize?: false) do + {:ok, count} -> count + _ -> 0 + end end defp latest_join_request_form_data do - Repo.one( - from j in "join_requests", - order_by: [desc: j.inserted_at], - limit: 1, - select: j.form_data - ) || %{} + query = + JoinRequest + |> Ash.Query.sort(inserted_at: :desc) + |> Ash.Query.limit(1) + + case Ash.read(query, domain: Membership, authorize?: false) do + {:ok, [request]} -> request.form_data || %{} + _ -> %{} + end + end + + defp assert_eventually(fun, timeout_ms \\ 1500) when is_function(fun, 0) do + deadline = System.monotonic_time(:millisecond) + timeout_ms + do_assert_eventually(fun, deadline) + end + + defp do_assert_eventually(fun, deadline) do + if fun.() do + true + else + if System.monotonic_time(:millisecond) < deadline do + Process.sleep(25) + do_assert_eventually(fun, deadline) + else + assert fun.() + end + end end defp reset_rate_limiter do From f8e1d399645a70c263588cffb5f2e52f3c598d33 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 14:11:29 +0200 Subject: [PATCH 10/22] refactor: fix review issues --- lib/mv_web/live/global_settings_live.ex | 4 +- lib/mv_web/live/join_live.ex | 59 ++++++++++++++----------- priv/gettext/de/LC_MESSAGES/default.po | 10 ++--- priv/gettext/default.pot | 10 ++--- priv/gettext/en/LC_MESSAGES/default.po | 10 ++--- 5 files changed, 49 insertions(+), 44 deletions(-) diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 492c813..43851db 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -191,10 +191,10 @@ defmodule MvWeb.GlobalSettingsLive do target="_blank" rel="noopener noreferrer" class="btn btn-secondary btn-sm" - aria-label={gettext("Open join page URL in a new tab")} > - <.icon name="hero-arrow-top-right-on-square" class="size-4" /> + <.icon name="hero-arrow-top-right-on-square" class="size-4" aria-hidden="true" /> {pgettext("action", "Open")} + {gettext("join page URL in a new tab")}
diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index e3bc444..ba0e476 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -6,8 +6,8 @@ defmodule MvWeb.JoinLive do use MvWeb, :live_view alias Ash.Resource.Info - alias Mv.Membership.CustomFieldLookup alias Mv.Membership + alias Mv.Membership.CustomFieldLookup alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -81,14 +81,12 @@ defmodule MvWeb.JoinLive do <% end %> <%= for field <- @join_fields do %> -
- - <%= if field.input_type == "checkbox" do %> - + <%= if field.input_type == "checkbox" do %> + + + <% else %> +
+ - <% end %> -
+
+ <% end %> <% end %> <%!-- @@ -274,7 +282,8 @@ defmodule MvWeb.JoinLive do field_atom -> Mv.Membership.Member |> Info.attribute(field_atom) - |> attribute_to_input_type() + |> Map.get(:type) + |> input_type_for() end end @@ -285,21 +294,17 @@ defmodule MvWeb.JoinLive do |> Enum.find(&(Atom.to_string(&1) == field_id)) end - defp custom_field_input_type(type), do: attribute_to_input_type(%{type: type}) + defp custom_field_input_type(type), do: input_type_for(type) - defp attribute_to_input_type(%{type: type}) when type in [:date, Ash.Type.Date], do: "date" - - defp attribute_to_input_type(%{type: type}) when type in [:integer, Ash.Type.Integer], - do: "number" - - defp attribute_to_input_type(%{type: type}) when type in [:boolean, Ash.Type.Boolean], - do: "checkbox" - - defp attribute_to_input_type(%{type: type}) when type in [:email, Mv.Membership.Email], - do: "email" - - defp attribute_to_input_type(%{type: _}), do: "text" - defp attribute_to_input_type(nil), do: "text" + defp input_type_for(:date), do: "date" + defp input_type_for(Ash.Type.Date), do: "date" + defp input_type_for(:integer), do: "number" + defp input_type_for(Ash.Type.Integer), do: "number" + defp input_type_for(:boolean), do: "checkbox" + defp input_type_for(Ash.Type.Boolean), do: "checkbox" + defp input_type_for(:email), do: "email" + defp input_type_for(Mv.Membership.Email), do: "email" + defp input_type_for(_), do: "text" defp checkbox_checked?(value) when value in [true, "true", "on", "1"], do: true defp checkbox_checked?(_), do: false diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 4b047fd..52270cc 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -3901,11 +3901,6 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert." msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "Öffnen" msgctxt "status" msgid "Open" msgstr "Offen" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "Beitrittslink in einem neuen Tab" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index bd94594..5d48691 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -3901,11 +3901,6 @@ msgstr "" msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "" msgctxt "status" msgid "Open" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 40a321e..ec6f305 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -3901,11 +3901,6 @@ msgstr "" msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "Open" msgctxt "status" msgid "Open" msgstr "Open" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "join page URL in a new tab" From a62fceaf280f8b99b1049ec0ee8d1b0b5a566a97 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 14:29:00 +0200 Subject: [PATCH 11/22] test: fix flaky test --- .../member_groups_relationship_test.exs | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/test/membership/member_groups_relationship_test.exs b/test/membership/member_groups_relationship_test.exs index a72c8bc..5ecddbd 100644 --- a/test/membership/member_groups_relationship_test.exs +++ b/test/membership/member_groups_relationship_test.exs @@ -16,9 +16,13 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Relationships" do test "member has many_to_many groups relationship (load with preloading)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor) - {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group1} = + Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor) + + {:ok, group2} = + Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member.id, group_id: group1.id}, @@ -40,9 +44,11 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "load multiple members with groups preloaded (N+1 prevention)", %{actor: actor} do - {:ok, member1} = Membership.create_member(%{email: "member1@test.com"}, actor: actor) - {:ok, member2} = Membership.create_member(%{email: "member2@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member1} = Membership.create_member(%{email: unique_email("member1")}, actor: actor) + {:ok, member2} = Membership.create_member(%{email: unique_email("member2")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member1.id, group_id: group.id}, @@ -70,8 +76,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Member-Group Association Operations" do test "add member to group via Ash API", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) assert {:ok, member_group} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -83,8 +91,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "remove member from group via Ash API", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, member_group} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -107,10 +117,16 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "add member to multiple groups in single operation", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor) - {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor) - {:ok, group3} = Membership.create_group(%{name: "Group Three"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group1} = + Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor) + + {:ok, group2} = + Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor) + + {:ok, group3} = + Membership.create_group(%{name: unique_group_name("Group Three")}, actor: actor) # Add to all groups {:ok, _mg1} = @@ -138,8 +154,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Edge Cases" do test "adding member to same group twice fails (duplicate prevention)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -154,8 +172,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "removing member from group they're not in (idempotent, no error)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) # Verify no association exists {:ok, nil} = @@ -194,4 +214,12 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do assert result == :ok || match?({:error, _}, result) end end + + defp unique_email(prefix) do + "#{prefix}-#{System.unique_integer([:positive])}@test.com" + end + + defp unique_group_name(prefix) do + "#{prefix} #{System.unique_integer([:positive])}" + end end From a244b1b07efeb22d2be711e37c49418e5acaec68 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 7 May 2026 09:38:36 +0200 Subject: [PATCH 12/22] test: verify smtp config either via env or UI only --- .../mv_web/live/global_settings_live_test.exs | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 2edaf74..9059a5e 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -1,8 +1,19 @@ defmodule MvWeb.GlobalSettingsLiveTest do - use MvWeb.ConnCase, async: true + use MvWeb.ConnCase, async: false import Phoenix.LiveViewTest alias Mv.Membership + @smtp_env_keys [ + "SMTP_HOST", + "SMTP_PORT", + "SMTP_USERNAME", + "SMTP_PASSWORD", + "SMTP_PASSWORD_FILE", + "SMTP_SSL", + "MAIL_FROM_NAME", + "MAIL_FROM_EMAIL" + ] + describe "Global Settings LiveView" do setup %{conn: conn} do user = create_test_user(%{email: "admin@example.com"}) @@ -124,6 +135,43 @@ defmodule MvWeb.GlobalSettingsLiveTest do {:ok, _view, html} = live(conn, ~p"/settings") assert html =~ "SMTP" or html =~ "E-Mail" or html =~ "Settings" end + + @tag :ui + test "disables all SMTP inputs when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + + assert has_element?(view, "#setting_smtp_host[disabled]") + assert has_element?(view, "#setting_smtp_port[disabled]") + assert has_element?(view, "#setting_smtp_ssl[disabled]") + assert has_element?(view, "#setting_smtp_username[disabled]") + assert has_element?(view, "#setting_smtp_password[disabled]") + assert has_element?(view, "#setting_smtp_from_email[disabled]") + assert has_element?(view, "#setting_smtp_from_name[disabled]") + end + + @tag :ui + test "does not render SMTP save action when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + refute has_element?(view, "#smtp-form button", "Save SMTP Settings") + end + + @tag :ui + test "shows explicit ENV-only mode hint when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, _view, html} = live(conn, ~p"/settings") + assert html =~ "SMTP is fully managed via environment variables" + end end describe "Authentication section when OIDC-only is enabled" do @@ -190,4 +238,8 @@ defmodule MvWeb.GlobalSettingsLiveTest do end end end + + defp clear_smtp_env do + Enum.each(@smtp_env_keys, &System.delete_env/1) + end end From 605a897045fdf7da112fba34ffc57c15fd9f300b Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 7 May 2026 10:01:19 +0200 Subject: [PATCH 13/22] fix: make sure smtp can be set either via env or ui --- CODE_GUIDELINES.md | 3 +- docs/smtp-configuration-concept.md | 13 ++- lib/mv/config.ex | 107 ++++++++++++++---- lib/mv_web/live/global_settings_live.ex | 40 +++++-- priv/gettext/de/LC_MESSAGES/default.po | 10 ++ priv/gettext/default.pot | 10 ++ priv/gettext/en/LC_MESSAGES/default.po | 10 ++ test/mv/config_smtp_test.exs | 22 +++- .../mv_web/live/global_settings_live_test.exs | 28 +++++ 9 files changed, 201 insertions(+), 42 deletions(-) diff --git a/CODE_GUIDELINES.md b/CODE_GUIDELINES.md index 0d478f9..d721a3a 100644 --- a/CODE_GUIDELINES.md +++ b/CODE_GUIDELINES.md @@ -1277,7 +1277,8 @@ mix hex.outdated **SMTP configuration:** -- SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`). ENV takes priority (same pattern as OIDC/Vereinfacht). +- SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`). +- **ENV-only policy:** If `SMTP_HOST` is set, SMTP is treated as environment-managed only. All SMTP fields in Settings are read-only, SMTP save action is hidden, and the UI shows a warning when required ENV values are missing (`SMTP_USERNAME`, and `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`). - **Sensitive settings in DB:** `smtp_password` and `oidc_client_secret` are excluded from the default read of the Setting resource; they are loaded only via explicit select when needed (e.g. `Mv.Config.smtp_password/0`, `Mv.Config.oidc_client_secret/0`). This avoids exposing secrets through `get_settings()`. - **Settings cache:** `Mv.Membership.get_settings/0` uses `Mv.Membership.SettingsCache` when the cache process is running (not in test). Cache has a short TTL and is invalidated on every settings update. This avoids repeated DB reads on hot paths (e.g. `RegistrationEnabled` validation, `Layouts.public_page`). In test, the cache is not started so all callers use `get_settings_uncached/0` in the test process (Ecto Sandbox). - **Join emails (domain → web):** The domain calls `Mv.Membership.JoinNotifier` (config `:join_notifier`, default `MvWeb.JoinNotifierImpl`) for sending join confirmation, already-member, and already-pending emails. This keeps the domain independent of the web layer; tests can override the notifier. diff --git a/docs/smtp-configuration-concept.md b/docs/smtp-configuration-concept.md index 4ae7760..6668485 100644 --- a/docs/smtp-configuration-concept.md +++ b/docs/smtp-configuration-concept.md @@ -25,7 +25,10 @@ Enable configurable SMTP for sending transactional emails (join confirmation, us | ENV | 1 | Production, Docker, 12-factor | | Settings | 2 | Admin UI, dev without ENV | -When an ENV variable is set, the corresponding Settings field is read-only in the UI (with hint "Set by environment"). +When `SMTP_HOST` is set, SMTP runs in **ENV-only mode**: +- all SMTP fields in Settings are read-only, +- saving SMTP settings in the UI is disabled, +- and the UI shows a warning block if required SMTP ENV values are missing. --- @@ -63,6 +66,14 @@ Support **SMTP_PASSWORD_FILE** (path to file containing the password), same patt - Show a warning in the Settings UI. - Delivery attempts silently fall back to the Local adapter (no crash). +### 6.1 Behaviour in ENV-only mode (`SMTP_HOST` set) + +- The SMTP source of truth is environment variables only. +- The UI does not allow editing SMTP fields in this mode. +- The Settings page shows a warning block when required values are missing: + - `SMTP_USERNAME` + - `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE` + --- ## 7. Test Email (Settings UI) diff --git a/lib/mv/config.ex b/lib/mv/config.ex index 3494937..c807193 100644 --- a/lib/mv/config.ex +++ b/lib/mv/config.ex @@ -478,48 +478,61 @@ defmodule Mv.Config do end @doc """ - Returns SMTP port as integer. ENV `SMTP_PORT` (parsed) overrides Settings. - Returns nil when neither ENV nor Settings provide a valid port. + Returns SMTP port as integer. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_PORT` + - Settings mode: read from Settings only """ @spec smtp_port() :: non_neg_integer() | nil def smtp_port do - case System.get_env("SMTP_PORT") do - nil -> - get_from_settings_integer(:smtp_port) - - value when is_binary(value) -> - case Integer.parse(String.trim(value)) do - {port, _} when port > 0 -> port - _ -> nil - end + if smtp_env_mode?() do + parse_smtp_port_env(System.get_env("SMTP_PORT")) + else + get_from_settings_integer(:smtp_port) end end @doc """ - Returns SMTP username. ENV `SMTP_USERNAME` overrides Settings. + Returns SMTP username. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_USERNAME` + - Settings mode: read from Settings only """ @spec smtp_username() :: String.t() | nil def smtp_username do - smtp_env_or_setting("SMTP_USERNAME", :smtp_username) + if smtp_env_mode?() do + System.get_env("SMTP_USERNAME") |> trim_nil() + else + get_from_settings(:smtp_username) + end end @doc """ Returns SMTP password. - Priority: `SMTP_PASSWORD` ENV > `SMTP_PASSWORD_FILE` (file contents) > Settings. + Policy: + - ENV-only mode (`SMTP_HOST` set): `SMTP_PASSWORD` > `SMTP_PASSWORD_FILE` + - Settings mode: read from Settings only + Strips trailing whitespace/newlines from file contents. """ @spec smtp_password() :: String.t() | nil def smtp_password do - case System.get_env("SMTP_PASSWORD") do - nil -> smtp_password_from_file_or_settings() - value -> trim_nil(value) + if smtp_env_mode?() do + case System.get_env("SMTP_PASSWORD") do + nil -> smtp_password_from_file_or_settings() + value -> trim_nil(value) + end + else + get_smtp_password_from_settings() end end defp smtp_password_from_file_or_settings do case System.get_env("SMTP_PASSWORD_FILE") do - nil -> get_smtp_password_from_settings() + nil -> nil path -> read_smtp_password_file(path) end end @@ -533,11 +546,18 @@ defmodule Mv.Config do @doc """ Returns SMTP TLS/SSL mode string (e.g. 'tls', 'ssl', 'none'). - ENV `SMTP_SSL` overrides Settings. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_SSL` + - Settings mode: read from Settings only """ @spec smtp_ssl() :: String.t() | nil def smtp_ssl do - smtp_env_or_setting("SMTP_SSL", :smtp_ssl) + if smtp_env_mode?() do + System.get_env("SMTP_SSL") |> trim_nil() + else + get_from_settings(:smtp_ssl) + end end @doc """ @@ -549,12 +569,39 @@ defmodule Mv.Config do end @doc """ - Returns true when any SMTP ENV variable is set (used in Settings UI for hints). + Returns true when SMTP ENV mode is active. """ @spec smtp_env_configured?() :: boolean() def smtp_env_configured? do - smtp_host_env_set?() or smtp_port_env_set?() or smtp_username_env_set?() or - smtp_password_env_set?() or smtp_ssl_env_set?() + smtp_env_mode?() + end + + @doc """ + Returns true when SMTP is managed by environment variables. + + Policy: if `SMTP_HOST` is set, SMTP is treated as ENV-only. + """ + @spec smtp_env_mode?() :: boolean() + def smtp_env_mode? do + smtp_host_env_set?() + end + + @doc """ + Returns missing required SMTP ENV keys for ENV-only mode warnings. + + Required in ENV-only mode: + - `SMTP_USERNAME` + - one of `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE` + """ + @spec smtp_missing_required_env_keys() :: [String.t()] + def smtp_missing_required_env_keys do + if smtp_env_mode?() do + [] + |> maybe_add_missing("SMTP_USERNAME", smtp_username_env_set?()) + |> maybe_add_missing("SMTP_PASSWORD/SMTP_PASSWORD_FILE", smtp_password_env_set?()) + else + [] + end end @doc "Returns true if SMTP_HOST ENV is set." @@ -618,6 +665,17 @@ defmodule Mv.Config do @spec mail_from_email_env_set?() :: boolean() def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL") + defp parse_smtp_port_env(nil), do: nil + + defp parse_smtp_port_env(value) when is_binary(value) do + case Integer.parse(String.trim(value)) do + {port, _} when port > 0 -> port + _ -> nil + end + end + + defp parse_smtp_port_env(_), do: nil + # Reads a plain string SMTP setting: ENV first, then Settings. defp smtp_env_or_setting(env_key, setting_key) do case System.get_env(env_key) do @@ -626,6 +684,9 @@ defmodule Mv.Config do end end + defp maybe_add_missing(acc, _label, true), do: acc + defp maybe_add_missing(acc, label, false), do: acc ++ [label] + # Reads an integer setting attribute from Settings. defp get_from_settings_integer(key) do case Mv.Membership.get_settings() do diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 43851db..983f075 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -86,6 +86,8 @@ defmodule MvWeb.GlobalSettingsLive do |> assign(:oidc_client_secret_set, Mv.Config.oidc_client_secret_set?()) |> assign(:registration_enabled, settings.registration_enabled != false) |> assign(:smtp_env_configured, Mv.Config.smtp_env_configured?()) + |> assign(:smtp_env_mode, Mv.Config.smtp_env_mode?()) + |> assign(:smtp_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys()) |> assign(:smtp_host_env_set, Mv.Config.smtp_host_env_set?()) |> assign(:smtp_port_env_set, Mv.Config.smtp_port_env_set?()) |> assign(:smtp_username_env_set, Mv.Config.smtp_username_env_set?()) @@ -321,12 +323,25 @@ defmodule MvWeb.GlobalSettingsLive do <%!-- SMTP / E-Mail Section --%> <.form_section title={gettext("SMTP / E-Mail")}> - <%= if @smtp_env_configured do %> + <%= if @smtp_env_mode do %>

- {gettext("Some values are set via environment variables. Those fields are read-only.")} + {gettext( + "SMTP is fully managed via environment variables. All SMTP fields are read-only." + )}

<% end %> + <%= if @smtp_env_mode and @smtp_missing_required_env_keys != [] do %> +
+ <.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" /> + + {gettext("SMTP environment configuration appears incomplete. Missing: %{keys}", + keys: Enum.join(@smtp_missing_required_env_keys, ", ") + )} + +
+ <% end %> + <%= if @environment == :prod and not @smtp_configured do %>
<.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" /> @@ -345,7 +360,7 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_host]} type="text" label={gettext("Host")} - disabled={@smtp_host_env_set} + disabled={@smtp_env_mode} placeholder={ if(@smtp_host_env_set, do: gettext("From SMTP_HOST"), @@ -357,14 +372,14 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_port]} type="number" label={gettext("Port")} - disabled={@smtp_port_env_set} + disabled={@smtp_env_mode} placeholder={if(@smtp_port_env_set, do: gettext("From SMTP_PORT"), else: "587")} /> <.input field={@form[:smtp_ssl]} type="select" label={gettext("TLS/SSL")} - disabled={@smtp_ssl_env_set} + disabled={@smtp_env_mode} options={[ {gettext("TLS (port 587, recommended)"), "tls"}, {gettext("SSL (port 465)"), "ssl"}, @@ -379,7 +394,7 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_username]} type="text" label={gettext("Username")} - disabled={@smtp_username_env_set} + disabled={@smtp_env_mode} placeholder={ if(@smtp_username_env_set, do: gettext("From SMTP_USERNAME"), @@ -391,7 +406,7 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_password]} type="password" label={gettext("Password")} - disabled={@smtp_password_env_set} + disabled={@smtp_env_mode} placeholder={ if(@smtp_password_env_set, do: gettext("From SMTP_PASSWORD"), @@ -410,7 +425,7 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_from_email]} type="email" label={gettext("Sender email (From)")} - disabled={@smtp_from_email_env_set} + disabled={@smtp_env_mode} placeholder={ if(@smtp_from_email_env_set, do: gettext("From MAIL_FROM_EMAIL"), @@ -422,7 +437,7 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_from_name]} type="text" label={gettext("Sender name (From)")} - disabled={@smtp_from_name_env_set} + disabled={@smtp_env_mode} placeholder={ if(@smtp_from_name_env_set, do: gettext("From MAIL_FROM_NAME"), else: "Mila") } @@ -436,9 +451,10 @@ defmodule MvWeb.GlobalSettingsLive do

<.button :if={ - not (@smtp_host_env_set and @smtp_port_env_set and @smtp_username_env_set and - @smtp_password_env_set and @smtp_ssl_env_set and @smtp_from_email_env_set and - @smtp_from_name_env_set) + not @smtp_env_mode and + not (@smtp_host_env_set and @smtp_port_env_set and @smtp_username_env_set and + @smtp_password_env_set and @smtp_ssl_env_set and @smtp_from_email_env_set and + @smtp_from_name_env_set) } phx-disable-with={gettext("Saving...")} variant="primary" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 52270cc..1482490 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -3917,3 +3917,13 @@ msgstr "Offen" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "Beitrittslink in einem neuen Tab" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "Die SMTP-Umgebungs-Konfiguration ist unvollständig. Fehlend: %{keys}" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "SMTP wird vollständig über Umgebungsvariablen verwaltet. Alle SMTP-Felder sind schreibgeschützt." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5d48691..21e7b16 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -3917,3 +3917,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index ec6f305..7d94b7c 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -3917,3 +3917,13 @@ msgstr "Open" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "join page URL in a new tab" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "" diff --git a/test/mv/config_smtp_test.exs b/test/mv/config_smtp_test.exs index 5359366..7a1b895 100644 --- a/test/mv/config_smtp_test.exs +++ b/test/mv/config_smtp_test.exs @@ -23,7 +23,8 @@ defmodule Mv.ConfigSmtpTest do end describe "smtp_port/0" do - test "returns parsed integer when SMTP_PORT ENV is set" do + test "returns parsed integer when SMTP_PORT ENV is set in ENV-only mode" do + set_smtp_env("SMTP_HOST", "smtp.example.com") set_smtp_env("SMTP_PORT", "587") assert Mv.Config.smtp_port() == 587 after @@ -52,13 +53,21 @@ defmodule Mv.ConfigSmtpTest do end describe "smtp_env_configured?/0" do - test "returns true when any SMTP ENV variable is set" do + test "returns true when SMTP_HOST is set" do set_smtp_env("SMTP_HOST", "smtp.example.com") assert Mv.Config.smtp_env_configured?() == true after clear_smtp_env() end + test "returns false when SMTP_HOST is not set even if other SMTP ENV variables are set" do + set_smtp_env("SMTP_USERNAME", "user@example.com") + set_smtp_env("SMTP_PASSWORD", "secret") + refute Mv.Config.smtp_env_configured?() + after + clear_smtp_env() + end + test "returns false when no SMTP ENV variables are set" do clear_smtp_env() refute Mv.Config.smtp_env_configured?() @@ -66,15 +75,17 @@ defmodule Mv.ConfigSmtpTest do end describe "smtp_password/0 and SMTP_PASSWORD_FILE" do - test "returns value from SMTP_PASSWORD when set" do + test "returns value from SMTP_PASSWORD when set in ENV-only mode" do + set_smtp_env("SMTP_HOST", "smtp.example.com") set_smtp_env("SMTP_PASSWORD", "env-secret") assert Mv.Config.smtp_password() == "env-secret" after clear_smtp_env() end - test "returns content of file when SMTP_PASSWORD_FILE is set and SMTP_PASSWORD is not" do + test "returns content of file when SMTP_PASSWORD_FILE is set in ENV-only mode and SMTP_PASSWORD is not" do clear_smtp_env() + set_smtp_env("SMTP_HOST", "smtp.example.com") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") File.write!(path, "file-secret\n") Process.put(:smtp_password_file_path, path) @@ -85,7 +96,8 @@ defmodule Mv.ConfigSmtpTest do if path = Process.get(:smtp_password_file_path), do: File.rm(path) end - test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE when both are set" do + test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE in ENV-only mode when both are set" do + set_smtp_env("SMTP_HOST", "smtp.example.com") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") File.write!(path, "file-secret") Process.put(:smtp_password_file_path, path) diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 9059a5e..37c4e38 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -172,6 +172,34 @@ defmodule MvWeb.GlobalSettingsLiveTest do {:ok, _view, html} = live(conn, ~p"/settings") assert html =~ "SMTP is fully managed via environment variables" end + + @tag :ui + test "shows warning block for missing required SMTP ENV values in ENV-only mode", %{ + conn: conn + } do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, _view, html} = live(conn, ~p"/settings") + assert html =~ "SMTP environment configuration appears incomplete" + assert html =~ "SMTP_USERNAME" + assert html =~ "SMTP_PASSWORD/SMTP_PASSWORD_FILE" + end + + @tag :ui + test "does not enter ENV-only mode when SMTP_HOST is not set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_USERNAME", "leftover@example.com") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, html} = live(conn, ~p"/settings") + + refute html =~ "SMTP is fully managed via environment variables" + refute html =~ "SMTP environment configuration appears incomplete" + refute has_element?(view, "#setting_smtp_host[disabled]") + refute has_element?(view, "#setting_smtp_username[disabled]") + end end describe "Authentication section when OIDC-only is enabled" do From 2443bc62ac6d726340fdd10a4fbc063d75884b82 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 7 May 2026 12:13:45 +0200 Subject: [PATCH 14/22] feat: Improve handling of association name config --- lib/membership/membership.ex | 12 +++++ lib/mv/config.ex | 21 +++++++++ lib/mv_web/components/layouts.ex | 7 ++- lib/mv_web/live/global_settings_live.ex | 43 +++++++++++++++++- priv/gettext/de/LC_MESSAGES/default.po | 10 +++++ priv/gettext/default.pot | 10 +++++ priv/gettext/en/LC_MESSAGES/default.po | 10 +++++ test/mv_web/components/layouts_test.exs | 26 +++++++++++ .../mv_web/live/global_settings_live_test.exs | 44 +++++++++++++++++++ 9 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 test/mv_web/components/layouts_test.exs diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index 7fa35dc..ffe7703 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -178,6 +178,18 @@ defmodule Mv.Membership do end end + @doc """ + Invalidates the global settings cache. + + This should be used by callers that update settings through paths outside of + `update_settings/2` (for example, custom form submit flows) to keep reads via + `get_settings/0` consistent across views. + """ + @spec invalidate_settings_cache() :: :ok + def invalidate_settings_cache do + SettingsCache.invalidate() + end + @doc """ Lists only required custom fields. diff --git a/lib/mv/config.ex b/lib/mv/config.ex index c807193..33c92cf 100644 --- a/lib/mv/config.ex +++ b/lib/mv/config.ex @@ -143,6 +143,27 @@ defmodule Mv.Config do |> parse_and_validate_integer(default) end + # --------------------------------------------------------------------------- + # Association name + # ENV variable takes priority; fallback to Settings from database. + # --------------------------------------------------------------------------- + + @doc """ + Returns the association name. + + Reads from `ASSOCIATION_NAME` env first, then from Settings. + """ + @spec association_name() :: String.t() | nil + def association_name do + env_or_setting("ASSOCIATION_NAME", :club_name) + end + + @doc """ + Returns true if ASSOCIATION_NAME is set (field is read-only in Settings). + """ + @spec association_name_env_set?() :: boolean() + def association_name_env_set?, do: env_set?("ASSOCIATION_NAME") + # --------------------------------------------------------------------------- # Vereinfacht accounting software integration # ENV variables take priority; fallback to Settings from database. diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 9aff23c..c6e3e01 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -135,8 +135,11 @@ defmodule MvWeb.Layouts do slot :inner_block, required: true def app(assigns) do - # Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query. - %{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings() + # Single settings read for layout defaults. + # Use an explicitly provided club_name as source of truth to avoid stale + # values from cache reads immediately after a settings update in LiveViews. + %{club_name: fallback_club_name, join_form_enabled: join_form_enabled} = get_layout_settings() + club_name = assigns[:club_name] || fallback_club_name # NOTE: Unprocessed count runs on every page load when join form is enabled; consider # loading only on navigation or caching briefly if performance becomes an issue. diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 983f075..228970a 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -65,6 +65,7 @@ defmodule MvWeb.GlobalSettingsLive do |> assign(:settings, settings) |> assign(:locale, locale) |> assign(:environment, environment) + |> assign(:association_name_env_set, Mv.Config.association_name_env_set?()) |> assign(:vereinfacht_env_configured, Mv.Config.vereinfacht_env_configured?()) |> assign(:vereinfacht_api_url_env_set, Mv.Config.vereinfacht_api_url_env_set?()) |> assign(:vereinfacht_api_key_env_set, Mv.Config.vereinfacht_api_key_env_set?()) @@ -125,6 +126,13 @@ defmodule MvWeb.GlobalSettingsLive do
<%!-- Club Settings Section --%> <.form_section title={gettext("Club Settings")}> + <%= if @association_name_env_set do %> +

+ {gettext( + "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only." + )} +

+ <% end %> <.form for={@form} id="settings-form" phx-change="validate" phx-submit="save">
<.input @@ -132,10 +140,18 @@ defmodule MvWeb.GlobalSettingsLive do type="text" label={gettext("Association Name")} required + disabled={@association_name_env_set} + placeholder={ + if(@association_name_env_set, do: gettext("From ASSOCIATION_NAME"), else: nil) + } />
- <.button phx-disable-with={gettext("Saving...")} variant="primary"> + <.button + :if={not @association_name_env_set} + phx-disable-with={gettext("Saving...")} + variant="primary" + > {gettext("Save Name")} @@ -919,6 +935,7 @@ defmodule MvWeb.GlobalSettingsLive do # Never send blank API key / client secret / smtp password so we do not overwrite stored secrets setting_params_clean = setting_params + |> drop_env_managed_association_name() |> drop_blank_vereinfacht_api_key() |> drop_blank_oidc_client_secret() |> drop_blank_smtp_password() @@ -927,6 +944,10 @@ defmodule MvWeb.GlobalSettingsLive do case MvWeb.LiveHelpers.submit_form(socket.assigns.form, setting_params_clean, actor) do {:ok, updated_settings} -> + # Keep cross-view reads consistent after settings updates (layouts/sidebar + # read via Membership.get_settings/0). + Membership.invalidate_settings_cache() + # Use the returned record for the form so saved values show immediately; # get_settings() can return cached data without the new attribute until reload. test_result = @@ -1195,10 +1216,19 @@ defmodule MvWeb.GlobalSettingsLive do end end + defp drop_env_managed_association_name(params) when is_map(params) do + if Mv.Config.association_name_env_set?() do + Map.delete(params, "club_name") + else + params + end + end + defp assign_form(%{assigns: %{settings: settings}} = socket) do - # Show ENV values in disabled fields (Vereinfacht, OIDC, SMTP); never expose secrets in form + # Show ENV values in disabled fields (Association Name, Vereinfacht, OIDC, SMTP); never expose secrets in form settings_display = settings + |> merge_association_env_values() |> merge_vereinfacht_env_values() |> merge_oidc_env_values() |> merge_smtp_env_values() @@ -1225,6 +1255,15 @@ defmodule MvWeb.GlobalSettingsLive do defp put_if_env_set(map, _key, false, _value), do: map defp put_if_env_set(map, key, true, value), do: Map.put(map, key, value) + defp merge_association_env_values(s) do + put_if_env_set( + s, + :club_name, + Mv.Config.association_name_env_set?(), + Mv.Config.association_name() + ) + end + defp merge_vereinfacht_env_values(s) do s |> put_if_env_set( diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 1482490..31830ce 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -3927,3 +3927,13 @@ msgstr "Die SMTP-Umgebungs-Konfiguration ist unvollständig. Fehlend: %{keys}" #, elixir-autogen, elixir-format msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." msgstr "SMTP wird vollständig über Umgebungsvariablen verwaltet. Alle SMTP-Felder sind schreibgeschützt." + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only." +msgstr "Der Vereinsname wird über die Umgebungsvariable ASSOCIATION_NAME gesetzt. Dieses Feld ist schreibgeschützt." + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "From ASSOCIATION_NAME" +msgstr "Aus ASSOCIATION_NAME" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 21e7b16..586d1f4 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -3927,3 +3927,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only." +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "From ASSOCIATION_NAME" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 7d94b7c..6b8db53 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -3927,3 +3927,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only." +msgstr "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only." + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "From ASSOCIATION_NAME" +msgstr "From ASSOCIATION_NAME" diff --git a/test/mv_web/components/layouts_test.exs b/test/mv_web/components/layouts_test.exs new file mode 100644 index 0000000..411750b --- /dev/null +++ b/test/mv_web/components/layouts_test.exs @@ -0,0 +1,26 @@ +defmodule MvWeb.LayoutsTest do + use MvWeb.ConnCase, async: false + + import Phoenix.LiveViewTest + + alias Mv.Membership + alias MvWeb.Layouts + + describe "app/1" do + test "prefers provided club_name over settings fallback" do + {:ok, settings} = Membership.get_settings() + {:ok, _} = Membership.update_settings(settings, %{club_name: "Settings Club Name"}) + + html = + render_component(&Layouts.app/1, %{ + flash: %{}, + current_user: nil, + club_name: "Provided Club Name", + inner_block: [%{inner_block: fn _, _ -> "content" end}] + }) + + assert html =~ "Provided Club Name" + refute html =~ "Settings Club Name" + end + end +end diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 37c4e38..8d2963c 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -13,6 +13,7 @@ defmodule MvWeb.GlobalSettingsLiveTest do "MAIL_FROM_NAME", "MAIL_FROM_EMAIL" ] + @association_env_key "ASSOCIATION_NAME" describe "Global Settings LiveView" do setup %{conn: conn} do @@ -51,6 +52,17 @@ defmodule MvWeb.GlobalSettingsLiveTest do assert render(view) =~ "Updated Club Name" end + test "updated club name is shown after remount", %{conn: conn} do + {:ok, view, _html} = live(conn, ~p"/settings") + + assert view + |> form("#settings-form", %{setting: %{club_name: "Remount Club Name"}}) + |> render_submit() + + {:ok, _view_after_remount, html_after_remount} = live(conn, ~p"/settings") + assert html_after_remount =~ "Remount Club Name" + end + test "shows error when club_name is empty", %{conn: conn} do {:ok, view, _html} = live(conn, ~p"/settings") @@ -90,6 +102,34 @@ defmodule MvWeb.GlobalSettingsLiveTest do "Open" ) end + + @tag :ui + test "disables association name input when ASSOCIATION_NAME is set", %{conn: conn} do + clear_association_name_env() + System.put_env(@association_env_key, "Association Name from ENV") + on_exit(fn -> clear_association_name_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + + assert has_element?(view, "#setting_club_name[disabled]") + assert has_element?(view, "#setting_club_name[placeholder='From ASSOCIATION_NAME']") + refute has_element?(view, "#settings-form button", "Save Name") + assert render(view) =~ "Association name is set via environment variable ASSOCIATION_NAME" + end + + @tag :ui + test "keeps association name input editable when ASSOCIATION_NAME is not set", %{conn: conn} do + clear_association_name_env() + on_exit(fn -> clear_association_name_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + + refute has_element?(view, "#setting_club_name[disabled]") + assert has_element?(view, "#settings-form button", "Save Name") + + refute render(view) =~ + "Association name is set via environment variable ASSOCIATION_NAME" + end end describe "SMTP / E-Mail section" do @@ -270,4 +310,8 @@ defmodule MvWeb.GlobalSettingsLiveTest do defp clear_smtp_env do Enum.each(@smtp_env_keys, &System.delete_env/1) end + + defp clear_association_name_env do + System.delete_env(@association_env_key) + end end From a12888de2f2997b269f94c84c31db3b7d121de1c Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 8 May 2026 15:04:53 +0200 Subject: [PATCH 15/22] Improve member view table behavior+style, fix config settings (#493) ## Description of the implemented changes The changes were: - [x] Bugfixing - [x] New Feature - [ ] Breaking Change - [x] Refactoring This PR standardizes interactive table behavior and improves settings robustness. It makes the new hover/focus-visible row highlight the default for clickable tables, keeps sticky first-column behavior configurable (and optimized for member selection UX), and tightens SMTP source-of-truth handling so ENV-based and UI-based configuration do not conflict. ## What has been changed? - Refactored `CoreComponents.table` to expose interaction state via `data-row-interactive` and moved default row hover/focus styling to CSS. - Made the new row highlight behavior (`hover` + `:has(:focus-visible)`) the default for clickable zebra tables. - Kept sticky-first-column as an explicit table option and preserved sticky-specific selection accent behavior. - Updated member overview table usage to the sticky-first-column mode and refined scrolling behavior (table scrollbar within container, not page-coupled). - Adjusted table-related tests to validate the new interaction contract (attribute/CSS-driven behavior instead of legacy ring classes). - Improved SMTP config handling: - clearer ENV-vs-Settings behavior (ENV-only mode when host env is set), - read-only and warning behavior in global settings UI when required env keys are missing, - updated related config/tests/docs. - Updated docs and changelog (`CHANGELOG.md`, `DESIGN_GUIDELINES.md`, `CODE_GUIDELINES.md`, SMTP concept docs). - Updated gettext catalogs (`default.pot`, `en`, `de`) for new/changed UI strings. ## Definition of Done ### Code Quality - [x] No new technical depths - [x] Linting passed - [x] Documentation is added were needed ### Accessibility - [x] New elements are properly defined with html-tags - [x] Colour contrast follows WCAG criteria - [x] Aria labels are added when needed - [x] Everything is accessible by keyboard - [x] Tab-Order is comprehensible - [x] All interactive elements have a visible focus ### Testing - [x] Tests for new code are written - [x] All tests pass - [ ] axe-core dev tools show no critical or major issues ## Additional Notes - Branch includes 4 commits: - `fix: make sure smtp can be set either via env or ui` - `fix: make horizontal scrollbars sticky to bottom` - `docs: update changelog` - `feat: make checkbox column in member view sticky` - Full fast suite passed (`mix test --exclude slow --exclude ui`): 2017 tests, 0 failures (plus expected non-failing warning logs in test output). - Reviewer focus areas: 1. **Cross-table UX consistency** after moving row interaction styling to component/CSS contract. 2. **Sticky table behavior** (selection accent stripe, zebra background, keyboard focus visibility). 3. **SMTP precedence and UI constraints** in global settings when ENV mode is active. 4. **Regression risk in tests** that previously asserted ring-based row classes. - No breaking API changes expected; behavior change is primarily visual/interaction-level and intentional. Reviewed-on: https://git.local-it.org/local-it/mitgliederverwaltung/pulls/493 Co-authored-by: Simon Co-committed-by: Simon --- CHANGELOG.md | 6 + CODE_GUIDELINES.md | 3 +- DESIGN_GUIDELINES.md | 4 +- assets/css/app.css | 65 ++++++ docs/smtp-configuration-concept.md | 14 +- lib/mv/config.ex | 130 ++++++++---- lib/mv_web/components/core_components.ex | 66 +++--- lib/mv_web/live/global_settings_live.ex | 122 +++++------ lib/mv_web/live/member_live/index.html.heex | 2 + priv/gettext/de/LC_MESSAGES/default.po | 40 +--- priv/gettext/default.pot | 40 +--- priv/gettext/en/LC_MESSAGES/default.po | 40 +--- test/mv/config_smtp_test.exs | 30 ++- .../components/core_components_table_test.exs | 192 +++++++++++++++++- .../mv_web/live/global_settings_live_test.exs | 95 ++++++++- test/mv_web/member_live/index_test.exs | 44 +++- 16 files changed, 635 insertions(+), 258 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c17ea39..e21f4a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed +- **Clickable table row highlights** – The new hover/focus-visible row highlight behavior is now the CoreComponents default across clickable tables. Sticky-first-column tables keep zebra striping and show selection through the sticky-column accent stripe (checkboxes keep their default style). +- **Members overview scrolling** – The members table scrollbar now scrolls inside the table container instead of moving with the full page. - **Join request display and settings workflow** – Improved join request rendering and related settings behavior in one cohesive update: - Join request fields now respect their configured field types in the details view. - Custom field labels in join request views were standardized. @@ -17,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - **Runtime ENV handling** – Empty or invalid environment variables (e.g. `SMTP_PORT=`, `PORT=`, `POOL_SIZE=`, `DATABASE_PORT=`) no longer cause `ArgumentError` at boot. Instead raises clear errors for required vars set but empty (e.g. DATABASE_HOST, PHX_HOST/DOMAIN, SECRET_KEY_BASE). - **PostgreSQL 18 Docker volume path** – Corrected the database volume path to match PostgreSQL 18 expectations. +- **Association name ENV handling** – `ASSOCIATION_NAME` is now treated as source of truth; the field is read-only in Global Settings when managed via ENV. +- **Association name consistency after updates** – Layout now prefers explicitly assigned `club_name` values to avoid stale cached values right after settings changes. +- **SMTP ENV/UI source selection** – SMTP now follows a strict single-source policy: ENV-only when `SMTP_HOST` is set, otherwise Settings-only. +- **SMTP settings UI in ENV mode** – SMTP fields are read-only, save action is hidden, and missing required ENV keys are shown as a warning. ### Dependency updates - Mix dependencies were updated. diff --git a/CODE_GUIDELINES.md b/CODE_GUIDELINES.md index 0d478f9..2b378ef 100644 --- a/CODE_GUIDELINES.md +++ b/CODE_GUIDELINES.md @@ -1277,7 +1277,8 @@ mix hex.outdated **SMTP configuration:** -- SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`). ENV takes priority (same pattern as OIDC/Vereinfacht). +- SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`). +- **ENV-only policy:** If `SMTP_HOST` is set, SMTP is treated as environment-managed only. All SMTP fields in Settings are read-only, SMTP save action is hidden, and the UI shows a warning when required ENV values are missing (`SMTP_USERNAME`, and `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`). This keeps one source of truth for transport credentials and avoids mixed ENV/DB SMTP states. - **Sensitive settings in DB:** `smtp_password` and `oidc_client_secret` are excluded from the default read of the Setting resource; they are loaded only via explicit select when needed (e.g. `Mv.Config.smtp_password/0`, `Mv.Config.oidc_client_secret/0`). This avoids exposing secrets through `get_settings()`. - **Settings cache:** `Mv.Membership.get_settings/0` uses `Mv.Membership.SettingsCache` when the cache process is running (not in test). Cache has a short TTL and is invalidated on every settings update. This avoids repeated DB reads on hot paths (e.g. `RegistrationEnabled` validation, `Layouts.public_page`). In test, the cache is not started so all callers use `get_settings_uncached/0` in the test process (Ecto Sandbox). - **Join emails (domain → web):** The domain calls `Mv.Membership.JoinNotifier` (config `:join_notifier`, default `MvWeb.JoinNotifierImpl`) for sending join confirmation, already-member, and already-pending emails. This keeps the domain independent of the web layer; tests can override the notifier. diff --git a/DESIGN_GUIDELINES.md b/DESIGN_GUIDELINES.md index 0ad562e..34c71b8 100644 --- a/DESIGN_GUIDELINES.md +++ b/DESIGN_GUIDELINES.md @@ -247,11 +247,13 @@ If these cannot be met, use `secondary`/`outline` instead of `ghost`. ### 8.1 Default behavior: row click opens details - **DEFAULT:** Clicking a row navigates to the details page. - **EXCEPTIONS:** Highly interactive rows may disable row-click (document why). -- **Row outline (CoreComponents):** When `row_click` is set, rows get a subtle hover and focus-within ring (theme-friendly). Use `selected_row_id` to show a stronger selected outline (e.g. from URL `?highlight=id` or last selection); the Back link from detail can use `?highlight=id` so the row is visually selected when returning to the index. +- **Row highlight (CoreComponents):** When `row_click` is set, rows use a neutral background highlight on `hover` and `tr:has(:focus-visible)` (see `assets/css/app.css`), so keyboard focus is visible while mouse-only focus does not appear "stuck". For non-sticky tables, `selected_row_id` can still add a stronger selected ring. For sticky-first-column tables, selection emphasis is handled by the sticky-column accent stripe. **IMPORTANT (correctness with our `<.table>` CoreComponent):** Our table implementation attaches the `phx-click` to the **``** when `row_click` is set. That means click events bubble from inner elements up to the cell unless we stop propagation. +**LiveStream rows:** Do not enumerate `@rows` with `Enum.with_index` in the table template; streams must be consumed only through `:for`. Sticky-first-column zebra striping for those tables is handled in CSS (`nth-child` under `data-sticky-first-col-rows`), not by assigning odd/even classes from an index. + So, for interactive elements inside a clickable row, you must **stop propagation using `Phoenix.LiveView.JS.stop_propagation/1`**, not a custom attribute. ✅ Correct pattern (one click handler that both stops propagation and triggers an event): diff --git a/assets/css/app.css b/assets/css/app.css index d7f873c..611e9ad 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -708,3 +708,68 @@ background-color: transparent !important; color: inherit; } + +/* + * Default interactive table rows: neutral hover/focus-visible fill for clickable rows. + * Uses :has(:focus-visible) so keyboard navigation highlights the row without sticky mouse-focus artifacts. + */ +.table.table-zebra tbody tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible)) > td { + background-color: var(--color-base-300); +} + +/* + * Sticky first column in zebra tables: opaque backgrounds per row. + * Use nth-child (not HEEx row index) so LiveStream rows stay iterable only via :for (Phoenix LV requirement). + */ +[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr:nth-child(odd) > td.sticky-first-col-cell { + background-color: var(--color-base-100); +} + +[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr:nth-child(even) > td.sticky-first-col-cell { + background-color: var(--color-base-200); +} + +/* + * Checkbox-selected rows: keep zebra backgrounds; only accent the sticky checkbox column. + */ +[data-sticky-first-col-rows="true"] + .table.table-zebra + tbody + tr[data-selected="true"] + > td.sticky-first-col-cell { + box-shadow: inset 2px 0 0 var(--color-primary); +} + +[data-sticky-first-col-rows="true"] + .table.table-zebra + tbody + tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible)) + > td.sticky-first-col-cell { + background-color: var(--color-base-300); + /* Left accent only; keep the familiar orange primary accent. */ + box-shadow: inset 2px 0 0 var(--color-primary); +} + +/* + * Sticky member selection table: drop mouse-only focus outlines that read like a thin frame around the row; + * keyboard :focus-visible keeps DaisyUI control outlines (checkbox / tabindex cell). + */ +[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr { + outline: none; +} + +[data-sticky-first-col-rows="true"] + .table.table-zebra + tbody + tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible)):not(:last-child) { + /* DaisyUI draws a bottom border on each row; hiding it while highlighted avoids a boxy “frame”. */ + border-bottom-color: transparent; +} + +[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr td:focus:not(:focus-visible) { + outline: none; +} + +[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr input.checkbox:focus:not(:focus-visible) { + outline: none; +} diff --git a/docs/smtp-configuration-concept.md b/docs/smtp-configuration-concept.md index 4ae7760..b19f6e4 100644 --- a/docs/smtp-configuration-concept.md +++ b/docs/smtp-configuration-concept.md @@ -25,7 +25,11 @@ Enable configurable SMTP for sending transactional emails (join confirmation, us | ENV | 1 | Production, Docker, 12-factor | | Settings | 2 | Admin UI, dev without ENV | -When an ENV variable is set, the corresponding Settings field is read-only in the UI (with hint "Set by environment"). +When `SMTP_HOST` is set, SMTP runs in **ENV-only mode**: +- all SMTP fields in Settings are read-only, +- saving SMTP settings in the UI is disabled, +- and the UI shows a warning block if required SMTP ENV values are missing. +- the UI displays the effective ENV-driven SMTP values in disabled fields so admins can verify what is active. --- @@ -63,6 +67,14 @@ Support **SMTP_PASSWORD_FILE** (path to file containing the password), same patt - Show a warning in the Settings UI. - Delivery attempts silently fall back to the Local adapter (no crash). +### 6.1 Behaviour in ENV-only mode (`SMTP_HOST` set) + +- The SMTP source of truth is environment variables only. +- The UI does not allow editing SMTP fields in this mode. +- The Settings page shows a warning block when required values are missing: + - `SMTP_USERNAME` + - `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE` + --- ## 7. Test Email (Settings UI) diff --git a/lib/mv/config.ex b/lib/mv/config.ex index 3494937..870d1d3 100644 --- a/lib/mv/config.ex +++ b/lib/mv/config.ex @@ -470,56 +470,77 @@ defmodule Mv.Config do # --------------------------------------------------------------------------- @doc """ - Returns SMTP host. ENV `SMTP_HOST` overrides Settings. + Returns SMTP host. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_HOST` + - Settings mode: read from Settings only """ @spec smtp_host() :: String.t() | nil def smtp_host do - smtp_env_or_setting("SMTP_HOST", :smtp_host) - end - - @doc """ - Returns SMTP port as integer. ENV `SMTP_PORT` (parsed) overrides Settings. - Returns nil when neither ENV nor Settings provide a valid port. - """ - @spec smtp_port() :: non_neg_integer() | nil - def smtp_port do - case System.get_env("SMTP_PORT") do - nil -> - get_from_settings_integer(:smtp_port) - - value when is_binary(value) -> - case Integer.parse(String.trim(value)) do - {port, _} when port > 0 -> port - _ -> nil - end + if smtp_env_mode?() do + System.get_env("SMTP_HOST") |> trim_nil() + else + get_from_settings(:smtp_host) end end @doc """ - Returns SMTP username. ENV `SMTP_USERNAME` overrides Settings. + Returns SMTP port as integer. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_PORT` + - Settings mode: read from Settings only + """ + @spec smtp_port() :: non_neg_integer() | nil + def smtp_port do + if smtp_env_mode?() do + parse_smtp_port_env(System.get_env("SMTP_PORT")) + else + get_from_settings_integer(:smtp_port) + end + end + + @doc """ + Returns SMTP username. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_USERNAME` + - Settings mode: read from Settings only """ @spec smtp_username() :: String.t() | nil def smtp_username do - smtp_env_or_setting("SMTP_USERNAME", :smtp_username) + if smtp_env_mode?() do + System.get_env("SMTP_USERNAME") |> trim_nil() + else + get_from_settings(:smtp_username) + end end @doc """ Returns SMTP password. - Priority: `SMTP_PASSWORD` ENV > `SMTP_PASSWORD_FILE` (file contents) > Settings. + Policy: + - ENV-only mode (`SMTP_HOST` set): `SMTP_PASSWORD` > `SMTP_PASSWORD_FILE` + - Settings mode: read from Settings only + Strips trailing whitespace/newlines from file contents. """ @spec smtp_password() :: String.t() | nil def smtp_password do - case System.get_env("SMTP_PASSWORD") do - nil -> smtp_password_from_file_or_settings() - value -> trim_nil(value) + if smtp_env_mode?() do + case System.get_env("SMTP_PASSWORD") do + nil -> smtp_password_from_file() + value -> trim_nil(value) + end + else + get_smtp_password_from_settings() end end - defp smtp_password_from_file_or_settings do + defp smtp_password_from_file do case System.get_env("SMTP_PASSWORD_FILE") do - nil -> get_smtp_password_from_settings() + nil -> nil path -> read_smtp_password_file(path) end end @@ -533,11 +554,18 @@ defmodule Mv.Config do @doc """ Returns SMTP TLS/SSL mode string (e.g. 'tls', 'ssl', 'none'). - ENV `SMTP_SSL` overrides Settings. + + Policy: + - ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_SSL` + - Settings mode: read from Settings only """ @spec smtp_ssl() :: String.t() | nil def smtp_ssl do - smtp_env_or_setting("SMTP_SSL", :smtp_ssl) + if smtp_env_mode?() do + System.get_env("SMTP_SSL") |> trim_nil() + else + get_from_settings(:smtp_ssl) + end end @doc """ @@ -549,12 +577,32 @@ defmodule Mv.Config do end @doc """ - Returns true when any SMTP ENV variable is set (used in Settings UI for hints). + Returns true when SMTP is managed by environment variables. + + Policy: if `SMTP_HOST` is set, SMTP is treated as ENV-only. """ - @spec smtp_env_configured?() :: boolean() - def smtp_env_configured? do - smtp_host_env_set?() or smtp_port_env_set?() or smtp_username_env_set?() or - smtp_password_env_set?() or smtp_ssl_env_set?() + @spec smtp_env_mode?() :: boolean() + def smtp_env_mode? do + smtp_host_env_set?() + end + + @doc """ + Returns missing required SMTP ENV keys for ENV-only mode warnings. + + Required in ENV-only mode: + - `SMTP_USERNAME` + - one of `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE` + """ + @spec smtp_missing_required_env_keys() :: [String.t()] + def smtp_missing_required_env_keys do + if smtp_env_mode?() do + [] + |> maybe_add_missing("SMTP_USERNAME", smtp_username_env_set?()) + |> maybe_add_missing("SMTP_PASSWORD/SMTP_PASSWORD_FILE", smtp_password_env_set?()) + |> Enum.reverse() + else + [] + end end @doc "Returns true if SMTP_HOST ENV is set." @@ -618,14 +666,18 @@ defmodule Mv.Config do @spec mail_from_email_env_set?() :: boolean() def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL") - # Reads a plain string SMTP setting: ENV first, then Settings. - defp smtp_env_or_setting(env_key, setting_key) do - case System.get_env(env_key) do - nil -> get_from_settings(setting_key) - value -> trim_nil(value) + defp parse_smtp_port_env(value) when is_binary(value) do + case Integer.parse(String.trim(value)) do + {port, _} when port > 0 -> port + _ -> nil end end + defp parse_smtp_port_env(_), do: nil + + defp maybe_add_missing(acc, _label, true), do: acc + defp maybe_add_missing(acc, label, false), do: [label | acc] + # Reads an integer setting attribute from Settings. defp get_from_settings_integer(key) do case Mv.Membership.get_settings() do diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index b5bd763..465d41a 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -938,6 +938,16 @@ defmodule MvWeb.CoreComponents do doc: "when true, thead th get lg:sticky lg:top-0 bg-base-100 z-10 for use inside a scroll container on desktop" + attr :wrapper_overflow_class, :string, + default: "overflow-x-auto", + doc: + "overflow class for the table wrapper; set to overflow-visible when outer container owns scrolling" + + attr :sticky_first_col, :boolean, + default: false, + doc: + "when true, first header/body column gets sticky left positioning to keep selection controls visible" + slot :col, required: true do attr :label, :string attr :class, :string @@ -974,15 +984,19 @@ defmodule MvWeb.CoreComponents do ~H"""
@@ -1026,6 +1046,13 @@ defmodule MvWeb.CoreComponents do has_click = col[:col_click] || @row_click classes = ["max-w-xs"] + classes = + if @sticky_first_col && col_idx == 0 do + ["sticky-first-col-cell sticky left-0 z-20" | classes] + else + classes + end + classes = if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do ["truncate" | classes] @@ -1040,7 +1067,7 @@ defmodule MvWeb.CoreComponents do classes end - # WCAG: no focus ring on the cell itself; row shows focus via focus-within + # WCAG: no focus ring on the cell itself; sticky zebra rows show keyboard focus via CSS :has(:focus-visible) classes = if @row_click && @first_row_click_col_idx == col_idx do [ @@ -1111,30 +1138,11 @@ defmodule MvWeb.CoreComponents do end end - # Returns CSS classes for table row: hover/focus-within outline when row_click is set, - # and stronger selected outline when selected (WCAG: not color-only). - # Hover/focus-within are omitted for the selected row so the selected ring stays visible. - defp table_row_tr_class(row_click, selected?) do - has_row_click? = not is_nil(row_click) - base = [] - - base = - if has_row_click? and not selected?, - do: - base ++ - [ - "hover:ring-2", - "hover:ring-inset", - "hover:ring-base-content/10", - "focus-within:ring-2", - "focus-within:ring-inset", - "focus-within:ring-base-content/10" - ], - else: base - - base = if selected?, do: base ++ ["ring-2", "ring-inset", "ring-primary"], else: base - Enum.join(base, " ") - end + # Returns CSS classes for table row selection styles. + # Hover/focus row highlighting is CSS-driven via [data-row-interactive] selectors in app.css. + # Sticky-first-column zebra tables use CSS accents and omit selected row ring classes. + defp table_row_tr_class(true, false), do: "ring-2 ring-inset ring-primary" + defp table_row_tr_class(_, _), do: "" defp table_th_aria_sort(col, sort_field, sort_order) do col_sort = Map.get(col, :sort_field) diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 43851db..6a1c926 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -85,14 +85,8 @@ defmodule MvWeb.GlobalSettingsLive do |> assign(:oidc_configured, Mv.Config.oidc_configured?()) |> assign(:oidc_client_secret_set, Mv.Config.oidc_client_secret_set?()) |> assign(:registration_enabled, settings.registration_enabled != false) - |> assign(:smtp_env_configured, Mv.Config.smtp_env_configured?()) - |> assign(:smtp_host_env_set, Mv.Config.smtp_host_env_set?()) - |> assign(:smtp_port_env_set, Mv.Config.smtp_port_env_set?()) - |> assign(:smtp_username_env_set, Mv.Config.smtp_username_env_set?()) - |> assign(:smtp_password_env_set, Mv.Config.smtp_password_env_set?()) - |> assign(:smtp_ssl_env_set, Mv.Config.smtp_ssl_env_set?()) - |> assign(:smtp_from_name_env_set, Mv.Config.mail_from_name_env_set?()) - |> assign(:smtp_from_email_env_set, Mv.Config.mail_from_email_env_set?()) + |> assign(:smtp_env_mode, Mv.Config.smtp_env_mode?()) + |> assign(:smtp_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys()) |> assign(:smtp_password_set, present?(Mv.Config.smtp_password())) |> assign(:smtp_configured, Mv.Config.smtp_configured?()) |> assign(:smtp_test_result, nil) @@ -321,12 +315,25 @@ defmodule MvWeb.GlobalSettingsLive do <%!-- SMTP / E-Mail Section --%> <.form_section title={gettext("SMTP / E-Mail")}> - <%= if @smtp_env_configured do %> + <%= if @smtp_env_mode do %>

- {gettext("Some values are set via environment variables. Those fields are read-only.")} + {gettext( + "SMTP is fully managed via environment variables. All SMTP fields are read-only." + )}

<% end %> + <%= if @smtp_env_mode and @smtp_missing_required_env_keys != [] do %> +
+ <.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" /> + + {gettext("SMTP environment configuration appears incomplete. Missing: %{keys}", + keys: Enum.join(@smtp_missing_required_env_keys, ", ") + )} + +
+ <% end %> + <%= if @environment == :prod and not @smtp_configured do %>
<.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" /> @@ -345,32 +352,26 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_host]} type="text" label={gettext("Host")} - disabled={@smtp_host_env_set} - placeholder={ - if(@smtp_host_env_set, - do: gettext("From SMTP_HOST"), - else: "smtp.example.com" - ) - } + disabled={@smtp_env_mode} + placeholder="smtp.example.com" /> <.input field={@form[:smtp_port]} type="number" label={gettext("Port")} - disabled={@smtp_port_env_set} - placeholder={if(@smtp_port_env_set, do: gettext("From SMTP_PORT"), else: "587")} + disabled={@smtp_env_mode} + placeholder="587" /> <.input field={@form[:smtp_ssl]} type="select" label={gettext("TLS/SSL")} - disabled={@smtp_ssl_env_set} + disabled={@smtp_env_mode} options={[ {gettext("TLS (port 587, recommended)"), "tls"}, {gettext("SSL (port 465)"), "ssl"}, {gettext("None (port 25, insecure)"), "none"} ]} - placeholder={if(@smtp_ssl_env_set, do: gettext("From SMTP_SSL"), else: nil)} />
@@ -379,28 +380,20 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_username]} type="text" label={gettext("Username")} - disabled={@smtp_username_env_set} - placeholder={ - if(@smtp_username_env_set, - do: gettext("From SMTP_USERNAME"), - else: "user@example.com" - ) - } + disabled={@smtp_env_mode} + placeholder="user@example.com" /> <.input field={@form[:smtp_password]} type="password" label={gettext("Password")} - disabled={@smtp_password_env_set} + disabled={@smtp_env_mode} placeholder={ - if(@smtp_password_env_set, - do: gettext("From SMTP_PASSWORD"), - else: - if(@smtp_password_set, - do: gettext("Leave blank to keep current"), - else: nil - ) - ) + if @smtp_env_mode do + gettext("From SMTP_PASSWORD") + else + if @smtp_password_set, do: gettext("Leave blank to keep current"), else: nil + end } /> @@ -410,22 +403,15 @@ defmodule MvWeb.GlobalSettingsLive do field={@form[:smtp_from_email]} type="email" label={gettext("Sender email (From)")} - disabled={@smtp_from_email_env_set} - placeholder={ - if(@smtp_from_email_env_set, - do: gettext("From MAIL_FROM_EMAIL"), - else: "noreply@example.com" - ) - } + disabled={@smtp_env_mode} + placeholder="noreply@example.com" /> <.input field={@form[:smtp_from_name]} type="text" label={gettext("Sender name (From)")} - disabled={@smtp_from_name_env_set} - placeholder={ - if(@smtp_from_name_env_set, do: gettext("From MAIL_FROM_NAME"), else: "Mila") - } + disabled={@smtp_env_mode} + placeholder="Mila" /> @@ -435,11 +421,7 @@ defmodule MvWeb.GlobalSettingsLive do )}

<.button - :if={ - not (@smtp_host_env_set and @smtp_port_env_set and @smtp_username_env_set and - @smtp_password_env_set and @smtp_ssl_env_set and @smtp_from_email_env_set and - @smtp_from_name_env_set) - } + :if={not @smtp_env_mode} phx-disable-with={gettext("Saving...")} variant="primary" class="mt-2" @@ -925,9 +907,9 @@ defmodule MvWeb.GlobalSettingsLive do |> assign(:oidc_only, Mv.Config.oidc_only?()) |> assign(:oidc_configured, Mv.Config.oidc_configured?()) |> assign(:smtp_configured, Mv.Config.smtp_configured?()) + |> assign(:smtp_env_mode, Mv.Config.smtp_env_mode?()) + |> assign(:smtp_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys()) |> assign(:smtp_password_set, present?(Mv.Config.smtp_password())) - |> assign(:smtp_from_name_env_set, Mv.Config.mail_from_name_env_set?()) - |> assign(:smtp_from_email_env_set, Mv.Config.mail_from_email_env_set?()) |> assign(:vereinfacht_test_result, test_result) |> put_flash(:success, gettext("Settings updated successfully")) |> assign_form() @@ -1267,25 +1249,17 @@ defmodule MvWeb.GlobalSettingsLive do end defp merge_smtp_env_values(s) do - s - |> put_if_env_set(:smtp_host, Mv.Config.smtp_host_env_set?(), Mv.Config.smtp_host()) - |> put_if_env_set(:smtp_port, Mv.Config.smtp_port_env_set?(), Mv.Config.smtp_port()) - |> put_if_env_set( - :smtp_username, - Mv.Config.smtp_username_env_set?(), - Mv.Config.smtp_username() - ) - |> put_if_env_set(:smtp_ssl, Mv.Config.smtp_ssl_env_set?(), Mv.Config.smtp_ssl()) - |> put_if_env_set( - :smtp_from_email, - Mv.Config.mail_from_email_env_set?(), - Mv.Config.mail_from_email() - ) - |> put_if_env_set( - :smtp_from_name, - Mv.Config.mail_from_name_env_set?(), - Mv.Config.mail_from_name() - ) + if Mv.Config.smtp_env_mode?() do + s + |> Map.put(:smtp_host, Mv.Config.smtp_host()) + |> Map.put(:smtp_port, Mv.Config.smtp_port()) + |> Map.put(:smtp_username, Mv.Config.smtp_username()) + |> Map.put(:smtp_ssl, Mv.Config.smtp_ssl()) + |> Map.put(:smtp_from_email, Mv.Config.mail_from_email()) + |> Map.put(:smtp_from_name, Mv.Config.mail_from_name()) + else + s + end end defp enrich_sync_errors([]), do: [] diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 4d86a62..efc1eb7 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -105,7 +105,9 @@ <.table id="members" rows={@members} + wrapper_overflow_class="overflow-visible" sticky_header={true} + sticky_first_col={true} row_id={fn member -> "row-#{member.id}" end} row_click={fn member -> JS.push("select_row_and_navigate", value: %{id: member.id}) end} row_tooltip={gettext("Click for member details")} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 52270cc..a85b4cf 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -1384,16 +1384,6 @@ msgstr "Festgelegt nach der Erstellung. Mitglieder können nur zwischen Beitrags msgid "From %{first} to %{last} (relevant years with membership data)" msgstr "Von %{first} bis %{last} (Jahre mit Mitgliederdaten)" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_EMAIL" -msgstr "Aus MAIL_FROM_EMAIL" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_NAME" -msgstr "Aus MAIL_FROM_NAME" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From OIDC_ADMIN_GROUP_NAME" @@ -1429,31 +1419,11 @@ msgstr "Aus OIDC_ONLY" msgid "From OIDC_REDIRECT_URI" msgstr "Aus OIDC_REDIRECT_URI" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_HOST" -msgstr "Von SMTP_HOST" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From SMTP_PASSWORD" msgstr "Von SMTP_PASSWORD" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_PORT" -msgstr "Von SMTP_PORT" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_SSL" -msgstr "Von SMTP_SSL" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_USERNAME" -msgstr "Von SMTP_USERNAME" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From VEREINFACHT_API_KEY" @@ -3917,3 +3887,13 @@ msgstr "Offen" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "Beitrittslink in einem neuen Tab" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "Die SMTP-Umgebungs-Konfiguration ist unvollständig. Fehlend: %{keys}" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "SMTP wird vollständig über Umgebungsvariablen verwaltet. Alle SMTP-Felder sind schreibgeschützt." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5d48691..b995b1a 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -1385,16 +1385,6 @@ msgstr "" msgid "From %{first} to %{last} (relevant years with membership data)" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_EMAIL" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_NAME" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From OIDC_ADMIN_GROUP_NAME" @@ -1430,31 +1420,11 @@ msgstr "" msgid "From OIDC_REDIRECT_URI" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_HOST" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From SMTP_PASSWORD" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_PORT" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_SSL" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_USERNAME" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From VEREINFACHT_API_KEY" @@ -3917,3 +3887,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index ec6f305..f4526d1 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -1385,16 +1385,6 @@ msgstr "" msgid "From %{first} to %{last} (relevant years with membership data)" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_EMAIL" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From MAIL_FROM_NAME" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From OIDC_ADMIN_GROUP_NAME" @@ -1430,31 +1420,11 @@ msgstr "" msgid "From OIDC_REDIRECT_URI" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_HOST" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From SMTP_PASSWORD" msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_PORT" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_SSL" -msgstr "" - -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "From SMTP_USERNAME" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "From VEREINFACHT_API_KEY" @@ -3917,3 +3887,13 @@ msgstr "Open" #, elixir-autogen, elixir-format msgid "join page URL in a new tab" msgstr "join page URL in a new tab" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP environment configuration appears incomplete. Missing: %{keys}" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only." +msgstr "SMTP is fully managed via environment variables. All SMTP fields are read-only." diff --git a/test/mv/config_smtp_test.exs b/test/mv/config_smtp_test.exs index 5359366..ebf2b83 100644 --- a/test/mv/config_smtp_test.exs +++ b/test/mv/config_smtp_test.exs @@ -2,7 +2,7 @@ defmodule Mv.ConfigSmtpTest do @moduledoc """ Unit tests for Mv.Config SMTP-related helpers. - ENV overrides Settings (same pattern as OIDC/Vereinfacht). Uses real ENV and + SMTP uses ENV-only mode when SMTP_HOST is set. Uses real ENV and Settings; no mocking so we test the actual precedence. async: false because we mutate ENV. """ @@ -23,7 +23,8 @@ defmodule Mv.ConfigSmtpTest do end describe "smtp_port/0" do - test "returns parsed integer when SMTP_PORT ENV is set" do + test "returns parsed integer when SMTP_PORT ENV is set in ENV-only mode" do + set_smtp_env("SMTP_HOST", "smtp.example.com") set_smtp_env("SMTP_PORT", "587") assert Mv.Config.smtp_port() == 587 after @@ -51,30 +52,40 @@ defmodule Mv.ConfigSmtpTest do end end - describe "smtp_env_configured?/0" do - test "returns true when any SMTP ENV variable is set" do + describe "smtp_env_mode?/0" do + test "returns true when SMTP_HOST is set" do set_smtp_env("SMTP_HOST", "smtp.example.com") - assert Mv.Config.smtp_env_configured?() == true + assert Mv.Config.smtp_env_mode?() == true + after + clear_smtp_env() + end + + test "returns false when SMTP_HOST is not set even if other SMTP ENV variables are set" do + set_smtp_env("SMTP_USERNAME", "user@example.com") + set_smtp_env("SMTP_PASSWORD", "secret") + refute Mv.Config.smtp_env_mode?() after clear_smtp_env() end test "returns false when no SMTP ENV variables are set" do clear_smtp_env() - refute Mv.Config.smtp_env_configured?() + refute Mv.Config.smtp_env_mode?() end end describe "smtp_password/0 and SMTP_PASSWORD_FILE" do - test "returns value from SMTP_PASSWORD when set" do + test "returns value from SMTP_PASSWORD when set in ENV-only mode" do + set_smtp_env("SMTP_HOST", "smtp.example.com") set_smtp_env("SMTP_PASSWORD", "env-secret") assert Mv.Config.smtp_password() == "env-secret" after clear_smtp_env() end - test "returns content of file when SMTP_PASSWORD_FILE is set and SMTP_PASSWORD is not" do + test "returns content of file when SMTP_PASSWORD_FILE is set in ENV-only mode and SMTP_PASSWORD is not" do clear_smtp_env() + set_smtp_env("SMTP_HOST", "smtp.example.com") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") File.write!(path, "file-secret\n") Process.put(:smtp_password_file_path, path) @@ -85,7 +96,8 @@ defmodule Mv.ConfigSmtpTest do if path = Process.get(:smtp_password_file_path), do: File.rm(path) end - test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE when both are set" do + test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE in ENV-only mode when both are set" do + set_smtp_env("SMTP_HOST", "smtp.example.com") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") File.write!(path, "file-secret") Process.put(:smtp_password_file_path, path) diff --git a/test/mv_web/components/core_components_table_test.exs b/test/mv_web/components/core_components_table_test.exs index 931b42a..03f1f71 100644 --- a/test/mv_web/components/core_components_table_test.exs +++ b/test/mv_web/components/core_components_table_test.exs @@ -9,7 +9,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do alias MvWeb.CoreComponents describe "table row_click styling" do - test "when row_click is set, table rows have hover and focus-within ring classes" do + test "when row_click is set, rows are marked interactive and omit ring hover classes" do rows = [%{id: "1", name: "Alice"}, %{id: "2", name: "Bob"}] assigns = %{ @@ -31,12 +31,12 @@ defmodule MvWeb.Components.CoreComponentsTableTest do html = render_component(&CoreComponents.table/1, assigns) - assert html =~ "hover:ring-2" - assert html =~ "focus-within:ring-2" - assert html =~ "hover:ring-base-content/10" + assert html =~ ~s(data-row-interactive="true") + refute html =~ "hover:ring-2" + refute html =~ "focus-within:ring-2" end - test "when row_click is nil, table rows do not have hover ring classes" do + test "when row_click is nil, rows are not marked interactive" do rows = [%{id: "1", name: "Alice"}] assigns = %{ @@ -58,8 +58,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do html = render_component(&CoreComponents.table/1, assigns) - refute html =~ "hover:ring-2" - refute html =~ "focus-within:ring-2" + refute html =~ ~s(data-row-interactive="true") end end @@ -151,4 +150,183 @@ defmodule MvWeb.Components.CoreComponentsTableTest do assert html =~ "ring-primary" end end + + describe "table scroll wrapper contract" do + test "sticky header table uses horizontal-only overflow wrapper" do + rows = [%{id: "1", name: "Alice"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: nil, + sticky_header: true, + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ ~s(class="overflow-x-auto") + refute html =~ ~s(class="overflow-auto") + end + + test "table wrapper does not enable vertical overflow by default" do + rows = [%{id: "1", name: "Alice"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: nil, + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ ~s(class="overflow-x-auto") + refute html =~ ~s(class="overflow-auto") + end + + test "table wrapper overflow class can be overridden by caller" do + rows = [%{id: "1", name: "Alice"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: nil, + wrapper_overflow_class: "overflow-visible", + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ ~s(class="overflow-visible") + refute html =~ ~s(class="overflow-x-auto") + end + end + + describe "sticky first column contract" do + test "when sticky_first_col is enabled, first header and body cells render sticky-left classes" do + rows = [%{id: "1", selected: true, name: "Alice"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: nil, + sticky_first_col: true, + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Select", + inner_block: fn _socket, item -> [if(item[:selected], do: "x", else: "")] end + }, + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ "sticky" + assert html =~ "left-0" + assert html =~ "z-20" + assert html =~ "z-30" + end + + test "sticky first column marks wrapper and uses CSS row backgrounds instead of row ring classes" do + rows = [%{id: "1", name: "Alice"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: fn _ -> nil end, + sticky_first_col: true, + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Select", + inner_block: fn _socket, _item -> ["x"] end + }, + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ ~s(data-sticky-first-col-rows="true") + assert html =~ "sticky-first-col-cell" + refute html =~ "hover:ring-2" + end + + test "sticky first column with selection sets data-selected without ring-primary" do + rows = [%{id: "one", name: "Alice"}, %{id: "two", name: "Bob"}] + + assigns = %{ + id: "test-table", + rows: rows, + row_id: fn r -> "row-#{r.id}" end, + row_click: fn _ -> nil end, + sticky_first_col: true, + selected_row_id: "two", + row_item: &Function.identity/1, + col: [ + %{ + __slot__: :col, + label: "Name", + inner_block: fn _socket, item -> [item[:name] || ""] end + } + ], + dynamic_cols: [], + action: [] + } + + html = render_component(&CoreComponents.table/1, assigns) + + assert html =~ ~s(data-selected="true") + refute html =~ "ring-primary" + end + end end diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 2edaf74..9be12b9 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -1,8 +1,22 @@ defmodule MvWeb.GlobalSettingsLiveTest do - use MvWeb.ConnCase, async: true + use MvWeb.ConnCase, async: false import Phoenix.LiveViewTest alias Mv.Membership + defp clear_smtp_env do + [ + "SMTP_HOST", + "SMTP_PORT", + "SMTP_SSL", + "SMTP_USERNAME", + "SMTP_PASSWORD", + "SMTP_PASSWORD_FILE", + "MAIL_FROM_EMAIL", + "MAIL_FROM_NAME" + ] + |> Enum.each(&System.delete_env/1) + end + describe "Global Settings LiveView" do setup %{conn: conn} do user = create_test_user(%{email: "admin@example.com"}) @@ -124,6 +138,85 @@ defmodule MvWeb.GlobalSettingsLiveTest do {:ok, _view, html} = live(conn, ~p"/settings") assert html =~ "SMTP" or html =~ "E-Mail" or html =~ "Settings" end + + @tag :ui + test "disables all SMTP inputs when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + + assert has_element?(view, "#setting_smtp_host[disabled]") + assert has_element?(view, "#setting_smtp_port[disabled]") + assert has_element?(view, "#setting_smtp_ssl[disabled]") + assert has_element?(view, "#setting_smtp_username[disabled]") + assert has_element?(view, "#setting_smtp_password[disabled]") + assert has_element?(view, "#setting_smtp_from_email[disabled]") + assert has_element?(view, "#setting_smtp_from_name[disabled]") + end + + @tag :ui + test "does not render SMTP save action when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, _html} = live(conn, ~p"/settings") + refute has_element?(view, "#smtp-form button", "Save SMTP Settings") + end + + @tag :ui + test "shows explicit ENV-only mode hint when SMTP_HOST is set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, _view, html} = live(conn, ~p"/settings") + assert html =~ "SMTP is fully managed via environment variables" + end + + @tag :ui + test "shows warning block for missing required SMTP ENV values in ENV-only mode", %{ + conn: conn + } do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-only.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, _view, html} = live(conn, ~p"/settings") + assert html =~ "SMTP environment configuration appears incomplete" + assert html =~ "SMTP_USERNAME" + assert html =~ "SMTP_PASSWORD/SMTP_PASSWORD_FILE" + end + + @tag :ui + test "does not enter ENV-only mode when SMTP_HOST is not set", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_USERNAME", "leftover@example.com") + on_exit(fn -> clear_smtp_env() end) + + {:ok, view, html} = live(conn, ~p"/settings") + + refute html =~ "SMTP is fully managed via environment variables" + refute html =~ "SMTP environment configuration appears incomplete" + refute has_element?(view, "#setting_smtp_host[disabled]") + refute has_element?(view, "#setting_smtp_username[disabled]") + end + + @tag :ui + test "shows effective ENV SMTP host value in disabled field", %{conn: conn} do + clear_smtp_env() + System.put_env("SMTP_HOST", "smtp.env-active.example") + on_exit(fn -> clear_smtp_env() end) + + {:ok, settings} = Membership.get_settings() + {:ok, _} = Membership.update_settings(settings, %{smtp_host: "smtp.db-legacy.example"}) + + {:ok, _view, html} = live(conn, ~p"/settings") + assert html =~ ~s(value="smtp.env-active.example") + refute html =~ ~s(value="smtp.db-legacy.example") + end end describe "Authentication section when OIDC-only is enabled" do diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index 686a8e8..85c3385 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -78,6 +78,37 @@ defmodule MvWeb.MemberLive.IndexTest do assert html =~ "lg:top-0" assert html =~ "bg-base-100" end + + test "members page does not nest a second overflow wrapper inside members-table-scroll", %{ + conn: conn + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, ~p"/members") + + assert html =~ ~s(id="members-keyboard") + assert html =~ ~s(class="overflow-visible") + refute html =~ ~s(id="members-keyboard" class="overflow-x-auto") + refute html =~ ~s(id="members-keyboard" class="overflow-auto") + end + + test "members table keeps checkbox column sticky while horizontally scrolling", %{conn: conn} do + system_actor = SystemActor.get_system_actor() + + {:ok, _member} = + Membership.create_member( + %{first_name: "Sticky", last_name: "Column", email: "sticky-column@example.com"}, + actor: system_actor + ) + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, ~p"/members") + + # Contract: first column (select-all header + row checkbox cells) is sticky on the left + assert html =~ "left-0" + assert html =~ "sticky" + assert html =~ "z-30" + assert html =~ "z-20" + end end describe "translations" do @@ -339,10 +370,12 @@ defmodule MvWeb.MemberLive.IndexTest do assert_redirect(view, ~p"/members/#{member}") end - describe "table row outline (hover and selected)" do + describe "table row highlight (hover and selected)" do @describetag :ui - test "clickable rows have hover and focus-within ring classes", %{conn: conn} do + test "clickable rows with sticky first column use hover/focus background highlight", %{ + conn: conn + } do system_actor = SystemActor.get_system_actor() {:ok, _member} = @@ -354,10 +387,9 @@ defmodule MvWeb.MemberLive.IndexTest do conn = conn_with_oidc_user(conn) {:ok, _view, html} = live(conn, "/members") - # CoreComponents table adds hover and focus-within ring when row_click is set - assert html =~ "hover:ring-2" - assert html =~ "focus-within:ring-2" - assert html =~ "hover:ring-base-content/10" + # Sticky-first-column tables: hover/focus fills live in CSS; wrapper is marked for tests. + assert html =~ ~s(data-sticky-first-col-rows="true") + refute html =~ "hover:ring-2" end test "selected outline only from checkbox selection, not from highlight param", %{conn: conn} do From efb9faf5377162b684d2996bccdba9147d08fd61 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 8 May 2026 15:20:18 +0200 Subject: [PATCH 16/22] CHANGELOG.md aktualisiert --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e21f4a8..8c8032c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.2.0] - 2026-05-08 ### Changed - **Clickable table row highlights** – The new hover/focus-visible row highlight behavior is now the CoreComponents default across clickable tables. Sticky-first-column tables keep zebra striping and show selection through the sticky-column accent stripe (checkboxes keep their default style). From fb59ef99c1bd97418aebdfa13750b2fe6bdfd4b4 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 12 May 2026 23:14:44 +0200 Subject: [PATCH 17/22] Accept future join dates: remove past-only validation and update tests --- lib/membership/member.ex | 5 ----- test/membership/member_test.exs | 37 ++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 4e85fa8..f87c468 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -473,11 +473,6 @@ defmodule Mv.Membership.Member do end end - # Join date not in future - validate compare(:join_date, less_than_or_equal_to: &Date.utc_today/0), - where: [present(:join_date)], - message: "cannot be in the future" - # Exit date not before join date validate compare(:exit_date, greater_than: :join_date), where: [present([:join_date, :exit_date])], diff --git a/test/membership/member_test.exs b/test/membership/member_test.exs index ca4d022..5e30da6 100644 --- a/test/membership/member_test.exs +++ b/test/membership/member_test.exs @@ -49,12 +49,43 @@ defmodule Mv.Membership.MemberTest do assert error_message(errors, :email) =~ "is not a valid email" end - test "Join date cannot be in the future", %{actor: actor} do + test "Join date can be in the future", %{actor: actor} do attrs = Map.put(@valid_attrs, :join_date, Date.utc_today() |> Date.add(1)) - assert {:error, - %Ash.Error.Invalid{errors: [%Ash.Error.Changes.InvalidAttribute{field: :join_date}]}} = + assert {:ok, _member} = Membership.create_member(attrs, actor: actor) + end + + test "Join date far in the future (2099) is accepted", %{actor: actor} do + attrs = Map.put(@valid_attrs, :join_date, ~D[2099-12-31]) + + assert {:ok, _member} = Membership.create_member(attrs, actor: actor) + end + + test "Join date today is accepted", %{actor: actor} do + attrs = Map.put(@valid_attrs, :join_date, Date.utc_today()) + + assert {:ok, _member} = Membership.create_member(attrs, actor: actor) + end + + test "Join date in the future is accepted on update", %{actor: actor} do + {:ok, member} = Membership.create_member(@valid_attrs, actor: actor) + + assert {:ok, _updated} = + Membership.update_member(member, %{join_date: Date.utc_today() |> Date.add(30)}, + actor: actor + ) + end + + test "Exit date before future join date is rejected", %{actor: actor} do + attrs = + @valid_attrs + |> Map.put(:join_date, Date.utc_today() |> Date.add(10)) + |> Map.put(:exit_date, Date.utc_today() |> Date.add(5)) + + assert {:error, %Ash.Error.Invalid{errors: errors}} = Membership.create_member(attrs, actor: actor) + + assert error_message(errors, :exit_date) =~ "cannot be before join date" end test "Exit date is optional but must not be before join date if both are specified", %{ From 8062b2fd275ff272a0da54398e89f257e46e48c2 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 12 May 2026 23:16:31 +0200 Subject: [PATCH 18/22] Remove stale documentation of removed join_date future-date restriction --- docs/database-schema-readme.md | 1 - docs/database_schema.dbml | 3 +-- lib/membership/member.ex | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/database-schema-readme.md b/docs/database-schema-readme.md index f58cbea..fa6ea55 100644 --- a/docs/database-schema-readme.md +++ b/docs/database-schema-readme.md @@ -188,7 +188,6 @@ Settings (1) → MembershipFeeType (0..1) ### Member Constraints - First name and last name required (min 1 char) - Email unique, validated format (5-254 chars) -- Join date cannot be in future - Exit date must be after join date - Phone: `+?[0-9\- ]{6,20}` - Postal code: optional (no format validation) diff --git a/docs/database_schema.dbml b/docs/database_schema.dbml index 61da063..16c9723 100644 --- a/docs/database_schema.dbml +++ b/docs/database_schema.dbml @@ -124,7 +124,7 @@ Table members { first_name text [null, note: 'Member first name (min length: 1 if present)'] last_name text [null, note: 'Member last name (min length: 1 if present)'] email text [not null, unique, note: 'Member email address (5-254 chars, validated)'] - join_date date [null, note: 'Date when member joined club (cannot be in future)'] + join_date date [null, note: 'Date when member joined club'] exit_date date [null, note: 'Date when member left club (must be after join_date)'] notes text [null, note: 'Additional notes about member'] city text [null, note: 'City of residence'] @@ -187,7 +187,6 @@ Table members { **Validation Rules:** - first_name, last_name: optional, but if present min 1 character - email: 5-254 characters, valid email format (required) - - join_date: cannot be in future - exit_date: must be after join_date (if both present) - postal_code: optional (no format validation) - country: optional diff --git a/lib/membership/member.ex b/lib/membership/member.ex index f87c468..85f5562 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -22,7 +22,7 @@ defmodule Mv.Membership.Member do ## Validations - Required: email (all other fields are optional) - Email format validation (using EctoCommons.EmailValidator) - - Date validations: join_date not in future, exit_date after join_date + - Date validations: exit_date after join_date - Email uniqueness: prevents conflicts with unlinked users - Linked member email change: only admins or the linked user may change a linked member's email (see `Mv.Membership.Member.Validations.EmailChangePermission`) From ca1600d019a18c86a548255a9735374407c821a7 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 13 May 2026 00:25:25 +0200 Subject: [PATCH 19/22] chore(deps): update decimal --- mix.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.lock b/mix.lock index 7c5b125..a1e9298 100644 --- a/mix.lock +++ b/mix.lock @@ -22,7 +22,7 @@ "credo": {:hex, :credo, "1.7.18", "5c5596bf7aedf9c8c227f13272ac499fe8eae6237bd326f2f07dfc173786f042", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a189d164685fd945809e862fe76a7420c4398fa288d76257662aecb909d6b3e5"}, "crux": {:hex, :crux, "0.1.2", "4441c9e3a34f1e340954ce96b9ad5a2de13ceb4f97b3f910211227bb92e2ca90", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "563ea3748ebfba9cc078e6d198a1d6a06015a8fae503f0b721363139f0ddb350"}, "db_connection": {:hex, :db_connection, "2.10.0", "8ff756471e41765bd5563b633f73e9a94bbc138816e8644bb17d0d91bf260a95", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02cdd01b45efb1b550e68edbbea41be32de9b24bb07e1ea0e9cbc522ac377e54"}, - "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"}, + "decimal": {:hex, :decimal, "3.1.0", "9ede268cff827e6f0c4fb1b34747c82630dce5d7b877dfb22ec8f0cb25855fce", [:mix], [], "hexpm", "e8b3efb3bb3a13cb5e4268ffe128569067b1972e9dee013537c71a5b073168f9"}, "dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"}, "ecto": {:hex, :ecto, "3.13.6", "352135b474f91d1ab99a1b502171d207e9db60421c9e3d0ecab4c7ab96b24d14", [:mix], [{:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8afa059bc16cd2c94739ec0a11e3e5df69d828125119109bef35f20a21a76af2"}, "ecto_commons": {:hex, :ecto_commons, "0.3.7", "f33c162a6f63695d5939af02c65a0e76aa6e7278b82c7bfc357ffbfea353bf0f", [:mix], [{:burnex, "~> 3.0", [hex: :burnex, repo: "hexpm", optional: true]}, {:ecto, "~> 3.4", [hex: :ecto, repo: "hexpm", optional: false]}, {:ex_phone_number, "~> 0.4", [hex: :ex_phone_number, repo: "hexpm", optional: false]}, {:luhn, "~> 0.3.0", [hex: :luhn, repo: "hexpm", optional: false]}], "hexpm", "9c33771ebd38cd83d3f90fab6069826ba9d4f7580f1481b3c0913f8b9795c5fd"}, From 1e639f7e77648afac00ab31b29fd64a1eee9a45d Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 19 May 2026 19:19:10 +0200 Subject: [PATCH 20/22] chore(justfile): set PATH literally so recipes work without per-shell asdf sourcing --- .gitignore | 3 +++ Justfile | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 058543c..e177b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,6 @@ npm-debug.log # Docker secrets directory (generated by `just init-secrets`) /secrets/ notes.md + +# Do NOT commit these — they are local to the dev machine +.pipeline/ diff --git a/Justfile b/Justfile index d2c51e5..db53903 100644 --- a/Justfile +++ b/Justfile @@ -1,6 +1,10 @@ set dotenv-load := true set export := true +# PATH includes asdf shims so that mix / elixir / iex resolve without per-shell +# `source ~/.asdf/asdf.sh`. Recipes inherit this via `set export := true`. +PATH := "/root/.asdf/shims:/root/.asdf:/root/.local/bin:/usr/local/bin:/usr/bin:/bin" + MIX_QUIET := "1" run: install-dependencies start-database migrate-database seed-database @@ -69,6 +73,10 @@ test-all *args: install-dependencies format: mix format +# Catch-all wrapper for arbitrary mix commands not exposed as their own recipe. +mix *args: + mix {{args}} + build-docker-container: docker build --tag mitgliederverwaltung . From 85e9d40f7914d586e6f28096fafec2f46f5fd761 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 19 May 2026 19:42:24 +0200 Subject: [PATCH 21/22] chore(deps): cowlib, db_connection, postgrex --- mix.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mix.lock b/mix.lock index a1e9298..12acd0a 100644 --- a/mix.lock +++ b/mix.lock @@ -18,10 +18,10 @@ "comeonin": {:hex, :comeonin, "5.5.1", "5113e5f3800799787de08a6e0db307133850e635d34e9fab23c70b6501669510", [:mix], [], "hexpm", "65aac8f19938145377cee73973f192c5645873dcf550a8a6b18187d17c13ccdb"}, "cowboy": {:hex, :cowboy, "2.14.2", "4008be1df6ade45e4f2a4e9e2d22b36d0b5aba4e20b0a0d7049e28d124e34847", [:make, :rebar3], [{:cowlib, ">= 2.16.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "569081da046e7b41b5df36aa359be71a0c8874e5b9cff6f747073fc57baf1ab9"}, "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"}, - "cowlib": {:hex, :cowlib, "2.16.0", "54592074ebbbb92ee4746c8a8846e5605052f29309d3a873468d76cdf932076f", [:make, :rebar3], [], "hexpm", "7f478d80d66b747344f0ea7708c187645cfcc08b11aa424632f78e25bf05db51"}, + "cowlib": {:hex, :cowlib, "2.16.1", "318d385d55f657e9a5005838c4e426e13dcd724a691438384b6165a69687e531", [:make, :rebar3], [], "hexpm", "58f1e425a9e04176f1d30e20116f57c4e90ef0e187552e9741c465bdf4044f70"}, "credo": {:hex, :credo, "1.7.18", "5c5596bf7aedf9c8c227f13272ac499fe8eae6237bd326f2f07dfc173786f042", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a189d164685fd945809e862fe76a7420c4398fa288d76257662aecb909d6b3e5"}, "crux": {:hex, :crux, "0.1.2", "4441c9e3a34f1e340954ce96b9ad5a2de13ceb4f97b3f910211227bb92e2ca90", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "563ea3748ebfba9cc078e6d198a1d6a06015a8fae503f0b721363139f0ddb350"}, - "db_connection": {:hex, :db_connection, "2.10.0", "8ff756471e41765bd5563b633f73e9a94bbc138816e8644bb17d0d91bf260a95", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02cdd01b45efb1b550e68edbbea41be32de9b24bb07e1ea0e9cbc522ac377e54"}, + "db_connection": {:hex, :db_connection, "2.10.1", "d5465f6bcc125c1b8981c1dbf23c193ca16f446ec0b25832dc174f74f18be510", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "18ed94c6e627b4bf452dbd4df61b69a35a1e768525140bc1917b7a685026a6a3"}, "decimal": {:hex, :decimal, "3.1.0", "9ede268cff827e6f0c4fb1b34747c82630dce5d7b877dfb22ec8f0cb25855fce", [:mix], [], "hexpm", "e8b3efb3bb3a13cb5e4268ffe128569067b1972e9dee013537c71a5b073168f9"}, "dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"}, "ecto": {:hex, :ecto, "3.13.6", "352135b474f91d1ab99a1b502171d207e9db60421c9e3d0ecab4c7ab96b24d14", [:mix], [{:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8afa059bc16cd2c94739ec0a11e3e5df69d828125119109bef35f20a21a76af2"}, @@ -74,7 +74,7 @@ "plug": {:hex, :plug, "1.19.1", "09bac17ae7a001a68ae393658aa23c7e38782be5c5c00c80be82901262c394c0", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"}, "plug_cowboy": {:hex, :plug_cowboy, "2.8.1", "5aa391a5e8d1ac3192e36a3bcaff12b5fd6ef6c7e29b53a38e63a860783e77d0", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "4c200288673d5bc86a0ab7dc6a2a069176a74e5d573ef62740a1c517458a5f26"}, "plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"}, - "postgrex": {:hex, :postgrex, "0.22.1", "b3665ad17e15441557da8f45eeebfcd56e4a2b0b98538b855679a13d05e5cc5d", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "df59f828b167b49a5853f645b65f57eb1bc5f3b230497ceaca7af5d8ac05afef"}, + "postgrex": {:hex, :postgrex, "0.22.2", "4aec14df2a72722aee92492566edbeeb44e233ecb86b1915d03136297ef1385d", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "8946382ddb06294f56026ac4278b3cc212bac8a2c82ed68b4087819ed1abc53b"}, "ranch": {:hex, :ranch, "1.8.1", "208169e65292ac5d333d6cdbad49388c1ae198136e4697ae2f474697140f201c", [:make, :rebar3], [], "hexpm", "aed58910f4e21deea992a67bf51632b6d60114895eb03bb392bb733064594dd0"}, "reactor": {:hex, :reactor, "1.0.1", "ca3b5cf3c04ec8441e67ea2625d0294939822060b1bfd00ffdaaf75b7682d991", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "3497db2b204c9a3cabdaf1b26d2405df1dfbb138ce0ce50e616e9db19fec0043"}, "req": {:hex, :req, "0.5.17", "0096ddd5b0ed6f576a03dde4b158a0c727215b15d2795e59e0916c6971066ede", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0b8bc6ffdfebbc07968e59d3ff96d52f2202d0536f10fef4dc11dc02a2a43e39"}, @@ -90,7 +90,7 @@ "sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"}, "swoosh": {:hex, :swoosh, "1.25.1", "569fcff34817da8a03f28775146b3c8b71b4c9b14f8f78d37ff3ef422862a18b", [:mix], [{:bandit, ">= 1.0.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mua, "~> 0.2.3", [hex: :mua, repo: "hexpm", optional: true]}, {:multipart, "~> 0.4", [hex: :multipart, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.5.10 or ~> 0.6 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "58b3e8db6406fe417a89b5042358d2e8f15d32a3317d4f8581d7a3ae501e410b"}, "tailwind": {:hex, :tailwind, "0.4.1", "e7bcc222fe96a1e55f948e76d13dd84a1a7653fb051d2a167135db3b4b08d3e9", [:mix], [], "hexpm", "6249d4f9819052911120dbdbe9e532e6bd64ea23476056adb7f730aa25c220d1"}, - "telemetry": {:hex, :telemetry, "1.4.1", "ab6de178e2b29b58e8256b92b382ea3f590a47152ca3651ea857a6cae05ac423", [:rebar3], [], "hexpm", "2172e05a27531d3d31dd9782841065c50dd5c3c7699d95266b2edd54c2dafa1c"}, + "telemetry": {:hex, :telemetry, "1.4.2", "a0cb522801dffb1c49fe6e30561badffc7b6d0e180db1300df759faa22062855", [:rebar3], [], "hexpm", "928f6495066506077862c0d1646609eed891a4326bee3126ba54b60af61febb1"}, "telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"}, "telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"}, "text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"}, From 264a585d44a60e2c5ced5281186551e18945ab1d Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 19 May 2026 22:12:45 +0200 Subject: [PATCH 22/22] chore(justfile): set PATH user agnostic --- .gitignore | 1 + Justfile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e177b4d..b9096bd 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ notes.md # Do NOT commit these — they are local to the dev machine .pipeline/ +.claude/ diff --git a/Justfile b/Justfile index db53903..cae8cfb 100644 --- a/Justfile +++ b/Justfile @@ -1,9 +1,11 @@ set dotenv-load := true set export := true +# Non-interactive shells do not source .bashrc, # PATH includes asdf shims so that mix / elixir / iex resolve without per-shell # `source ~/.asdf/asdf.sh`. Recipes inherit this via `set export := true`. -PATH := "/root/.asdf/shims:/root/.asdf:/root/.local/bin:/usr/local/bin:/usr/bin:/bin" +home := env_var('HOME') +PATH := home + "/.asdf/shims:" + home + "/.asdf:" + home + "/.local/bin:/usr/local/bin:/usr/bin:/bin" MIX_QUIET := "1"
{col[:label]} @@ -1006,7 +1020,13 @@ defmodule MvWeb.CoreComponents do