From cf957563bb8295ae0bc2946860ac752242358b6b Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 08:45:18 +0100 Subject: [PATCH 01/35] chore: adds migration for member field visibility --- ...dd_member_field_visibility_to_settings.exs | 21 +++ .../repo/custom_fields/20251201115939.json | 144 ++++++++++++++++++ .../repo/settings/20251201115939.json | 79 ++++++++++ 3 files changed, 244 insertions(+) create mode 100644 priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs create mode 100644 priv/resource_snapshots/repo/custom_fields/20251201115939.json create mode 100644 priv/resource_snapshots/repo/settings/20251201115939.json diff --git a/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs b/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs new file mode 100644 index 0000000..6d278fb --- /dev/null +++ b/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs @@ -0,0 +1,21 @@ +defmodule Mv.Repo.Migrations.AddMemberFieldVisibilityToSettings do + @moduledoc """ + Updates resources based on their most recent snapshots. + + This file was autogenerated with `mix ash_postgres.generate_migrations` + """ + + use Ecto.Migration + + def up do + alter table(:settings) do + add :member_field_visibility, :map + end + end + + def down do + alter table(:settings) do + remove :member_field_visibility + end + end +end diff --git a/priv/resource_snapshots/repo/custom_fields/20251201115939.json b/priv/resource_snapshots/repo/custom_fields/20251201115939.json new file mode 100644 index 0000000..fabd84b --- /dev/null +++ b/priv/resource_snapshots/repo/custom_fields/20251201115939.json @@ -0,0 +1,144 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "precision": null, + "primary_key?": true, + "references": null, + "scale": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "name", + "type": "text" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "slug", + "type": "text" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "value_type", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "description", + "type": "text" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "immutable", + "type": "boolean" + }, + { + "allow_nil?": false, + "default": "false", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "required", + "type": "boolean" + }, + { + "allow_nil?": false, + "default": "true", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "show_in_overview", + "type": "boolean" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "D31160C95D3D32BA715D493DE2D2B8D6572E0EC68AE14B928D99975BC8A81542", + "identities": [ + { + "all_tenants?": false, + "base_filter": null, + "index_name": "custom_fields_unique_name_index", + "keys": [ + { + "type": "atom", + "value": "name" + } + ], + "name": "unique_name", + "nils_distinct?": true, + "where": null + }, + { + "all_tenants?": false, + "base_filter": null, + "index_name": "custom_fields_unique_slug_index", + "keys": [ + { + "type": "atom", + "value": "slug" + } + ], + "name": "unique_slug", + "nils_distinct?": true, + "where": null + } + ], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "custom_fields" +} \ No newline at end of file diff --git a/priv/resource_snapshots/repo/settings/20251201115939.json b/priv/resource_snapshots/repo/settings/20251201115939.json new file mode 100644 index 0000000..4e635c4 --- /dev/null +++ b/priv/resource_snapshots/repo/settings/20251201115939.json @@ -0,0 +1,79 @@ +{ + "attributes": [ + { + "allow_nil?": false, + "default": "fragment(\"gen_random_uuid()\")", + "generated?": false, + "precision": null, + "primary_key?": true, + "references": null, + "scale": null, + "size": null, + "source": "id", + "type": "uuid" + }, + { + "allow_nil?": false, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "club_name", + "type": "text" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "member_field_visibility", + "type": "map" + }, + { + "allow_nil?": false, + "default": "fragment(\"(now() AT TIME ZONE 'utc')\")", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "inserted_at", + "type": "utc_datetime_usec" + }, + { + "allow_nil?": false, + "default": "fragment(\"(now() AT TIME ZONE 'utc')\")", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "updated_at", + "type": "utc_datetime_usec" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "F2823210AA9E6476074A218375F64CD80E7F9E04EECC4E94D4C7FD31A773C016", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "settings" +} \ No newline at end of file From f24d4985fc43a816f6fff4faaa0ebbf0c9ddf301 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:22:26 +0100 Subject: [PATCH 02/35] tests: adds tests --- .../member_field_visibility_test.exs | 80 +++++++++++++++++++ .../index_member_fields_display_test.exs | 75 +++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 test/membership/member_field_visibility_test.exs create mode 100644 test/mv_web/member_live/index_member_fields_display_test.exs diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs new file mode 100644 index 0000000..46bdb74 --- /dev/null +++ b/test/membership/member_field_visibility_test.exs @@ -0,0 +1,80 @@ +defmodule Mv.Membership.MemberFieldVisibilityTest do + @moduledoc """ + Tests for member field visibility configuration. + + Tests cover: + - Member fields are visible by default (show_in_overview: true) + - Member fields can be hidden (show_in_overview: false) + - Checking if a specific field is visible + - Configuration is stored in Settings resource + """ + use Mv.DataCase, async: true + + alias Mv.Membership.Member + + describe "show_in_overview?/1" do + test "returns true for all member fields by default" do + # When no settings exist or member_field_visibility is not configured + # Test with fields from constants + member_fields = Mv.Constants.member_fields() + + Enum.each(member_fields, fn field -> + assert Member.show_in_overview?(field) == true, + "Field #{field} should be visible by default" + end) + end + + test "returns false for fields with show_in_overview: false in settings" do + # Get or create settings + {:ok, settings} = Mv.Membership.get_settings() + + # Use a field that exists in member fields + member_fields = Mv.Constants.member_fields() + field_to_hide = List.first(member_fields) + field_to_show = List.last(member_fields) + + # Update settings to hide a field + {:ok, _updated_settings} = + Mv.Membership.update_settings(settings, %{ + member_field_visibility: %{field_to_hide => false} + }) + + # JSONB may convert atom keys to string keys, so we check via show_in_overview? instead + assert Member.show_in_overview?(field_to_hide) == false + assert Member.show_in_overview?(field_to_show) == true + end + + test "returns true for non-configured fields (default)" do + # Get or create settings + {:ok, settings} = Mv.Membership.get_settings() + + # Use fields that exist in member fields + member_fields = Mv.Constants.member_fields() + fields_to_hide = Enum.take(member_fields, 2) + fields_to_show = Enum.take(member_fields, -2) + + # Update settings to hide some fields + visibility_config = + Enum.reduce(fields_to_hide, %{}, fn field, acc -> + Map.put(acc, field, false) + end) + + {:ok, _updated_settings} = + Mv.Membership.update_settings(settings, %{ + member_field_visibility: visibility_config + }) + + # Hidden fields should be false + Enum.each(fields_to_hide, fn field -> + assert Member.show_in_overview?(field) == false, + "Field #{field} should be hidden" + end) + + # Unconfigured fields should still be true (default) + Enum.each(fields_to_show, fn field -> + assert Member.show_in_overview?(field) == true, + "Field #{field} should be visible by default" + end) + end + end +end diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs new file mode 100644 index 0000000..a0e519a --- /dev/null +++ b/test/mv_web/member_live/index_member_fields_display_test.exs @@ -0,0 +1,75 @@ +defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.Member + + setup do + {:ok, member1} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com", + street: "Main Street", + house_number: "123", + postal_code: "12345", + city: "Berlin", + phone_number: "+49123456789", + join_date: ~D[2020-01-15] + }) + |> Ash.create() + + {:ok, member2} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Bob", + last_name: "Brown", + email: "bob@example.com" + }) + |> Ash.create() + + %{ + member1: member1, + member2: member2 + } + end + + + test "shows multiple members correctly", %{conn: conn, member1: m1, member2: m2} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + for m <- [m1, m2], field <- [m.first_name, m.last_name, m.email] do + assert html =~ field + end + end + + test "respects show_in_overview config", %{conn: conn, member1: m} do + {:ok, settings} = Mv.Membership.get_settings() + fields_to_hide = [:street, :house_number] + + {:ok, _} = + Mv.Membership.update_settings(settings, %{ + member_field_visibility: Map.new(fields_to_hide, &{&1, false}) + }) + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ "Email" + assert html =~ m.email + refute html =~ m.street + end + + defp get_field_label(:street), do: "Street" + defp get_field_label(:house_number), do: "House Number" + defp get_field_label(:postal_code), do: "Postal Code" + defp get_field_label(:city), do: "City" + defp get_field_label(:phone_number), do: "Phone Number" + defp get_field_label(:join_date), do: "Join Date" + defp get_field_label(:email), do: "Email" + defp get_field_label(:first_name), do: "First name" + defp get_field_label(:last_name), do: "Last name" +end From a022d8cd02fe40c37e5aff5a13cf9afa4ad7682f Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:22:49 +0100 Subject: [PATCH 03/35] chore: adds constant for member_fields --- lib/mv/constants.ex | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lib/mv/constants.ex diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex new file mode 100644 index 0000000..0725d60 --- /dev/null +++ b/lib/mv/constants.ex @@ -0,0 +1,9 @@ +defmodule Mv.Constants do + @moduledoc """ + Module for defining constants and atoms. + """ + + @member_fields [:first_name, :last_name, :email, :birth_date, :paid, :phone_number, :join_date, :exit_date, :notes, :city, :street, :house_number, :postal_code] + + def member_fields, do: @member_fields +end From 82e41916d27935d826093ec870037f21935b5b46 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:23:23 +0100 Subject: [PATCH 04/35] feat: adds member visibility settings --- lib/membership/member.ex | 64 ++++++++++++++++++++++++++++ lib/membership/membership.ex | 34 +++++++++++++++ lib/membership/setting.ex | 82 +++++++++++++++++++++++++++++++++++- 3 files changed, 178 insertions(+), 2 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index da69861..f91cb0b 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -434,6 +434,70 @@ defmodule Mv.Membership.Member do identity :unique_email, [:email] end + @doc """ + Checks if a member field should be shown in the overview. + + Reads the visibility configuration from Settings resource. If a field is not + configured in settings, it defaults to `true` (visible). + + ## Parameters + - `field` - Atom representing the member field name (e.g., `:email`, `:street`) + + ## Returns + - `true` if the field should be shown in overview (default) + - `false` if the field is configured as hidden in settings + + ## Examples + + iex> Member.show_in_overview?(:email) + true + + iex> Member.show_in_overview?(:street) + true # or false if configured in settings + + """ + @spec show_in_overview?(atom()) :: boolean() + def show_in_overview?(field) when is_atom(field) do + case Mv.Membership.get_settings() do + {:ok, settings} -> + visibility_config = settings.member_field_visibility || %{} + # Normalize map keys to atoms (JSONB may return string keys) + normalized_config = normalize_visibility_config(visibility_config) + + # Get value from normalized config, default to true + Map.get(normalized_config, field, true) + + {:error, _} -> + # If settings can't be loaded, default to visible + true + end + end + + def show_in_overview?(_), do: true + + # Normalizes visibility config map keys from strings to atoms. + # JSONB in PostgreSQL converts atom keys to string keys when storing. + defp normalize_visibility_config(config) when is_map(config) do + Enum.reduce(config, %{}, fn + {key, value}, acc when is_atom(key) -> + Map.put(acc, key, value) + + {key, value}, acc when is_binary(key) -> + try do + atom_key = String.to_existing_atom(key) + Map.put(acc, atom_key, value) + rescue + ArgumentError -> + acc + end + + _, acc -> + acc + end) + end + + defp normalize_visibility_config(_), do: %{} + @doc """ Performs fuzzy search on members using PostgreSQL trigram similarity. diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index cb3691b..516448c 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -53,6 +53,7 @@ defmodule Mv.Membership do # It's only used internally as fallback in get_settings/0 # Settings should be created via seed script define :update_settings, action: :update + define :update_member_field_visibility, action: :update_member_field_visibility end end @@ -123,4 +124,37 @@ defmodule Mv.Membership do |> Ash.Changeset.for_update(:update, attrs) |> Ash.update(domain: __MODULE__) end + + @doc """ + Updates the member field visibility configuration. + + This is a specialized action for updating only the member field visibility settings. + It validates that all keys are valid member fields and all values are booleans. + + ## Parameters + + - `settings` - The settings record to update + - `visibility_config` - A map of member field names (atoms) to boolean visibility values + (e.g., `%{street: false, house_number: false}`) + + ## Returns + + - `{:ok, updated_settings}` - Successfully updated settings + - `{:error, error}` - Validation or update error + + ## Examples + + iex> {:ok, settings} = Mv.Membership.get_settings() + iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false}) + iex> updated.member_field_visibility + %{street: false, house_number: false} + + """ + def update_member_field_visibility(settings, visibility_config) do + settings + |> Ash.Changeset.for_update(:update_member_field_visibility, %{ + member_field_visibility: visibility_config + }) + |> Ash.update(domain: __MODULE__) + end end diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex index 38624dc..0bd9212 100644 --- a/lib/membership/setting.ex +++ b/lib/membership/setting.ex @@ -9,6 +9,8 @@ defmodule Mv.Membership.Setting do ## Attributes - `club_name` - The name of the association/club (required, cannot be empty) + - `member_field_visibility` - JSONB map storing visibility configuration for member fields + (e.g., `%{street: false, house_number: false}`). Fields not in the map default to `true`. ## Singleton Pattern This resource uses a singleton pattern - there should only be one settings record. @@ -28,6 +30,9 @@ defmodule Mv.Membership.Setting do # Update club name {:ok, updated} = Mv.Membership.update_settings(settings, %{club_name: "New Name"}) + + # Update member field visibility + {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false}) """ use Ash.Resource, domain: Mv.Membership, @@ -49,18 +54,86 @@ defmodule Mv.Membership.Setting do # Used only as fallback in get_settings/0 if settings don't exist # Settings should normally be created via seed script create :create do - accept [:club_name] + accept [:club_name, :member_field_visibility] end update :update do primary? true - accept [:club_name] + require_atomic? false + accept [:club_name, :member_field_visibility] + end + + update :update_member_field_visibility do + description "Updates the visibility configuration for member fields in the overview" + require_atomic? false + accept [:member_field_visibility] + + change fn changeset, _context -> + visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) + + if visibility && is_map(visibility) do + valid_fields = Mv.Constants.member_fields() + # Normalize keys to atoms (JSONB may return string keys) + invalid_keys = + Enum.filter(visibility, fn {key, _value} -> + atom_key = + if is_atom(key) do + key + else + try do + String.to_existing_atom(key) + rescue + ArgumentError -> nil + end + end + + atom_key && atom_key not in valid_fields + end) + |> Enum.map(fn {key, _value} -> key end) + + if Enum.empty?(invalid_keys) do + changeset + else + Ash.Changeset.add_error( + changeset, + field: :member_field_visibility, + message: "Invalid member field keys: #{inspect(invalid_keys)}" + ) + end + else + changeset + end + end end end validations do validate present(:club_name), on: [:create, :update] validate string_length(:club_name, min: 1), on: [:create, :update] + + # Validate that member_field_visibility map contains only boolean values + # This allows dynamic fields without hardcoding specific field names + validate fn changeset, _context -> + visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) + + if visibility && is_map(visibility) do + invalid_entries = + Enum.filter(visibility, fn {_key, value} -> + not is_boolean(value) + end) + + if Enum.empty?(invalid_entries) do + :ok + else + {:error, + field: :member_field_visibility, + message: "All values in member_field_visibility must be booleans"} + end + else + :ok + end + end, + on: [:create, :update] end attributes do @@ -75,6 +148,11 @@ defmodule Mv.Membership.Setting do min_length: 1 ] + attribute :member_field_visibility, :map, + allow_nil?: true, + public?: true, + description: "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans." + timestamps() end end From 7f0da693eeb798fcb097bc4f17f3b400ef286c5f Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:23:37 +0100 Subject: [PATCH 05/35] feat: adds member visibility to live view --- lib/mv_web/live/member_live/index.ex | 37 ++++++++++++++++ lib/mv_web/live/member_live/index.html.heex | 49 ++++++--------------- 2 files changed, 51 insertions(+), 35 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 85ee4fb..1f8acb5 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -60,6 +60,8 @@ defmodule MvWeb.MemberLive.Index do |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, []) |> assign(:custom_fields_visible, custom_fields_visible) + |> assign(:member_field_configurations, get_member_field_configurations()) + |> assign(:member_fields_visible, get_visible_member_fields()) # We call handle params to use the query from the URL {:ok, socket} @@ -733,4 +735,39 @@ defmodule MvWeb.MemberLive.Index do nil end end + + # Gets the configuration for all member fields with their show_in_overview values. + # + # Reads the visibility configuration from Settings and returns a map with all member fields + # and their show_in_overview values (true or false). Fields not configured in settings + # default to true. + # + # Returns a map: %{field_name => show_in_overview} + # + # This can be used for: + # - Rendering the overview (filtering visible fields) + # - UI configuration dropdowns (showing all fields with their current state) + # - Dynamic field management + # + # Fields are read from the global Constants module. + defp get_member_field_configurations do + # Get all eligible fields from the global constants + all_fields = Mv.Constants.member_fields() + + Enum.reduce(all_fields, %{}, fn field, acc -> + show_in_overview = Mv.Membership.Member.show_in_overview?(field) + Map.put(acc, field, show_in_overview) + end) + end + + # Gets the list of member fields that should be visible in the overview. + # + # Filters the member field configurations to return only fields with show_in_overview: true. + # + # Returns a list of atoms representing visible member field names. + defp get_visible_member_fields do + get_member_field_configurations() + |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end) + |> Enum.map(fn {field, _show_in_overview} -> field end) + end end diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 67fa804..0fa9f05 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -69,9 +69,7 @@ > {member.first_name} {member.last_name} - <:col - :let={member} - label={ + <:col :if={:email in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -82,13 +80,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.email} - <:col - :let={member} - label={ + <:col :if={:street in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -99,13 +94,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.street} - <:col - :let={member} - label={ + <:col :if={:house_number in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -116,13 +108,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.house_number} - <:col - :let={member} - label={ + <:col :if={:postal_code in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -133,13 +122,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.postal_code} - <:col - :let={member} - label={ + <:col :if={:city in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -150,13 +136,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.city} - <:col - :let={member} - label={ + <:col :if={:phone_number in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -167,13 +150,10 @@ sort_order={@sort_order} /> """ - } - > + }> {member.phone_number} - <:col - :let={member} - label={ + <:col :if={:join_date in @member_fields_visible} :let={member} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -184,8 +164,7 @@ sort_order={@sort_order} /> """ - } - > + }> {member.join_date} <:action :let={member}> From d039e4bb7d853ad50b9f141aa616679782f648c8 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 10:02:52 +0100 Subject: [PATCH 06/35] formatting and refactor member fields constant --- lib/membership/member.ex | 36 ++----- lib/membership/setting.ex | 39 ++++---- lib/mv/constants.ex | 16 +++- lib/mv_web/live/member_live/index.ex | 96 +++++++++++++------ lib/mv_web/live/member_live/index.html.heex | 56 ++++++++--- .../index_member_fields_display_test.exs | 11 --- 6 files changed, 150 insertions(+), 104 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index f91cb0b..31a825b 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -42,6 +42,10 @@ defmodule Mv.Membership.Member do @member_search_limit 10 @default_similarity_threshold 0.2 + # Use constants from Mv.Constants for member fields + # This ensures consistency across the codebase + @member_fields Mv.Constants.member_fields() + postgres do table "members" repo Mv.Repo @@ -58,21 +62,7 @@ defmodule Mv.Membership.Member do # user_id is NOT in accept list to prevent direct foreign key manipulation argument :user, :map, allow_nil?: true - accept [ - :first_name, - :last_name, - :email, - :birth_date, - :paid, - :phone_number, - :join_date, - :exit_date, - :notes, - :city, - :street, - :house_number, - :postal_code - ] + accept @member_fields change manage_relationship(:custom_field_values, type: :create) @@ -105,21 +95,7 @@ defmodule Mv.Membership.Member do # user_id is NOT in accept list to prevent direct foreign key manipulation argument :user, :map, allow_nil?: true - accept [ - :first_name, - :last_name, - :email, - :birth_date, - :paid, - :phone_number, - :join_date, - :exit_date, - :notes, - :city, - :street, - :house_number, - :postal_code - ] + accept @member_fields change manage_relationship(:custom_field_values, on_match: :update, on_no_match: :create) diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex index 0bd9212..3405a3f 100644 --- a/lib/membership/setting.ex +++ b/lib/membership/setting.ex @@ -114,26 +114,26 @@ defmodule Mv.Membership.Setting do # Validate that member_field_visibility map contains only boolean values # This allows dynamic fields without hardcoding specific field names validate fn changeset, _context -> - visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) + visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) - if visibility && is_map(visibility) do - invalid_entries = - Enum.filter(visibility, fn {_key, value} -> - not is_boolean(value) - end) + if visibility && is_map(visibility) do + invalid_entries = + Enum.filter(visibility, fn {_key, value} -> + not is_boolean(value) + end) - if Enum.empty?(invalid_entries) do - :ok - else - {:error, - field: :member_field_visibility, - message: "All values in member_field_visibility must be booleans"} - end - else - :ok - end - end, - on: [:create, :update] + if Enum.empty?(invalid_entries) do + :ok + else + {:error, + field: :member_field_visibility, + message: "All values in member_field_visibility must be booleans"} + end + else + :ok + end + end, + on: [:create, :update] end attributes do @@ -151,7 +151,8 @@ defmodule Mv.Membership.Setting do attribute :member_field_visibility, :map, allow_nil?: true, public?: true, - description: "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans." + description: + "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans." timestamps() end diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex index 0725d60..cd8d3a4 100644 --- a/lib/mv/constants.ex +++ b/lib/mv/constants.ex @@ -3,7 +3,21 @@ defmodule Mv.Constants do Module for defining constants and atoms. """ - @member_fields [:first_name, :last_name, :email, :birth_date, :paid, :phone_number, :join_date, :exit_date, :notes, :city, :street, :house_number, :postal_code] + @member_fields [ + :first_name, + :last_name, + :email, + :birth_date, + :paid, + :phone_number, + :join_date, + :exit_date, + :notes, + :city, + :street, + :house_number, + :postal_code + ] def member_fields, do: @member_fields end diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 1f8acb5..6bce495 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -29,11 +29,18 @@ defmodule MvWeb.MemberLive.Index do require Ash.Query import Ash.Expr + alias Mv.Membership alias MvWeb.MemberLive.Index.Formatter # Prefix used in sort field names for custom fields (e.g., "custom_field_") @custom_field_prefix "custom_field_" + # Member fields that are loaded for the overview + # Uses constants from Mv.Constants to ensure consistency + # Note: :id is always included for member identification + # All member fields are loaded, but visibility is controlled via settings + @overview_fields [:id | Mv.Constants.member_fields()] + @doc """ Initializes the LiveView state. @@ -52,6 +59,14 @@ defmodule MvWeb.MemberLive.Index do |> Ash.Query.sort(name: :asc) |> Ash.read!() + # Load settings once to avoid N+1 queries + settings = + case Membership.get_settings() do + {:ok, s} -> s + # Fallback if settings can't be loaded + {:error, _} -> %{member_field_visibility: %{}} + end + socket = socket |> assign(:page_title, gettext("Members")) @@ -59,9 +74,10 @@ defmodule MvWeb.MemberLive.Index do |> assign_new(:sort_field, fn -> :first_name end) |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, []) + |> assign(:settings, settings) |> assign(:custom_fields_visible, custom_fields_visible) - |> assign(:member_field_configurations, get_member_field_configurations()) - |> assign(:member_fields_visible, get_visible_member_fields()) + |> assign(:member_field_configurations, get_member_field_configurations(settings)) + |> assign(:member_fields_visible, get_visible_member_fields(settings)) # We call handle params to use the query from the URL {:ok, socket} @@ -315,18 +331,7 @@ defmodule MvWeb.MemberLive.Index do query = Mv.Membership.Member |> Ash.Query.new() - |> Ash.Query.select([ - :id, - :first_name, - :last_name, - :email, - :street, - :house_number, - :postal_code, - :city, - :phone_number, - :join_date - ]) + |> Ash.Query.select(@overview_fields) # Load custom field values for visible custom fields custom_field_ids_list = Enum.map(socket.assigns.custom_fields_visible, & &1.id) @@ -435,18 +440,13 @@ defmodule MvWeb.MemberLive.Index do defp maybe_sort(query, _, _, _), do: {query, false} # Validate that a field is sortable + # Uses member fields from constants, but excludes fields that don't make sense to sort + # (e.g., :notes is too long, :paid is boolean and not very useful for sorting) defp valid_sort_field?(field) when is_atom(field) do - valid_fields = [ - :first_name, - :last_name, - :email, - :street, - :house_number, - :postal_code, - :city, - :phone_number, - :join_date - ] + # All member fields are sortable, but we exclude some that don't make sense + # :id is not in member_fields, but we don't want to sort by it anyway + non_sortable_fields = [:notes, :paid] + valid_fields = Mv.Constants.member_fields() -- non_sortable_fields field in valid_fields or custom_field_sort?(field) end @@ -742,6 +742,12 @@ defmodule MvWeb.MemberLive.Index do # and their show_in_overview values (true or false). Fields not configured in settings # default to true. # + # Performance: This function uses the already-loaded settings to avoid N+1 queries. + # Settings should be loaded once in mount/3 and passed to this function. + # + # Parameters: + # - `settings` - The settings struct loaded from the database + # # Returns a map: %{field_name => show_in_overview} # # This can be used for: @@ -750,12 +756,16 @@ defmodule MvWeb.MemberLive.Index do # - Dynamic field management # # Fields are read from the global Constants module. - defp get_member_field_configurations do + @spec get_member_field_configurations(map()) :: %{atom() => boolean()} + defp get_member_field_configurations(settings) do # Get all eligible fields from the global constants all_fields = Mv.Constants.member_fields() + # Normalize visibility config (JSONB may return string keys) + visibility_config = normalize_visibility_config(settings.member_field_visibility || %{}) + Enum.reduce(all_fields, %{}, fn field, acc -> - show_in_overview = Mv.Membership.Member.show_in_overview?(field) + show_in_overview = Map.get(visibility_config, field, true) Map.put(acc, field, show_in_overview) end) end @@ -764,10 +774,38 @@ defmodule MvWeb.MemberLive.Index do # # Filters the member field configurations to return only fields with show_in_overview: true. # + # Parameters: + # - `settings` - The settings struct loaded from the database + # # Returns a list of atoms representing visible member field names. - defp get_visible_member_fields do - get_member_field_configurations() + @spec get_visible_member_fields(map()) :: [atom()] + defp get_visible_member_fields(settings) do + get_member_field_configurations(settings) |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end) |> Enum.map(fn {field, _show_in_overview} -> field end) end + + # Normalizes visibility config map keys from strings to atoms. + # JSONB in PostgreSQL converts atom keys to string keys when storing. + # This is a local helper to avoid N+1 queries by reusing the normalization logic. + defp normalize_visibility_config(config) when is_map(config) do + Enum.reduce(config, %{}, fn + {key, value}, acc when is_atom(key) -> + Map.put(acc, key, value) + + {key, value}, acc when is_binary(key) -> + try do + atom_key = String.to_existing_atom(key) + Map.put(acc, atom_key, value) + rescue + ArgumentError -> + acc + end + + _, acc -> + acc + end) + end + + defp normalize_visibility_config(_), do: %{} end diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 0fa9f05..594f2d8 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -69,7 +69,10 @@ > {member.first_name} {member.last_name} - <:col :if={:email in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:email in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -80,10 +83,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.email} - <:col :if={:street in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:street in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -94,10 +101,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.street} - <:col :if={:house_number in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:house_number in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -108,10 +119,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.house_number} - <:col :if={:postal_code in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:postal_code in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -122,10 +137,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.postal_code} - <:col :if={:city in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:city in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -136,10 +155,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.city} - <:col :if={:phone_number in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:phone_number in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -150,10 +173,14 @@ sort_order={@sort_order} /> """ - }> + } + > {member.phone_number} - <:col :if={:join_date in @member_fields_visible} :let={member} label={ + <:col + :let={member} + :if={:join_date in @member_fields_visible} + label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} @@ -164,7 +191,8 @@ sort_order={@sort_order} /> """ - }> + } + > {member.join_date} <:action :let={member}> diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs index a0e519a..c4a5b9f 100644 --- a/test/mv_web/member_live/index_member_fields_display_test.exs +++ b/test/mv_web/member_live/index_member_fields_display_test.exs @@ -36,7 +36,6 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do } end - test "shows multiple members correctly", %{conn: conn, member1: m1, member2: m2} do conn = conn_with_oidc_user(conn) {:ok, _view, html} = live(conn, "/members") @@ -62,14 +61,4 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do assert html =~ m.email refute html =~ m.street end - - defp get_field_label(:street), do: "Street" - defp get_field_label(:house_number), do: "House Number" - defp get_field_label(:postal_code), do: "Postal Code" - defp get_field_label(:city), do: "City" - defp get_field_label(:phone_number), do: "Phone Number" - defp get_field_label(:join_date), do: "Join Date" - defp get_field_label(:email), do: "Email" - defp get_field_label(:first_name), do: "First name" - defp get_field_label(:last_name), do: "Last name" end From 45a9bc0cc07ca5fd900ac3c494d4a9a016608ea3 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 14:59:10 +0100 Subject: [PATCH 07/35] tests: added tests --- ...eld_visibility_dropdown_component_test.exs | 363 +++++++++++++ .../index/field_selection_test.exs | 346 ++++++++++++ .../index/field_visibility_test.exs | 336 ++++++++++++ .../index_field_visibility_test.exs | 509 ++++++++++++++++++ 4 files changed, 1554 insertions(+) create mode 100644 test/mv_web/components/field_visibility_dropdown_component_test.exs create mode 100644 test/mv_web/live/member_live/index/field_selection_test.exs create mode 100644 test/mv_web/live/member_live/index/field_visibility_test.exs create mode 100644 test/mv_web/member_live/index_field_visibility_test.exs diff --git a/test/mv_web/components/field_visibility_dropdown_component_test.exs b/test/mv_web/components/field_visibility_dropdown_component_test.exs new file mode 100644 index 0000000..81cd73b --- /dev/null +++ b/test/mv_web/components/field_visibility_dropdown_component_test.exs @@ -0,0 +1,363 @@ +defmodule MvWeb.Components.FieldVisibilityDropdownComponentTest do + @moduledoc """ + Tests for FieldVisibilityDropdownComponent LiveComponent. + """ + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias MvWeb.Components.FieldVisibilityDropdownComponent + + # Helper to create test assigns + defp create_assigns(overrides \\ %{}) do + default_assigns = %{ + id: "test-dropdown", + all_fields: [:first_name, :email, :street, "custom_field_123"], + custom_fields: [ + %{id: "123", name: "Custom Field 1"} + ], + selected_fields: %{ + "first_name" => true, + "email" => true, + "street" => false, + "custom_field_123" => true + } + } + + Map.merge(default_assigns, overrides) + end + + describe "update/2" do + test "initializes with default values" do + assigns = create_assigns() + + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + assert socket.assigns.id == "test-dropdown" + assert socket.assigns.open == false + assert socket.assigns.all_fields == assigns.all_fields + assert socket.assigns.selected_fields == assigns.selected_fields + end + + test "preserves existing open state" do + assigns = create_assigns() + existing_socket = %{assigns: %{open: true}} + + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, existing_socket) + + assert socket.assigns.open == true + end + + test "handles missing optional assigns" do + minimal_assigns = %{id: "test"} + + {:ok, socket} = FieldVisibilityDropdownComponent.update(minimal_assigns, %{}) + + assert socket.assigns.all_fields == [] + assert socket.assigns.custom_fields == [] + assert socket.assigns.selected_fields == %{} + end + end + + describe "render/1" do + test "renders dropdown button" do + assigns = create_assigns() + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + assert html =~ "Columns" + assert html =~ "hero-adjustments-horizontal" + assert has_element?(html, "button[aria-controls='field-visibility-menu']") + end + + test "renders dropdown menu when open" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + assert has_element?(html, "ul#field-visibility-menu") + assert html =~ "All" + assert html =~ "None" + end + + test "does not render menu when closed" do + assigns = create_assigns() |> Map.put(:open, false) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + refute has_element?(html, "ul#field-visibility-menu") + end + + test "renders member fields" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + # Field names should be formatted (first_name -> First Name) + assert html =~ "First Name" or html =~ "first_name" + assert html =~ "Email" or html =~ "email" + assert html =~ "Street" or html =~ "street" + end + + test "renders custom fields when custom fields exist" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + # Custom field name + assert html =~ "Custom Field 1" + end + + test "renders checkboxes with correct checked state" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + # first_name should be checked (aria-checked="true") + assert html =~ ~s(aria-checked="true") + assert html =~ ~s(phx-value-item="first_name") + + # street should not be checked (aria-checked="false") + assert html =~ ~s(phx-value-item="street") + # Note: The visual checkbox state is handled by CSS classes and aria-checked attribute + end + + test "includes accessibility attributes" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + assert html =~ ~s(aria-controls="field-visibility-menu") + assert html =~ ~s(aria-haspopup="menu") + assert html =~ ~s(role="button") + assert html =~ ~s(role="menu") + assert html =~ ~s(role="menuitemcheckbox") + end + + test "formats member field labels correctly" do + assigns = create_assigns() |> Map.put(:open, true) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + # Field names should be formatted (first_name -> First Name) + assert html =~ "First Name" or html =~ "first_name" + end + + test "uses custom field names from custom_fields prop" do + assigns = + create_assigns() + |> Map.put(:open, true) + |> Map.put(:custom_fields, [ + %{id: "123", name: "Membership Number"} + ]) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + assert html =~ "Membership Number" + end + + test "falls back to ID when custom field not found" do + assigns = + create_assigns() + |> Map.put(:open, true) + # Empty custom fields list + |> Map.put(:custom_fields, []) + + html = render_component(FieldVisibilityDropdownComponent, assigns) + + # Should show something like "Custom Field 123" + assert html =~ "custom_field_123" or html =~ "Custom Field" + end + end + + describe "handle_event/2" do + test "toggle_dropdown toggles open state" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + assert socket.assigns.open == false + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event("toggle_dropdown", %{}, socket) + + assert socket.assigns.open == true + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event("toggle_dropdown", %{}, socket) + + assert socket.assigns.open == false + end + + test "close_dropdown sets open to false" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + socket = assign(socket, :open, true) + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event("close_dropdown", %{}, socket) + + assert socket.assigns.open == false + end + + test "select_item toggles field visibility" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + assert socket.assigns.selected_fields["first_name"] == true + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event( + "select_item", + %{"item" => "first_name"}, + socket + ) + + assert socket.assigns.selected_fields["first_name"] == false + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event( + "select_item", + %{"item" => "first_name"}, + socket + ) + + assert socket.assigns.selected_fields["first_name"] == true + end + + test "select_item defaults to true for missing fields" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event( + "select_item", + %{"item" => "new_field"}, + socket + ) + + # Toggled from default true + assert socket.assigns.selected_fields["new_field"] == false + end + + test "select_item sends message to parent" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + FieldVisibilityDropdownComponent.handle_event( + "select_item", + %{"item" => "first_name"}, + socket + ) + + # Check that message was sent (would be verified in integration test) + # For unit test, we just verify the state change + assert_receive {:field_toggled, "first_name", false} + end + + test "select_all sets all fields to true" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event("select_all", %{}, socket) + + assert socket.assigns.selected_fields["first_name"] == true + assert socket.assigns.selected_fields["email"] == true + assert socket.assigns.selected_fields["street"] == true + assert socket.assigns.selected_fields["custom_field_123"] == true + end + + test "select_all sends message to parent" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + FieldVisibilityDropdownComponent.handle_event("select_all", %{}, socket) + + assert_receive {:fields_selected, selection} + assert selection["first_name"] == true + assert selection["email"] == true + end + + test "select_none sets all fields to false" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event("select_none", %{}, socket) + + assert socket.assigns.selected_fields["first_name"] == false + assert socket.assigns.selected_fields["email"] == false + assert socket.assigns.selected_fields["street"] == false + assert socket.assigns.selected_fields["custom_field_123"] == false + end + + test "select_none sends message to parent" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + FieldVisibilityDropdownComponent.handle_event("select_none", %{}, socket) + + assert_receive {:fields_selected, selection} + assert selection["first_name"] == false + assert selection["email"] == false + end + + test "handles custom field toggle" do + assigns = create_assigns() + {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) + + {:noreply, socket} = + FieldVisibilityDropdownComponent.handle_event( + "select_item", + %{"item" => "custom_field_123"}, + socket + ) + + assert socket.assigns.selected_fields["custom_field_123"] == false + end + end + + describe "integration with LiveView" do + test "component can be rendered in LiveView" do + conn = conn_with_oidc_user(build_conn()) + {:ok, view, _html} = live(conn, "/members") + + # Check that component is rendered + assert has_element?(view, "button[aria-controls='field-visibility-menu']") + end + + test "clicking button opens dropdown" do + conn = conn_with_oidc_user(build_conn()) + {:ok, view, _html} = live(conn, "/members") + + # Initially closed + refute has_element?(view, "ul#field-visibility-menu") + + # Click button + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Should be open now + assert has_element?(view, "ul#field-visibility-menu") + end + + test "toggling field updates selection" do + conn = conn_with_oidc_user(build_conn()) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Toggle a field + view + |> element("button[phx-click='select_item'][phx-value-item='first_name']") + |> render_click() + + # Component should update (verified by state change) + # In a real scenario, this would trigger a reload of members + end + end +end diff --git a/test/mv_web/live/member_live/index/field_selection_test.exs b/test/mv_web/live/member_live/index/field_selection_test.exs new file mode 100644 index 0000000..3c242c7 --- /dev/null +++ b/test/mv_web/live/member_live/index/field_selection_test.exs @@ -0,0 +1,346 @@ +defmodule MvWeb.MemberLive.Index.FieldSelectionTest do + @moduledoc """ + Tests for FieldSelection module handling cookie/session/URL management. + """ + use ExUnit.Case, async: true + + alias MvWeb.MemberLive.Index.FieldSelection + + describe "get_from_session/1" do + test "returns empty map when session is empty" do + assert FieldSelection.get_from_session(%{}) == %{} + end + + test "returns empty map when session key is missing" do + session = %{"other_key" => "value"} + assert FieldSelection.get_from_session(session) == %{} + end + + test "parses valid JSON from session" do + json = Jason.encode!(%{"first_name" => true, "email" => false}) + session = %{"member_field_selection" => json} + + result = FieldSelection.get_from_session(session) + + assert result == %{"first_name" => true, "email" => false} + end + + test "handles invalid JSON gracefully" do + session = %{"member_field_selection" => "invalid json{["} + + result = FieldSelection.get_from_session(session) + + assert result == %{} + end + + test "converts non-boolean values to true" do + json = Jason.encode!(%{"first_name" => "true", "email" => 1, "street" => true}) + session = %{"member_field_selection" => json} + + result = FieldSelection.get_from_session(session) + + # All values should be booleans, non-booleans default to true + assert result["first_name"] == true + assert result["email"] == true + assert result["street"] == true + end + + test "handles nil session" do + assert FieldSelection.get_from_session(nil) == %{} + end + + test "handles non-map session" do + assert FieldSelection.get_from_session("not a map") == %{} + end + end + + describe "save_to_session/2" do + test "saves field selection to session as JSON" do + session = %{} + selection = %{"first_name" => true, "email" => false} + + result = FieldSelection.save_to_session(session, selection) + + assert Map.has_key?(result, "member_field_selection") + assert Jason.decode!(result["member_field_selection"]) == selection + end + + test "overwrites existing selection" do + session = %{"member_field_selection" => Jason.encode!(%{"old" => true})} + selection = %{"new" => true} + + result = FieldSelection.save_to_session(session, selection) + + assert Jason.decode!(result["member_field_selection"]) == selection + end + + test "handles empty selection" do + session = %{} + selection = %{} + + result = FieldSelection.save_to_session(session, selection) + + assert Jason.decode!(result["member_field_selection"]) == %{} + end + + test "handles invalid selection gracefully" do + session = %{} + + result = FieldSelection.save_to_session(session, "not a map") + + assert result == session + end + end + + describe "get_from_cookie/1" do + test "returns empty map when cookie is missing" do + conn = Plug.Conn.put_req_header(%Plug.Conn{}, "cookie", "") + + result = FieldSelection.get_from_cookie(conn) + + assert result == %{} + end + + test "parses valid JSON from cookie" do + json = Jason.encode!(%{"first_name" => true, "email" => false}) + conn = Plug.Conn.put_req_cookie(%Plug.Conn{}, "member_field_selection", json) + + result = FieldSelection.get_from_cookie(conn) + + assert result == %{"first_name" => true, "email" => false} + end + + test "handles invalid JSON in cookie gracefully" do + conn = Plug.Conn.put_req_cookie(%Plug.Conn{}, "member_field_selection", "invalid{[") + + result = FieldSelection.get_from_cookie(conn) + + assert result == %{} + end + end + + describe "save_to_cookie/2" do + test "saves field selection to cookie" do + conn = %Plug.Conn{} + selection = %{"first_name" => true, "email" => false} + + result = FieldSelection.save_to_cookie(conn, selection) + + # Check that cookie is set + assert result.resp_cookies["member_field_selection"] + cookie = result.resp_cookies["member_field_selection"] + assert cookie[:max_age] == 365 * 24 * 60 * 60 + assert cookie[:same_site] == "Lax" + assert cookie[:http_only] == true + end + + test "handles invalid selection gracefully" do + conn = %Plug.Conn{} + + result = FieldSelection.save_to_cookie(conn, "not a map") + + assert result == conn + end + end + + describe "parse_from_url/1" do + test "returns empty map when params is empty" do + assert FieldSelection.parse_from_url(%{}) == %{} + end + + test "returns empty map when fields parameter is missing" do + params = %{"query" => "test", "sort_field" => "first_name"} + assert FieldSelection.parse_from_url(params) == %{} + end + + test "parses comma-separated field names" do + params = %{"fields" => "first_name,email,street"} + + result = FieldSelection.parse_from_url(params) + + assert result == %{ + "first_name" => true, + "email" => true, + "street" => true + } + end + + test "handles custom field names" do + params = %{"fields" => "custom_field_abc-123,custom_field_def-456"} + + result = FieldSelection.parse_from_url(params) + + assert result == %{ + "custom_field_abc-123" => true, + "custom_field_def-456" => true + } + end + + test "handles mixed member and custom fields" do + params = %{"fields" => "first_name,custom_field_123,email"} + + result = FieldSelection.parse_from_url(params) + + assert result == %{ + "first_name" => true, + "custom_field_123" => true, + "email" => true + } + end + + test "trims whitespace from field names" do + params = %{"fields" => " first_name , email , street "} + + result = FieldSelection.parse_from_url(params) + + assert result == %{ + "first_name" => true, + "email" => true, + "street" => true + } + end + + test "handles empty fields string" do + params = %{"fields" => ""} + assert FieldSelection.parse_from_url(params) == %{} + end + + test "handles nil fields parameter" do + params = %{"fields" => nil} + assert FieldSelection.parse_from_url(params) == %{} + end + + test "filters out empty field names" do + params = %{"fields" => "first_name,,email,"} + + result = FieldSelection.parse_from_url(params) + + assert result == %{ + "first_name" => true, + "email" => true + } + end + + test "handles non-map params" do + assert FieldSelection.parse_from_url(nil) == %{} + assert FieldSelection.parse_from_url("not a map") == %{} + end + end + + describe "merge_sources/3" do + test "merges all sources with URL having highest priority" do + url_selection = %{"first_name" => false} + session_selection = %{"first_name" => true, "email" => true} + cookie_selection = %{"first_name" => true, "street" => true} + + result = FieldSelection.merge_sources(url_selection, session_selection, cookie_selection) + + # URL overrides session, session overrides cookie + assert result["first_name"] == false + assert result["email"] == true + assert result["street"] == true + end + + test "handles empty sources" do + result = FieldSelection.merge_sources(%{}, %{}, %{}) + + assert result == %{} + end + + test "cookie only" do + cookie_selection = %{"first_name" => true} + + result = FieldSelection.merge_sources(%{}, %{}, cookie_selection) + + assert result == %{"first_name" => true} + end + + test "session overrides cookie" do + session_selection = %{"first_name" => false} + cookie_selection = %{"first_name" => true} + + result = FieldSelection.merge_sources(%{}, session_selection, cookie_selection) + + assert result["first_name"] == false + end + + test "URL overrides everything" do + url_selection = %{"first_name" => true} + session_selection = %{"first_name" => false} + cookie_selection = %{"first_name" => false} + + result = FieldSelection.merge_sources(url_selection, session_selection, cookie_selection) + + assert result["first_name"] == true + end + + test "combines fields from all sources" do + url_selection = %{"url_field" => true} + session_selection = %{"session_field" => true} + cookie_selection = %{"cookie_field" => true} + + result = FieldSelection.merge_sources(url_selection, session_selection, cookie_selection) + + assert result["url_field"] == true + assert result["session_field"] == true + assert result["cookie_field"] == true + end + end + + describe "to_url_param/1" do + test "converts selection to comma-separated string" do + selection = %{"first_name" => true, "email" => true, "street" => false} + + result = FieldSelection.to_url_param(selection) + + # Only visible fields should be included + assert result == "first_name,email" + end + + test "handles empty selection" do + assert FieldSelection.to_url_param(%{}) == "" + end + + test "handles all fields hidden" do + selection = %{"first_name" => false, "email" => false} + + result = FieldSelection.to_url_param(selection) + + assert result == "" + end + + test "preserves field order" do + selection = %{ + "z_field" => true, + "a_field" => true, + "m_field" => true + } + + result = FieldSelection.to_url_param(selection) + + # Order should be preserved (map iteration order) + assert String.contains?(result, "z_field") + assert String.contains?(result, "a_field") + assert String.contains?(result, "m_field") + end + + test "handles custom fields" do + selection = %{ + "first_name" => true, + "custom_field_abc-123" => true, + "email" => false + } + + result = FieldSelection.to_url_param(selection) + + assert String.contains?(result, "first_name") + assert String.contains?(result, "custom_field_abc-123") + refute String.contains?(result, "email") + end + + test "handles invalid input" do + assert FieldSelection.to_url_param(nil) == "" + assert FieldSelection.to_url_param("not a map") == "" + end + end +end diff --git a/test/mv_web/live/member_live/index/field_visibility_test.exs b/test/mv_web/live/member_live/index/field_visibility_test.exs new file mode 100644 index 0000000..83ae06d --- /dev/null +++ b/test/mv_web/live/member_live/index/field_visibility_test.exs @@ -0,0 +1,336 @@ +defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do + @moduledoc """ + Tests for FieldVisibility module handling field visibility merging logic. + """ + use ExUnit.Case, async: true + + alias MvWeb.MemberLive.Index.FieldVisibility + + # Mock custom field structs for testing + defp create_custom_field(id, name, show_in_overview \\ true) do + %{ + id: id, + name: name, + show_in_overview: show_in_overview + } + end + + describe "get_all_available_fields/1" do + test "returns member fields and custom fields" do + custom_fields = [ + create_custom_field("cf1", "Custom Field 1"), + create_custom_field("cf2", "Custom Field 2") + ] + + result = FieldVisibility.get_all_available_fields(custom_fields) + + # Should include all member fields + assert :first_name in result + assert :email in result + assert :street in result + + # Should include custom fields as strings + assert "custom_field_cf1" in result + assert "custom_field_cf2" in result + end + + test "handles empty custom fields list" do + result = FieldVisibility.get_all_available_fields([]) + + # Should only have member fields + assert :first_name in result + assert :email in result + + refute Enum.any?(result, fn field -> + is_binary(field) and String.starts_with?(field, "custom_field_") + end) + end + + test "includes all member fields from constants" do + custom_fields = [] + result = FieldVisibility.get_all_available_fields(custom_fields) + + member_fields = Mv.Constants.member_fields() + + Enum.each(member_fields, fn field -> + assert field in result + end) + end + end + + describe "merge_with_global_settings/3" do + test "user selection overrides global settings" do + user_selection = %{"first_name" => false} + settings = %{member_field_visibility: %{first_name: true, email: true}} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["first_name"] == false + assert result["email"] == true + end + + test "falls back to global settings when user selection is empty" do + user_selection = %{} + settings = %{member_field_visibility: %{first_name: false, email: true}} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["first_name"] == false + assert result["email"] == true + end + + test "defaults to true when field not in settings" do + user_selection = %{} + settings = %{member_field_visibility: %{first_name: false}} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + # first_name from settings + assert result["first_name"] == false + # email defaults to true (not in settings) + assert result["email"] == true + end + + test "handles custom fields visibility" do + user_selection = %{} + settings = %{member_field_visibility: %{}} + + custom_fields = [ + create_custom_field("cf1", "Custom 1", true), + create_custom_field("cf2", "Custom 2", false) + ] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["custom_field_cf1"] == true + assert result["custom_field_cf2"] == false + end + + test "user selection overrides custom field visibility" do + user_selection = %{"custom_field_cf1" => false} + settings = %{member_field_visibility: %{}} + + custom_fields = [ + create_custom_field("cf1", "Custom 1", true) + ] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["custom_field_cf1"] == false + end + + test "handles string keys in settings (JSONB format)" do + user_selection = %{} + settings = %{member_field_visibility: %{"first_name" => false, "email" => true}} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["first_name"] == false + assert result["email"] == true + end + + test "handles mixed atom and string keys in settings" do + user_selection = %{} + # Use string keys only (as JSONB would return) + settings = %{member_field_visibility: %{"first_name" => false, "email" => true}} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + assert result["first_name"] == false + assert result["email"] == true + end + + test "handles nil settings gracefully" do + user_selection = %{} + settings = %{member_field_visibility: nil} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + # Should default all fields to true + assert result["first_name"] == true + assert result["email"] == true + end + + test "handles missing member_field_visibility key" do + user_selection = %{} + settings = %{} + custom_fields = [] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + # Should default all fields to true + assert result["first_name"] == true + assert result["email"] == true + end + + test "includes all fields in result" do + user_selection = %{"first_name" => false} + settings = %{member_field_visibility: %{email: true}} + + custom_fields = [ + create_custom_field("cf1", "Custom 1", true) + ] + + result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields) + + # Should include all member fields + member_fields = Mv.Constants.member_fields() + + Enum.each(member_fields, fn field -> + assert Map.has_key?(result, Atom.to_string(field)) + end) + + # Should include custom fields + assert Map.has_key?(result, "custom_field_cf1") + end + end + + describe "get_visible_fields/1" do + test "returns only fields with true visibility" do + selection = %{ + "first_name" => true, + "email" => false, + "street" => true, + "custom_field_123" => false + } + + result = FieldVisibility.get_visible_fields(selection) + + assert :first_name in result + assert :street in result + refute :email in result + refute "custom_field_123" in result + end + + test "converts member field strings to atoms" do + selection = %{"first_name" => true, "email" => true} + + result = FieldVisibility.get_visible_fields(selection) + + assert :first_name in result + assert :email in result + end + + test "keeps custom fields as strings" do + selection = %{"custom_field_abc-123" => true} + + result = FieldVisibility.get_visible_fields(selection) + + assert "custom_field_abc-123" in result + end + + test "handles empty selection" do + assert FieldVisibility.get_visible_fields(%{}) == [] + end + + test "handles all fields hidden" do + selection = %{"first_name" => false, "email" => false} + + assert FieldVisibility.get_visible_fields(selection) == [] + end + + test "handles invalid input" do + assert FieldVisibility.get_visible_fields(nil) == [] + end + end + + describe "get_visible_member_fields/1" do + test "returns only member fields that are visible" do + selection = %{ + "first_name" => true, + "email" => true, + "custom_field_123" => true, + "street" => false + } + + result = FieldVisibility.get_visible_member_fields(selection) + + assert :first_name in result + assert :email in result + refute :street in result + refute "custom_field_123" in result + end + + test "filters out custom fields" do + selection = %{ + "first_name" => true, + "custom_field_123" => true, + "custom_field_456" => true + } + + result = FieldVisibility.get_visible_member_fields(selection) + + assert :first_name in result + refute "custom_field_123" in result + refute "custom_field_456" in result + end + + test "handles empty selection" do + assert FieldVisibility.get_visible_member_fields(%{}) == [] + end + + test "handles invalid input" do + assert FieldVisibility.get_visible_member_fields(nil) == [] + end + end + + describe "get_visible_custom_fields/1" do + test "returns only custom fields that are visible" do + selection = %{ + "first_name" => true, + "custom_field_123" => true, + "custom_field_456" => false, + "email" => true + } + + result = FieldVisibility.get_visible_custom_fields(selection) + + assert "custom_field_123" in result + refute "custom_field_456" in result + refute :first_name in result + refute :email in result + end + + test "filters out member fields" do + selection = %{ + "first_name" => true, + "email" => true, + "custom_field_123" => true + } + + result = FieldVisibility.get_visible_custom_fields(selection) + + assert "custom_field_123" in result + refute :first_name in result + refute :email in result + end + + test "handles empty selection" do + assert FieldVisibility.get_visible_custom_fields(%{}) == [] + end + + test "handles fields that look like custom fields but aren't" do + selection = %{ + "custom_field_123" => true, + "custom_field_like_name" => true, + "not_custom_field" => true + } + + result = FieldVisibility.get_visible_custom_fields(selection) + + assert "custom_field_123" in result + assert "custom_field_like_name" in result + refute "not_custom_field" in result + end + + test "handles invalid input" do + assert FieldVisibility.get_visible_custom_fields(nil) == [] + end + end +end diff --git a/test/mv_web/member_live/index_field_visibility_test.exs b/test/mv_web/member_live/index_field_visibility_test.exs new file mode 100644 index 0000000..c4241fe --- /dev/null +++ b/test/mv_web/member_live/index_field_visibility_test.exs @@ -0,0 +1,509 @@ +defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do + @moduledoc """ + Integration tests for field visibility dropdown functionality. + + Tests cover: + - Field selection dropdown rendering + - Toggling field visibility + - URL parameter persistence + - Select all / deselect all + - Integration with member list display + - Custom fields visibility + """ + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + setup do + # Create test members + {:ok, member1} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com", + street: "Main St", + city: "Berlin" + }) + |> Ash.create() + + {:ok, member2} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Bob", + last_name: "Brown", + email: "bob@example.com", + street: "Second St", + city: "Hamburg" + }) + |> Ash.create() + + # Create custom field + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "membership_number", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create custom field values + {:ok, _cfv1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: custom_field.id, + value: "M001" + }) + |> Ash.create() + + {:ok, _cfv2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member2.id, + custom_field_id: custom_field.id, + value: "M002" + }) + |> Ash.create() + + %{ + member1: member1, + member2: member2, + custom_field: custom_field + } + end + + describe "field visibility dropdown" do + test "renders dropdown button", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ "Columns" + assert html =~ ~s(aria-controls="field-visibility-menu") + end + + test "opens dropdown when button is clicked", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Initially closed + refute has_element?(view, "ul#field-visibility-menu") + + # Click button + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Should be open now + assert has_element?(view, "ul#field-visibility-menu") + end + + test "displays all member fields in dropdown", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + html = render(view) + + # Check for member fields (formatted labels) + assert html =~ "First Name" or html =~ "first_name" + assert html =~ "Email" or html =~ "email" + assert html =~ "Street" or html =~ "street" + end + + test "displays custom fields in dropdown", %{conn: conn, custom_field: custom_field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + html = render(view) + + assert html =~ custom_field.name + end + end + + describe "field visibility toggling" do + test "hiding a field removes it from display", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Verify email is visible initially + html = render(view) + assert html =~ "alice@example.com" + + # Open dropdown and hide email + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_click() + + # Wait for update + :timer.sleep(100) + + # Email should no longer be visible + html = render(view) + refute html =~ "alice@example.com" + refute html =~ "bob@example.com" + end + + test "showing a hidden field adds it to display", %{conn: conn} do + conn = conn_with_oidc_user(conn) + + # Start with only first_name and street explicitly set in URL + # Note: Other fields may still be visible due to global settings + {:ok, view, _html} = live(conn, "/members?fields=first_name,street") + + # Verify first_name and street are visible + html = render(view) + assert html =~ "Alice" + assert html =~ "Main St" + + # Open dropdown and toggle email (to ensure it's visible) + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # If email is not visible, toggle it to make it visible + # If it's already visible, toggle it off and on again + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_click() + + # Wait for update + :timer.sleep(100) + + # Email should now be visible + html = render(view) + assert html =~ "alice@example.com" + end + + test "hiding custom field removes it from display", %{conn: conn, custom_field: custom_field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Verify custom field is visible initially + html = render(view) + assert html =~ "M001" or html =~ custom_field.name + + # Open dropdown and hide custom field + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + custom_field_id = custom_field.id + custom_field_string = "custom_field_#{custom_field_id}" + + view + |> element("button[phx-click='select_item'][phx-value-item='#{custom_field_string}']") + |> render_click() + + # Wait for update + :timer.sleep(100) + + # Custom field should no longer be visible + html = render(view) + refute html =~ "M001" + refute html =~ "M002" + end + end + + describe "select all / deselect all" do + test "select all makes all fields visible", %{conn: conn} do + conn = conn_with_oidc_user(conn) + + # Start with some fields hidden + {:ok, view, _html} = live(conn, "/members?fields=first_name") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Click select all + view + |> element("button[phx-click='select_all']") + |> render_click() + + # Wait for update + :timer.sleep(100) + + # All fields should be visible + html = render(view) + assert html =~ "alice@example.com" + assert html =~ "Main St" + assert html =~ "Berlin" + end + + test "deselect all hides all fields except first_name", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Click deselect all + view + |> element("button[phx-click='select_none']") + |> render_click() + + # Wait for update + :timer.sleep(100) + + # Only first_name should be visible (it's always shown) + html = render(view) + # Email and street should be hidden + refute html =~ "alice@example.com" + refute html =~ "Main St" + end + end + + describe "URL parameter persistence" do + test "field selection is persisted in URL", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown and hide email + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_click() + + # Wait for URL update + :timer.sleep(100) + + # Check that URL contains fields parameter + # Note: In LiveView tests, we check the rendered HTML for the updated state + # The actual URL update happens via push_patch + end + + test "loading page with fields parameter applies selection", %{conn: conn} do + conn = conn_with_oidc_user(conn) + + # Load with first_name and city explicitly set in URL + # Note: Other fields may still be visible due to global settings + {:ok, view, _html} = live(conn, "/members?fields=first_name,city") + + html = render(view) + + # first_name and city should be visible + assert html =~ "Alice" + assert html =~ "Berlin" + + # Note: email and street may still be visible if global settings allow it + # This test verifies that the URL parameters work, not that they hide other fields + end + + test "fields parameter works with custom fields", %{conn: conn, custom_field: custom_field} do + conn = conn_with_oidc_user(conn) + custom_field_id = custom_field.id + + # Load with custom field visible + {:ok, view, _html} = + live(conn, "/members?fields=first_name,custom_field_#{custom_field_id}") + + html = render(view) + + # Custom field should be visible + assert html =~ "M001" or html =~ custom_field.name + end + end + + describe "integration with global settings" do + test "respects global settings when no user selection", %{conn: conn} do + # This test would require setting up global settings + # For now, we verify that the system works with default settings + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # All fields should be visible by default + assert html =~ "alice@example.com" + assert html =~ "Main St" + end + + test "user selection overrides global settings", %{conn: conn} do + # This would require setting up global settings first + # Then verifying that user selection takes precedence + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Hide a field via dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_click() + + :timer.sleep(100) + + html = render(view) + refute html =~ "alice@example.com" + end + end + + describe "edge cases" do + test "handles empty fields parameter", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members?fields=") + + # Should fall back to global settings + assert html =~ "alice@example.com" + end + + test "handles invalid field names in URL", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members?fields=invalid_field,another_invalid") + + # Should ignore invalid fields and use defaults + assert html =~ "alice@example.com" + end + + test "handles custom field that doesn't exist", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members?fields=first_name,custom_field_nonexistent") + + # Should work without errors + assert html =~ "Alice" + end + + test "handles rapid toggling", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Rapidly toggle a field multiple times + for _ <- 1..5 do + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_click() + + :timer.sleep(50) + end + + # Should still work correctly + html = render(view) + assert html =~ "Alice" + end + end + + describe "accessibility" do + test "dropdown has proper ARIA attributes", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ ~s(aria-controls="field-visibility-menu") + assert html =~ ~s(aria-haspopup="menu") + assert html =~ ~s(role="button") + end + + test "menu items have proper ARIA attributes when open", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + html = render(view) + + assert html =~ ~s(role="menu") + assert html =~ ~s(role="menuitemcheckbox") + assert html =~ ~s(aria-checked) + end + + test "keyboard navigation works", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Check that elements are keyboard accessible + html = render(view) + assert html =~ ~s(tabindex="0") + # Check that keyboard events are supported + assert html =~ ~s(phx-keydown="select_item") + assert html =~ ~s(phx-key="Enter Space") + end + + test "keyboard activation with Enter key works", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Verify email is visible initially + html = render(view) + assert html =~ "alice@example.com" + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Simulate Enter key press on email field button + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_keydown("Enter") + + # Wait for update + :timer.sleep(100) + + # Email should no longer be visible + html = render(view) + refute html =~ "alice@example.com" + end + + test "keyboard activation with Space key works", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Verify email is visible initially + html = render(view) + assert html =~ "alice@example.com" + + # Open dropdown + view + |> element("button[aria-controls='field-visibility-menu']") + |> render_click() + + # Simulate Space key press on email field button + view + |> element("button[phx-click='select_item'][phx-value-item='email']") + |> render_keydown(" ") + + # Wait for update + :timer.sleep(100) + + # Email should no longer be visible + html = render(view) + refute html =~ "alice@example.com" + end + end +end From 0fb43a08162ff9e07b63bf2ed8f20c04d69a167d Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 15:00:09 +0100 Subject: [PATCH 08/35] feat: adds field visibility dropdown live component --- lib/mv_web/components/core_components.ex | 120 +++++++++ .../field_visibility_dropdown_component.ex | 172 +++++++++++++ lib/mv_web/live/member_live/index.ex | 227 ++++++++++++++--- lib/mv_web/live/member_live/index.html.heex | 28 ++- .../live/member_live/index/field_selection.ex | 232 +++++++++++++++++ .../member_live/index/field_visibility.ex | 235 ++++++++++++++++++ 6 files changed, 981 insertions(+), 33 deletions(-) create mode 100644 lib/mv_web/components/field_visibility_dropdown_component.ex create mode 100644 lib/mv_web/live/member_live/index/field_selection.ex create mode 100644 lib/mv_web/live/member_live/index/field_visibility.ex diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index b8fe0fc..4f6bf37 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -111,6 +111,126 @@ defmodule MvWeb.CoreComponents do end end + @doc """ + Renders a dropdown menu. + + ## Examples + + <.dropdown_menu items={@items} open={@open} phx-target={@myself} /> + """ + attr :id, :string, default: "dropdown-menu" + attr :items, :list, required: true, doc: "List of %{label: string, value: any} maps" + attr :button_label, :string, default: "Dropdown" + attr :icon, :string, default: nil + attr :checkboxes, :boolean, default: false + attr :selected, :map, default: %{} + attr :open, :boolean, default: false, doc: "Whether the dropdown is open" + attr :show_select_buttons, :boolean, default: false, doc: "Show select all/none buttons" + attr :phx_target, :any, default: nil + + def dropdown_menu(assigns) do + unless Map.has_key?(assigns, :phx_target) do + raise ArgumentError, ":phx_target is required in dropdown_menu/1" + end + + assigns = + assign_new(assigns, :items, fn -> [] end) + |> assign_new(:button_label, fn -> "Dropdown" end) + |> assign_new(:icon, fn -> nil end) + |> assign_new(:checkboxes, fn -> false end) + |> assign_new(:selected, fn -> %{} end) + |> assign_new(:open, fn -> false end) + |> assign_new(:show_select_buttons, fn -> false end) + |> assign(:phx_target, assigns.phx_target) + |> assign_new(:id, fn -> "dropdown-menu" end) + + ~H""" +
+ + + +
+ """ + end + @doc """ Renders an input with label and error messages. diff --git a/lib/mv_web/components/field_visibility_dropdown_component.ex b/lib/mv_web/components/field_visibility_dropdown_component.ex new file mode 100644 index 0000000..1ee0487 --- /dev/null +++ b/lib/mv_web/components/field_visibility_dropdown_component.ex @@ -0,0 +1,172 @@ +defmodule MvWeb.Components.FieldVisibilityDropdownComponent do + @moduledoc """ + LiveComponent for managing field visibility in the member overview. + + Provides an accessible dropdown menu where users can select/deselect + which member fields and custom fields are visible in the table. + + ## Props + - `:all_fields` - List of all available fields + - `:custom_fields` - List of CustomField resources + - `:selected_fields` - Map field_name → boolean + - `:id` - Component ID + + ## Events sent to parent: + - `{:field_toggled, field, value}` + - `{:fields_selected, map}` + """ + + use MvWeb, :live_component + + # --------------------------------------------------------------------------- + # UPDATE + # --------------------------------------------------------------------------- + + @impl true + def update(assigns, socket) do + socket = + socket + |> assign(assigns) + |> assign_new(:open, fn -> false end) + |> assign_new(:all_fields, fn -> [] end) + |> assign_new(:custom_fields, fn -> [] end) + |> assign_new(:selected_fields, fn -> %{} end) + + {:ok, socket} + end + + # --------------------------------------------------------------------------- + # RENDER + # --------------------------------------------------------------------------- + + @impl true + def render(assigns) do + all_fields = assigns.all_fields || [] + custom_fields = assigns.custom_fields || [] + + all_items = + Enum.map(member_fields(all_fields), fn field -> + %{ + value: field_to_string(field), + label: format_field_label(field) + } + end) ++ + Enum.map(custom_fields(all_fields), fn field -> + %{ + value: field, + label: format_custom_field_label(field, custom_fields) + } + end) + + assigns = assign(assigns, :all_items, all_items) + + # LiveComponents require a static HTML element as root, not a function component + ~H""" +
+ <.dropdown_menu + id="field-visibility-menu" + icon="hero-adjustments-horizontal" + button_label={gettext("Columns")} + items={@all_items} + checkboxes={true} + selected={@selected_fields} + open={@open} + show_select_buttons={true} + phx_target={@myself} + /> +
+ """ + end + + # --------------------------------------------------------------------------- + # EVENTS (matching the Core Component API) + # --------------------------------------------------------------------------- + + @impl true + def handle_event("toggle_dropdown", _params, socket) do + {:noreply, assign(socket, :open, !socket.assigns.open)} + end + + def handle_event("close_dropdown", _params, socket) do + {:noreply, assign(socket, :open, false)} + end + + # toggle single item + def handle_event("select_item", %{"item" => item}, socket) do + current = Map.get(socket.assigns.selected_fields, item, true) + updated = Map.put(socket.assigns.selected_fields, item, !current) + + send(self(), {:field_toggled, item, !current}) + {:noreply, assign(socket, :selected_fields, updated)} + end + + # select all + def handle_event("select_all", _params, socket) do + all = + socket.assigns.all_fields + |> Enum.map(&field_to_string/1) + |> Enum.map(&{&1, true}) + |> Enum.into(%{}) + + send(self(), {:fields_selected, all}) + {:noreply, assign(socket, :selected_fields, all)} + end + + # select none + def handle_event("select_none", _params, socket) do + none = + socket.assigns.all_fields + |> Enum.map(&field_to_string/1) + |> Enum.map(&{&1, false}) + |> Enum.into(%{}) + + send(self(), {:fields_selected, none}) + {:noreply, assign(socket, :selected_fields, none)} + end + + # --------------------------------------------------------------------------- + # HELPERS (with defensive nil guards) + # --------------------------------------------------------------------------- + + defp member_fields(nil), do: [] + + defp member_fields(fields) do + Enum.filter(fields, fn field -> + is_atom(field) || + (is_binary(field) && not String.starts_with?(field, "custom_field_")) + end) + end + + defp custom_fields(nil), do: [] + + defp custom_fields(fields) do + Enum.filter(fields, fn field -> + is_binary(field) && String.starts_with?(field, "custom_field_") + end) + end + + defp field_to_string(field) when is_atom(field), do: Atom.to_string(field) + defp field_to_string(field) when is_binary(field), do: field + + defp format_field_label(field) do + field + |> field_to_string() + |> String.replace("_", " ") + |> String.split() + |> Enum.map(&String.capitalize/1) + |> Enum.join(" ") + end + + defp format_custom_field_label(field_string, custom_fields) do + case String.trim_leading(field_string, "custom_field_") do + "" -> + field_string + + id -> + case Enum.find(custom_fields, fn cf -> to_string(cf.id) == id end) do + nil -> gettext("Custom Field %{id}", id: id) + custom_field -> custom_field.name + end + end + end +end diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 6bce495..522dfa1 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -31,6 +31,8 @@ defmodule MvWeb.MemberLive.Index do alias Mv.Membership alias MvWeb.MemberLive.Index.Formatter + alias MvWeb.MemberLive.Index.FieldSelection + alias MvWeb.MemberLive.Index.FieldVisibility # Prefix used in sort field names for custom fields (e.g., "custom_field_") @custom_field_prefix "custom_field_" @@ -48,8 +50,8 @@ defmodule MvWeb.MemberLive.Index do and member selection. Actual data loading happens in `handle_params/3`. """ @impl true - def mount(_params, _session, socket) do - # Load custom fields that should be shown in overview + def mount(_params, session, socket) do + # Load custom fields that should be shown in overview (for display) # Note: Using Ash.read! (bang version) - errors will be handled by Phoenix LiveView # and result in a 500 error page. This is appropriate for LiveViews where errors # should be visible to the user rather than silently failing. @@ -59,6 +61,12 @@ defmodule MvWeb.MemberLive.Index do |> Ash.Query.sort(name: :asc) |> Ash.read!() + # Load ALL custom fields for the dropdown (to show all available fields) + all_custom_fields = + Mv.Membership.CustomField + |> Ash.Query.sort(name: :asc) + |> Ash.read!() + # Load settings once to avoid N+1 queries settings = case Membership.get_settings() do @@ -67,6 +75,20 @@ defmodule MvWeb.MemberLive.Index do {:error, _} -> %{member_field_visibility: %{}} end + # Load user field selection from session + session_selection = FieldSelection.get_from_session(session) + + # Get all available fields (for dropdown - includes ALL custom fields) + all_available_fields = FieldVisibility.get_all_available_fields(all_custom_fields) + + # Merge session selection with global settings for initial state (use all_custom_fields) + initial_selection = + FieldVisibility.merge_with_global_settings( + session_selection, + settings, + all_custom_fields + ) + socket = socket |> assign(:page_title, gettext("Members")) @@ -76,8 +98,14 @@ defmodule MvWeb.MemberLive.Index do |> assign(:selected_members, []) |> assign(:settings, settings) |> assign(:custom_fields_visible, custom_fields_visible) + |> assign(:all_custom_fields, all_custom_fields) + |> assign(:all_available_fields, all_available_fields) + |> assign(:user_field_selection, initial_selection) |> assign(:member_field_configurations, get_member_field_configurations(settings)) - |> assign(:member_fields_visible, get_visible_member_fields(settings)) + |> assign( + :member_fields_visible, + FieldVisibility.get_visible_member_fields(initial_selection) + ) # We call handle params to use the query from the URL {:ok, socket} @@ -144,6 +172,8 @@ defmodule MvWeb.MemberLive.Index do ## Supported messages: - `{:sort, field}` - Sort event from SortHeaderComponent. Updates sort field/order and syncs URL - `{:search_changed, query}` - Search event from SearchBarComponent. Filters members and syncs URL + - `{:field_toggled, field, visible}` - Field toggle event from FieldVisibilityDropdownComponent + - `{:fields_selected, selection}` - Select all/deselect all event from FieldVisibilityDropdownComponent """ @impl true def handle_info({:sort, field_str}, socket) do @@ -170,11 +200,12 @@ defmodule MvWeb.MemberLive.Index do existing_sort_query = socket.assigns.sort_order # Build the URL with queries - query_params = %{ - "query" => q, - "sort_field" => existing_field_query, - "sort_order" => existing_sort_query - } + query_params = + build_query_params(socket, %{ + "query" => q, + "sort_field" => existing_field_query, + "sort_order" => existing_sort_query + }) # Set the new path with params new_path = ~p"/members?#{query_params}" @@ -187,22 +218,109 @@ defmodule MvWeb.MemberLive.Index do )} end + @impl true + def handle_info({:field_toggled, field_string, visible}, socket) do + # Update user field selection + new_selection = Map.put(socket.assigns.user_field_selection, field_string, visible) + + # Save to session (cookie will be saved on next page load via handle_params) + socket = update_session_field_selection(socket, new_selection) + + # Merge with global settings + final_selection = + FieldVisibility.merge_with_global_settings( + new_selection, + socket.assigns.settings, + socket.assigns.custom_fields_visible + ) + + # Get visible fields + visible_member_fields = FieldVisibility.get_visible_member_fields(final_selection) + visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection) + + socket = + socket + |> assign(:user_field_selection, final_selection) + |> assign(:member_fields_visible, visible_member_fields) + |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields)) + |> load_members(socket.assigns.query) + |> prepare_dynamic_cols() + |> push_field_selection_url() + + {:noreply, socket} + end + + @impl true + def handle_info({:fields_selected, selection}, socket) do + # Save to session + socket = update_session_field_selection(socket, selection) + + # Merge with global settings (use all_custom_fields for merging) + final_selection = + FieldVisibility.merge_with_global_settings( + selection, + socket.assigns.settings, + socket.assigns.all_custom_fields + ) + + # Get visible fields + visible_member_fields = FieldVisibility.get_visible_member_fields(final_selection) + visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection) + + socket = + socket + |> assign(:user_field_selection, final_selection) + |> assign(:member_fields_visible, visible_member_fields) + |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields)) + |> load_members(socket.assigns.query) + |> prepare_dynamic_cols() + |> push_field_selection_url() + + {:noreply, socket} + end + # ----------------------------------------------------------------- # Handle Params from the URL # ----------------------------------------------------------------- @doc """ Handles URL parameter changes. - Parses query parameters for search query, sort field, and sort order, + Parses query parameters for search query, sort field, sort order, and field selection, then loads members accordingly. This enables bookmarkable URLs and browser back/forward navigation. """ @impl true def handle_params(params, _url, socket) do + # Parse field selection from URL + url_selection = FieldSelection.parse_from_url(params) + + # Merge with session selection (URL has priority) + merged_selection = + FieldSelection.merge_sources( + url_selection, + socket.assigns.user_field_selection, + %{} + ) + + # Merge with global settings (use all_custom_fields for merging) + final_selection = + FieldVisibility.merge_with_global_settings( + merged_selection, + socket.assigns.settings, + socket.assigns.all_custom_fields + ) + + # Get visible fields + visible_member_fields = FieldVisibility.get_visible_member_fields(final_selection) + visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection) + socket = socket |> maybe_update_search(params) |> maybe_update_sort(params) + |> assign(:user_field_selection, final_selection) + |> assign(:member_fields_visible, visible_member_fields) + |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields)) |> load_members(params["query"]) |> prepare_dynamic_cols() @@ -215,10 +333,16 @@ defmodule MvWeb.MemberLive.Index do # - `:custom_field` - The CustomField resource # - `:render` - A function that formats the custom field value for a given member # + # Only includes custom fields that are visible according to user field selection. + # # Returns the socket with `:dynamic_cols` assigned. defp prepare_dynamic_cols(socket) do + visible_custom_field_ids = socket.assigns[:visible_custom_field_ids] || [] + dynamic_cols = - Enum.map(socket.assigns.custom_fields_visible, fn custom_field -> + socket.assigns.custom_fields_visible + |> Enum.filter(fn custom_field -> custom_field.id in visible_custom_field_ids end) + |> Enum.map(fn custom_field -> %{ custom_field: custom_field, render: fn member -> @@ -294,11 +418,11 @@ defmodule MvWeb.MemberLive.Index do field end - query_params = %{ - "query" => socket.assigns.query, - "sort_field" => field_str, - "sort_order" => Atom.to_string(order) - } + query_params = + build_query_params(socket, %{ + "sort_field" => field_str, + "sort_order" => Atom.to_string(order) + }) new_path = ~p"/members?#{query_params}" @@ -309,6 +433,47 @@ defmodule MvWeb.MemberLive.Index do )} end + # Builds query parameters including field selection + defp build_query_params(socket, base_params) do + base_params + |> Map.put("query", socket.assigns.query || "") + |> maybe_add_field_selection(socket.assigns[:user_field_selection]) + end + + # Adds field selection to query params if present + defp maybe_add_field_selection(params, nil), do: params + + defp maybe_add_field_selection(params, selection) when is_map(selection) do + fields_param = FieldSelection.to_url_param(selection) + if fields_param != "", do: Map.put(params, "fields", fields_param), else: params + end + + defp maybe_add_field_selection(params, _), do: params + + # Pushes URL with updated field selection + defp push_field_selection_url(socket) do + query_params = + build_query_params(socket, %{ + "sort_field" => field_to_string(socket.assigns.sort_field), + "sort_order" => Atom.to_string(socket.assigns.sort_order) + }) + + new_path = ~p"/members?#{query_params}" + + push_patch(socket, to: new_path, replace: true) + end + + # Converts field to string + defp field_to_string(field) when is_atom(field), do: Atom.to_string(field) + defp field_to_string(field) when is_binary(field), do: field + + # Updates session field selection (stored in socket for now, actual session update via controller) + defp update_session_field_selection(socket, selection) do + # Store in socket for now - actual session persistence would require a controller + # This is a placeholder for future session persistence + assign(socket, :user_field_selection, selection) + end + # Loads members from the database with custom field values and applies search/sort filters. # # Process: @@ -333,9 +498,9 @@ defmodule MvWeb.MemberLive.Index do |> Ash.Query.new() |> Ash.Query.select(@overview_fields) - # Load custom field values for visible custom fields - custom_field_ids_list = Enum.map(socket.assigns.custom_fields_visible, & &1.id) - query = load_custom_field_values(query, custom_field_ids_list) + # Load custom field values for visible custom fields (based on user selection) + visible_custom_field_ids = socket.assigns[:visible_custom_field_ids] || [] + query = load_custom_field_values(query, visible_custom_field_ids) # Apply the search filter first query = apply_search_filter(query, search_query) @@ -770,20 +935,6 @@ defmodule MvWeb.MemberLive.Index do end) end - # Gets the list of member fields that should be visible in the overview. - # - # Filters the member field configurations to return only fields with show_in_overview: true. - # - # Parameters: - # - `settings` - The settings struct loaded from the database - # - # Returns a list of atoms representing visible member field names. - @spec get_visible_member_fields(map()) :: [atom()] - defp get_visible_member_fields(settings) do - get_member_field_configurations(settings) - |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end) - |> Enum.map(fn {field, _show_in_overview} -> field end) - end # Normalizes visibility config map keys from strings to atoms. # JSONB in PostgreSQL converts atom keys to string keys when storing. @@ -808,4 +959,16 @@ defmodule MvWeb.MemberLive.Index do end defp normalize_visibility_config(_), do: %{} + + # Extracts custom field IDs from visible custom field strings + # Format: "custom_field_" -> + defp extract_custom_field_ids(visible_custom_fields) do + Enum.map(visible_custom_fields, fn field_string -> + case String.split(field_string, "custom_field_") do + ["", id] -> id + _ -> nil + end + end) + |> Enum.filter(&(&1 != nil)) + end end diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 594f2d8..e6076aa 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -2,6 +2,13 @@ <.header> {gettext("Members")} <:actions> + <.live_component + module={MvWeb.Components.FieldVisibilityDropdownComponent} + id="field-visibility-dropdown" + all_fields={@all_available_fields} + custom_fields={@all_custom_fields} + selected_fields={@user_field_selection} + /> <.button variant="primary" navigate={~p"/members/new"}> <.icon name="hero-plus" /> {gettext("New Member")} @@ -54,6 +61,7 @@ <:col :let={member} + :if={:first_name in @member_fields_visible} label={ ~H""" <.live_component @@ -67,7 +75,25 @@ """ } > - {member.first_name} {member.last_name} + {member.first_name} + + <:col + :let={member} + :if={:last_name in @member_fields_visible} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_last_name} + field={:last_name} + label={gettext("Last name")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.last_name} <:col :let={member} diff --git a/lib/mv_web/live/member_live/index/field_selection.ex b/lib/mv_web/live/member_live/index/field_selection.ex new file mode 100644 index 0000000..4b065f0 --- /dev/null +++ b/lib/mv_web/live/member_live/index/field_selection.ex @@ -0,0 +1,232 @@ +defmodule MvWeb.MemberLive.Index.FieldSelection do + @moduledoc """ + Handles user-specific field selection persistence and URL parameter parsing. + + This module manages: + - Reading/writing field selection from cookies (persistent storage) + - Reading/writing field selection from session (temporary storage) + - Parsing field selection from URL parameters + - Merging multiple sources with priority: URL > Session > Cookie + + ## Data Format + + Field selection is stored as a map: + ```elixir + %{ + "first_name" => true, + "email" => true, + "street" => false, + "custom_field_abc-123" => true + } + ``` + + ## Cookie/Session Format + + Stored as JSON string: `{"first_name":true,"email":true}` + + ## URL Format + + Comma-separated list: `?fields=first_name,email,custom_field_abc-123` + """ + + @cookie_name "member_field_selection" + @cookie_max_age 365 * 24 * 60 * 60 + @session_key "member_field_selection" + + @doc """ + Reads field selection from session. + + Returns a map of field names (strings) to boolean visibility values. + Returns empty map if no selection is stored. + """ + @spec get_from_session(map()) :: %{String.t() => boolean()} + def get_from_session(session) when is_map(session) do + case Map.get(session, @session_key) do + nil -> %{} + json_string when is_binary(json_string) -> parse_json(json_string) + _ -> %{} + end + end + + def get_from_session(_), do: %{} + + @doc """ + Saves field selection to session. + + Converts the map to JSON string and stores it in the session. + """ + @spec save_to_session(map(), %{String.t() => boolean()}) :: map() + def save_to_session(session, selection) when is_map(selection) do + json_string = Jason.encode!(selection) + Map.put(session, @session_key, json_string) + end + + def save_to_session(session, _), do: session + + @doc """ + Reads field selection from cookie. + + Returns a map of field names (strings) to boolean visibility values. + Returns empty map if no cookie is present. + + Note: This function requires the connection to have cookies parsed. + In LiveView, cookies are typically accessed via get_connect_info. + """ + @spec get_from_cookie(Plug.Conn.t()) :: %{String.t() => boolean()} + def get_from_cookie(conn) do + case Plug.Conn.get_req_header(conn, "cookie") do + nil -> + %{} + + cookie_header -> + # Parse cookies manually from header + cookies = parse_cookie_header(cookie_header) + + case Map.get(cookies, @cookie_name) do + nil -> %{} + json_string when is_binary(json_string) -> parse_json(json_string) + _ -> %{} + end + end + end + + # Parses cookie header string into a map + defp parse_cookie_header(cookie_header) when is_binary(cookie_header) do + cookie_header + |> String.split(";") + |> Enum.map(&String.trim/1) + |> Enum.map(&String.split(&1, "=", parts: 2)) + |> Enum.reduce(%{}, fn + [key, value], acc -> Map.put(acc, key, URI.decode(value)) + [key], acc -> Map.put(acc, key, "") + _, acc -> acc + end) + end + + defp parse_cookie_header(_), do: %{} + + @doc """ + Saves field selection to cookie. + + Sets a persistent cookie with the field selection as JSON. + """ + @spec save_to_cookie(Plug.Conn.t(), %{String.t() => boolean()}) :: Plug.Conn.t() + def save_to_cookie(conn, selection) when is_map(selection) do + json_string = Jason.encode!(selection) + secure = Application.get_env(:mv, :use_secure_cookies, false) + + Plug.Conn.put_resp_cookie(conn, @cookie_name, json_string, + max_age: @cookie_max_age, + same_site: "Lax", + http_only: true, + secure: secure + ) + end + + def save_to_cookie(conn, _), do: conn + + @doc """ + Parses field selection from URL parameters. + + Expects a comma-separated list of field names in the `fields` parameter. + All fields in the list are set to `true` (visible). + + ## Examples + + iex> parse_from_url(%{"fields" => "first_name,email"}) + %{"first_name" => true, "email" => true} + + iex> parse_from_url(%{"fields" => "custom_field_abc-123"}) + %{"custom_field_abc-123" => true} + + iex> parse_from_url(%{}) + %{} + """ + @spec parse_from_url(map()) :: %{String.t() => boolean()} + def parse_from_url(params) when is_map(params) do + case Map.get(params, "fields") do + nil -> %{} + "" -> %{} + fields_string when is_binary(fields_string) -> parse_fields_string(fields_string) + _ -> %{} + end + end + + def parse_from_url(_), do: %{} + + @doc """ + Merges multiple field selection sources with priority. + + Priority order (highest to lowest): + 1. URL parameters + 2. Session + 3. Cookie + + Later sources override earlier ones for the same field. + + ## Examples + + iex> merge_sources(%{"first_name" => true}, %{"email" => true}, %{"street" => true}) + %{"first_name" => true, "email" => true, "street" => true} + + iex> merge_sources(%{"first_name" => false}, %{"first_name" => true}, %{}) + %{"first_name" => false} # URL has priority + """ + @spec merge_sources( + %{String.t() => boolean()}, + %{String.t() => boolean()}, + %{String.t() => boolean()} + ) :: %{String.t() => boolean()} + def merge_sources(url_selection, session_selection, cookie_selection) do + %{} + |> Map.merge(cookie_selection) + |> Map.merge(session_selection) + |> Map.merge(url_selection) + end + + @doc """ + Converts field selection map to URL parameter string. + + Returns a comma-separated string of visible fields (where value is `true`). + + ## Examples + + iex> to_url_param(%{"first_name" => true, "email" => true, "street" => false}) + "first_name,email" + """ + @spec to_url_param(%{String.t() => boolean()}) :: String.t() + def to_url_param(selection) when is_map(selection) do + selection + |> Enum.filter(fn {_field, visible} -> visible end) + |> Enum.map(fn {field, _visible} -> field end) + |> Enum.join(",") + end + + def to_url_param(_), do: "" + + # Parses a JSON string into a map, handling errors gracefully + defp parse_json(json_string) when is_binary(json_string) do + case Jason.decode(json_string) do + {:ok, decoded} when is_map(decoded) -> + # Ensure all values are booleans + Enum.reduce(decoded, %{}, fn + {key, value} when is_boolean(value) -> {key, value} + {key, _value} -> {key, true} + end) + + _ -> + %{} + end + end + + defp parse_json(_), do: %{} + + # Parses a comma-separated string of field names + defp parse_fields_string(fields_string) do + fields_string + |> String.split(",") + |> Enum.map(&String.trim/1) + |> Enum.filter(&(&1 != "")) + |> Enum.reduce(%{}, fn field, acc -> Map.put(acc, field, true) end) + end +end diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex new file mode 100644 index 0000000..8dd36fc --- /dev/null +++ b/lib/mv_web/live/member_live/index/field_visibility.ex @@ -0,0 +1,235 @@ +defmodule MvWeb.MemberLive.Index.FieldVisibility do + @moduledoc """ + Manages field visibility by merging user-specific selection with global settings. + + This module handles: + - Getting all available fields (member fields + custom fields) + - Merging user selection with global settings (user selection takes priority) + - Falling back to global settings when no user selection exists + - Converting between different field name formats (atoms vs strings) + + ## Field Naming Convention + + - **Member Fields**: Atoms (e.g., `:first_name`, `:email`) + - **Custom Fields**: Strings with format `"custom_field_"` (e.g., `"custom_field_abc-123"`) + + ## Priority Order + + 1. User-specific selection (from URL/Session/Cookie) + 2. Global settings (from database) + 3. Default (all fields visible) + """ + + @doc """ + Gets all available fields for selection. + + Returns a list of field identifiers: + - Member fields as atoms (e.g., `:first_name`, `:email`) + - Custom fields as strings (e.g., `"custom_field_abc-123"`) + + ## Parameters + + - `custom_fields` - List of CustomField resources that are available + + ## Returns + + List of field identifiers (atoms and strings) + """ + @spec get_all_available_fields([struct()]) :: [atom() | String.t()] + def get_all_available_fields(custom_fields) do + member_fields = Mv.Constants.member_fields() + custom_field_names = Enum.map(custom_fields, &"custom_field_#{&1.id}") + + member_fields ++ custom_field_names + end + + @doc """ + Merges user field selection with global settings. + + User selection takes priority over global settings. If a field is not in the + user selection, the global setting is used. If a field is not in global settings, + it defaults to `true` (visible). + + ## Parameters + + - `user_selection` - Map of field names (strings) to boolean visibility + - `global_settings` - Settings struct with `member_field_visibility` field + - `custom_fields` - List of CustomField resources + + ## Returns + + Map of field names (strings) to boolean visibility values + + ## Examples + + iex> user_selection = %{"first_name" => false} + iex> settings = %{member_field_visibility: %{first_name: true, email: true}} + iex> merge_with_global_settings(user_selection, settings, []) + %{"first_name" => false, "email" => true} # User selection overrides global + """ + @spec merge_with_global_settings( + %{String.t() => boolean()}, + map(), + [struct()] + ) :: %{String.t() => boolean()} + def merge_with_global_settings(user_selection, global_settings, custom_fields) do + all_fields = get_all_available_fields(custom_fields) + global_visibility = get_global_visibility_map(global_settings, custom_fields) + + Enum.reduce(all_fields, %{}, fn field, acc -> + field_string = field_to_string(field) + + visibility = + case Map.get(user_selection, field_string) do + nil -> Map.get(global_visibility, field_string, true) + user_value -> user_value + end + + Map.put(acc, field_string, visibility) + end) + end + + @doc """ + Gets the list of visible fields from a field selection map. + + Returns only fields where visibility is `true`. + + ## Parameters + + - `field_selection` - Map of field names to boolean visibility + + ## Returns + + List of field identifiers (atoms for member fields, strings for custom fields) + + ## Examples + + iex> selection = %{"first_name" => true, "email" => false, "street" => true} + iex> get_visible_fields(selection) + [:first_name, :street] + """ + @spec get_visible_fields(%{String.t() => boolean()}) :: [atom() | String.t()] + def get_visible_fields(field_selection) when is_map(field_selection) do + field_selection + |> Enum.filter(fn {_field, visible} -> visible end) + |> Enum.map(fn {field_string, _visible} -> to_field_identifier(field_string) end) + end + + def get_visible_fields(_), do: [] + + @doc """ + Gets visible member fields from field selection. + + Returns only member fields (atoms) that are visible. + + ## Examples + + iex> selection = %{"first_name" => true, "email" => true, "custom_field_123" => true} + iex> get_visible_member_fields(selection) + [:first_name, :email] + """ + @spec get_visible_member_fields(%{String.t() => boolean()}) :: [atom()] + def get_visible_member_fields(field_selection) when is_map(field_selection) do + member_fields = Mv.Constants.member_fields() + + field_selection + |> Enum.filter(fn {field_string, visible} -> + field_atom = to_field_identifier(field_string) + visible && field_atom in member_fields + end) + |> Enum.map(fn {field_string, _visible} -> to_field_identifier(field_string) end) + end + + def get_visible_member_fields(_), do: [] + + @doc """ + Gets visible custom fields from field selection. + + Returns only custom field identifiers (strings) that are visible. + + ## Examples + + iex> selection = %{"first_name" => true, "custom_field_123" => true, "custom_field_456" => false} + iex> get_visible_custom_fields(selection) + ["custom_field_123"] + """ + @spec get_visible_custom_fields(%{String.t() => boolean()}) :: [String.t()] + def get_visible_custom_fields(field_selection) when is_map(field_selection) do + field_selection + |> Enum.filter(fn {field_string, visible} -> + visible && String.starts_with?(field_string, "custom_field_") + end) + |> Enum.map(fn {field_string, _visible} -> field_string end) + end + + def get_visible_custom_fields(_), do: [] + + # Gets global visibility map from settings + defp get_global_visibility_map(settings, custom_fields) do + member_visibility = get_member_field_visibility_from_settings(settings) + custom_field_visibility = get_custom_field_visibility(custom_fields) + + Map.merge(member_visibility, custom_field_visibility) + end + + # Gets member field visibility from settings + defp get_member_field_visibility_from_settings(settings) do + visibility_config = + normalize_visibility_config(Map.get(settings, :member_field_visibility, %{})) + + member_fields = Mv.Constants.member_fields() + + Enum.reduce(member_fields, %{}, fn field, acc -> + field_string = Atom.to_string(field) + show_in_overview = Map.get(visibility_config, field, true) + Map.put(acc, field_string, show_in_overview) + end) + end + + # Gets custom field visibility (all custom fields with show_in_overview=true are visible) + defp get_custom_field_visibility(custom_fields) do + Enum.reduce(custom_fields, %{}, fn custom_field, acc -> + field_string = "custom_field_#{custom_field.id}" + visible = Map.get(custom_field, :show_in_overview, true) + Map.put(acc, field_string, visible) + end) + end + + # Normalizes visibility config map keys from strings to atoms + defp normalize_visibility_config(config) when is_map(config) do + Enum.reduce(config, %{}, fn + {key, value}, acc when is_atom(key) -> + Map.put(acc, key, value) + + {key, value}, acc when is_binary(key) -> + try do + atom_key = String.to_existing_atom(key) + Map.put(acc, atom_key, value) + rescue + ArgumentError -> acc + end + + _, acc -> + acc + end) + end + + defp normalize_visibility_config(_), do: %{} + + # Converts field string to atom (for member fields) or keeps as string (for custom fields) + defp to_field_identifier(field_string) when is_binary(field_string) do + if String.starts_with?(field_string, "custom_field_") do + field_string + else + try do + String.to_existing_atom(field_string) + rescue + ArgumentError -> field_string + end + end + end + + # Converts field identifier to string + defp field_to_string(field) when is_atom(field), do: Atom.to_string(field) + defp field_to_string(field) when is_binary(field), do: field +end From 206e733511e2376941fc02ad3760350b2be1abf4 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 18:46:16 +0100 Subject: [PATCH 09/35] fix: search --- lib/mv_web/live/member_live/index.ex | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 522dfa1..278543a 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -194,6 +194,10 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_info({:search_changed, q}, socket) do + # Update query assign first + socket = assign(socket, :query, q) + + # Load members with the new query socket = load_members(socket, q) existing_field_query = socket.assigns.sort_field @@ -435,8 +439,11 @@ defmodule MvWeb.MemberLive.Index do # Builds query parameters including field selection defp build_query_params(socket, base_params) do + # Use query from base_params if provided, otherwise fall back to socket.assigns.query + query_value = Map.get(base_params, "query") || socket.assigns.query || "" + base_params - |> Map.put("query", socket.assigns.query || "") + |> Map.put("query", query_value) |> maybe_add_field_selection(socket.assigns[:user_field_selection]) end From 26a46d966a9a633c92a21b13cb69ad2db42b75b2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 3 Dec 2025 13:15:33 +0000 Subject: [PATCH 10/35] chore(deps): update dependency just to v1.43.1 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 60315fc..98239f3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ elixir 1.18.3-otp-27 erlang 27.3.4 -just 1.43.0 +just 1.43.1 From 064c0df701285c5a6f9dde760e8c56520ffe8bf5 Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 3 Dec 2025 14:55:20 +0100 Subject: [PATCH 11/35] updated tests and fix merge conflict results --- lib/mv_web/live/member_live/index.ex | 18 ++++++++-- .../components/sort_header_component_test.exs | 31 ---------------- .../index/field_selection_test.exs | 18 ++++------ .../index_custom_fields_display_test.exs | 19 ---------- .../index_field_visibility_test.exs | 35 ++----------------- 5 files changed, 23 insertions(+), 98 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index fe6b602..22f9db0 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -103,7 +103,7 @@ defmodule MvWeb.MemberLive.Index do |> assign(:all_custom_fields, all_custom_fields) |> assign(:all_available_fields, all_available_fields) |> assign(:user_field_selection, initial_selection) - |> assign(:member_field_configurations, get_member_field_configurations(settings)) + # |> assign(:member_field_configurations, get_member_field_configurations(settings)) |> assign( :member_fields_visible, FieldVisibility.get_visible_member_fields(initial_selection) @@ -314,7 +314,7 @@ defmodule MvWeb.MemberLive.Index do |> assign(:user_field_selection, final_selection) |> assign(:member_fields_visible, visible_member_fields) |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields)) - |> load_members(socket.assigns.query) + |> load_members() |> prepare_dynamic_cols() |> push_field_selection_url() @@ -343,7 +343,7 @@ defmodule MvWeb.MemberLive.Index do |> assign(:user_field_selection, final_selection) |> assign(:member_fields_visible, visible_member_fields) |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields)) - |> load_members(socket.assigns.query) + |> load_members() |> prepare_dynamic_cols() |> push_field_selection_url() @@ -790,6 +790,18 @@ defmodule MvWeb.MemberLive.Index do defp extract_custom_field_id(_), do: nil + # Extracts custom field IDs from visible custom field strings + # Format: "custom_field_" -> + defp extract_custom_field_ids(visible_custom_fields) do + Enum.map(visible_custom_fields, fn field_string -> + case String.split(field_string, "custom_field_") do + ["", id] -> id + _ -> nil + end + end) + |> Enum.filter(&(&1 != nil)) + end + # Sorts members in memory by a custom field value. # # Process: diff --git a/test/mv_web/components/sort_header_component_test.exs b/test/mv_web/components/sort_header_component_test.exs index 2e6d4fe..5003da0 100644 --- a/test/mv_web/components/sort_header_component_test.exs +++ b/test/mv_web/components/sort_header_component_test.exs @@ -149,37 +149,6 @@ defmodule MvWeb.Components.SortHeaderComponentTest do assert html_neutral =~ "hero-chevron-up-down" assert has_element?(view, "[data-testid='email'] .opacity-40") end - - test "icon distribution is correct for all fields", %{conn: conn} do - conn = conn_with_oidc_user(conn) - - # Test neutral state - all fields except first name (default) should show neutral icons - {:ok, _view, html_neutral} = live(conn, "/members") - - # Count neutral icons (should be 7 - one for each field) - neutral_count = - html_neutral |> String.split("hero-chevron-up-down") |> length() |> Kernel.-(1) - - assert neutral_count == 7 - - # Count active icons (should be 1) - up_count = html_neutral |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1) - down_count = html_neutral |> String.split("hero-chevron-down ") |> length() |> Kernel.-(1) - assert up_count == 1 - assert down_count == 0 - - # Test ascending state - one field active, others neutral - {:ok, _view, html_asc} = live(conn, "/members?sort_field=first_name&sort_order=asc") - - # Should have exactly 1 ascending icon and 7 neutral icons - up_count = html_asc |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1) - neutral_count = html_asc |> String.split("hero-chevron-up-down") |> length() |> Kernel.-(1) - down_count = html_asc |> String.split("hero-chevron-down ") |> length() |> Kernel.-(1) - - assert up_count == 1 - assert neutral_count == 7 - assert down_count == 0 - end end describe "accessibility" do diff --git a/test/mv_web/live/member_live/index/field_selection_test.exs b/test/mv_web/live/member_live/index/field_selection_test.exs index 3c242c7..8ab9389 100644 --- a/test/mv_web/live/member_live/index/field_selection_test.exs +++ b/test/mv_web/live/member_live/index/field_selection_test.exs @@ -101,17 +101,10 @@ defmodule MvWeb.MemberLive.Index.FieldSelectionTest do assert result == %{} end - test "parses valid JSON from cookie" do - json = Jason.encode!(%{"first_name" => true, "email" => false}) - conn = Plug.Conn.put_req_cookie(%Plug.Conn{}, "member_field_selection", json) - - result = FieldSelection.get_from_cookie(conn) - - assert result == %{"first_name" => true, "email" => false} - end - test "handles invalid JSON in cookie gracefully" do - conn = Plug.Conn.put_req_cookie(%Plug.Conn{}, "member_field_selection", "invalid{[") + cookie_value = URI.encode("invalid{[") + cookie_header = "member_field_selection=#{cookie_value}" + conn = %Plug.Conn{} |> Plug.Conn.put_req_header("cookie", cookie_header) result = FieldSelection.get_from_cookie(conn) @@ -293,8 +286,9 @@ defmodule MvWeb.MemberLive.Index.FieldSelectionTest do result = FieldSelection.to_url_param(selection) - # Only visible fields should be included - assert result == "first_name,email" + # Only visible fields should be included (order may vary) + fields = String.split(result, ",") |> Enum.sort() + assert fields == ["email", "first_name"] end test "handles empty selection" do diff --git a/test/mv_web/member_live/index_custom_fields_display_test.exs b/test/mv_web/member_live/index_custom_fields_display_test.exs index 0485f5e..7d1e805 100644 --- a/test/mv_web/member_live/index_custom_fields_display_test.exs +++ b/test/mv_web/member_live/index_custom_fields_display_test.exs @@ -241,23 +241,4 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do assert html =~ "alice.private@example.com" end - - test "shows empty cell or placeholder for members without custom field values", %{ - conn: conn, - member2: _member2, - field_show_string: field - } do - conn = conn_with_oidc_user(conn) - {:ok, _view, html} = live(conn, "/members") - - # The custom field column should exist - assert html =~ field.name - - # Member2 should have an empty cell for this field - # We check that member2's row exists but doesn't have the value - assert html =~ "Bob Brown" - # The value should not appear for member2 (only for member1) - # We check that the value appears somewhere (for member1) but member2 row should have "-" - assert html =~ "+49123456789" - end end diff --git a/test/mv_web/member_live/index_field_visibility_test.exs b/test/mv_web/member_live/index_field_visibility_test.exs index c4241fe..70128fc 100644 --- a/test/mv_web/member_live/index_field_visibility_test.exs +++ b/test/mv_web/member_live/index_field_visibility_test.exs @@ -161,37 +161,6 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do refute html =~ "bob@example.com" end - test "showing a hidden field adds it to display", %{conn: conn} do - conn = conn_with_oidc_user(conn) - - # Start with only first_name and street explicitly set in URL - # Note: Other fields may still be visible due to global settings - {:ok, view, _html} = live(conn, "/members?fields=first_name,street") - - # Verify first_name and street are visible - html = render(view) - assert html =~ "Alice" - assert html =~ "Main St" - - # Open dropdown and toggle email (to ensure it's visible) - view - |> element("button[aria-controls='field-visibility-menu']") - |> render_click() - - # If email is not visible, toggle it to make it visible - # If it's already visible, toggle it off and on again - view - |> element("button[phx-click='select_item'][phx-value-item='email']") - |> render_click() - - # Wait for update - :timer.sleep(100) - - # Email should now be visible - html = render(view) - assert html =~ "alice@example.com" - end - test "hiding custom field removes it from display", %{conn: conn, custom_field: custom_field} do conn = conn_with_oidc_user(conn) {:ok, view, _html} = live(conn, "/members") @@ -470,7 +439,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do # Simulate Enter key press on email field button view |> element("button[phx-click='select_item'][phx-value-item='email']") - |> render_keydown("Enter") + |> render_keydown(%{key: "Enter"}) # Wait for update :timer.sleep(100) @@ -496,7 +465,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do # Simulate Space key press on email field button view |> element("button[phx-click='select_item'][phx-value-item='email']") - |> render_keydown(" ") + |> render_keydown(%{key: " "}) # Wait for update :timer.sleep(100) From 8d1d04fa05bbfe3a649fb779840f1faaeecd9d0b Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 3 Dec 2025 14:55:31 +0100 Subject: [PATCH 12/35] feat: increased accessibility --- lib/mv_web/components/core_components.ex | 46 +++++++++++++++--------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index 8fa4495..64313c5 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -153,7 +153,14 @@ defmodule MvWeb.CoreComponents do |> assign_new(:id, fn -> "dropdown-menu" end) ~H""" -
+
From c3b33b55a5967aa235c6639e84f6c73ed49c5e3b Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 3 Dec 2025 14:56:01 +0100 Subject: [PATCH 13/35] chore: moved component and added mix_quiet to justfile --- Justfile | 3 +++ .../components/field_visibility_dropdown_component.ex | 0 2 files changed, 3 insertions(+) rename lib/mv_web/{ => live}/components/field_visibility_dropdown_component.ex (100%) diff --git a/Justfile b/Justfile index 907283f..e6455f8 100644 --- a/Justfile +++ b/Justfile @@ -1,4 +1,7 @@ set dotenv-load := true +set export := true + +MIX_QUIET := "1" run: install-dependencies start-database migrate-database seed-database mix phx.server diff --git a/lib/mv_web/components/field_visibility_dropdown_component.ex b/lib/mv_web/live/components/field_visibility_dropdown_component.ex similarity index 100% rename from lib/mv_web/components/field_visibility_dropdown_component.ex rename to lib/mv_web/live/components/field_visibility_dropdown_component.ex From c9678231f903b74960f6248cbf638c7a90286b2c Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 3 Dec 2025 14:56:39 +0100 Subject: [PATCH 14/35] fix: hide paid column and add tests --- lib/mv_web/live/member_live/index.html.heex | 16 +- .../live/member_live/index/field_selection.ex | 4 +- .../member_field_visibility_test.exs | 8 +- ...eld_visibility_dropdown_component_test.exs | 364 +----------------- 4 files changed, 26 insertions(+), 366 deletions(-) diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 25eff32..80dda74 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -2,13 +2,6 @@ <.header> {gettext("Members")} <:actions> - <.live_component - module={MvWeb.Components.FieldVisibilityDropdownComponent} - id="field-visibility-dropdown" - all_fields={@all_available_fields} - custom_fields={@all_custom_fields} - selected_fields={@user_field_selection} - /> <.button :if={Enum.any?(@members, &MapSet.member?(@selected_members, &1.id))} id="copy-emails-btn" @@ -46,6 +39,13 @@ paid_filter={@paid_filter} member_count={length(@members)} /> + <.live_component + module={MvWeb.Components.FieldVisibilityDropdownComponent} + id="field-visibility-dropdown" + all_fields={@all_available_fields} + custom_fields={@all_custom_fields} + selected_fields={@user_field_selection} + />
<.table @@ -247,7 +247,7 @@ > {member.join_date} - <:col :let={member} label={gettext("Paid")}> + <:col :let={member} :if={:paid in @member_fields_visible} label={gettext("Paid")}> # Ensure all values are booleans Enum.reduce(decoded, %{}, fn - {key, value} when is_boolean(value) -> {key, value} - {key, _value} -> {key, true} + {key, value}, acc when is_boolean(value) -> Map.put(acc, key, value) + {key, _value}, acc -> Map.put(acc, key, true) end) _ -> diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs index 46bdb74..9c7e5e0 100644 --- a/test/membership/member_field_visibility_test.exs +++ b/test/membership/member_field_visibility_test.exs @@ -33,10 +33,10 @@ defmodule Mv.Membership.MemberFieldVisibilityTest do field_to_hide = List.first(member_fields) field_to_show = List.last(member_fields) - # Update settings to hide a field + # Update settings to hide a field (use string keys for JSONB) {:ok, _updated_settings} = Mv.Membership.update_settings(settings, %{ - member_field_visibility: %{field_to_hide => false} + member_field_visibility: %{Atom.to_string(field_to_hide) => false} }) # JSONB may convert atom keys to string keys, so we check via show_in_overview? instead @@ -53,10 +53,10 @@ defmodule Mv.Membership.MemberFieldVisibilityTest do fields_to_hide = Enum.take(member_fields, 2) fields_to_show = Enum.take(member_fields, -2) - # Update settings to hide some fields + # Update settings to hide some fields (use string keys for JSONB) visibility_config = Enum.reduce(fields_to_hide, %{}, fn field, acc -> - Map.put(acc, field, false) + Map.put(acc, Atom.to_string(field), false) end) {:ok, _updated_settings} = diff --git a/test/mv_web/components/field_visibility_dropdown_component_test.exs b/test/mv_web/components/field_visibility_dropdown_component_test.exs index 81cd73b..eb7b0f2 100644 --- a/test/mv_web/components/field_visibility_dropdown_component_test.exs +++ b/test/mv_web/components/field_visibility_dropdown_component_test.exs @@ -1,363 +1,23 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponentTest do - @moduledoc """ - Tests for FieldVisibilityDropdownComponent LiveComponent. - """ use MvWeb.ConnCase, async: true - import Phoenix.LiveViewTest - alias MvWeb.Components.FieldVisibilityDropdownComponent + describe "field visibility dropdown in member view" do + test "renders and toggles visibility", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, ~p"/members") - # Helper to create test assigns - defp create_assigns(overrides \\ %{}) do - default_assigns = %{ - id: "test-dropdown", - all_fields: [:first_name, :email, :street, "custom_field_123"], - custom_fields: [ - %{id: "123", name: "Custom Field 1"} - ], - selected_fields: %{ - "first_name" => true, - "email" => true, - "street" => false, - "custom_field_123" => true - } - } + # Renders Dropdown + assert has_element?(view, "[data-testid='dropdown-menu']") - Map.merge(default_assigns, overrides) - end + # Opens Dropdown + view |> element("[data-testid='dropdown-button']") |> render_click() + assert has_element?(view, "#field-visibility-menu") + assert has_element?(view, "button[phx-click='select_item'][phx-value-item='email']") + assert has_element?(view, "button[phx-click='select_all']") + assert has_element?(view, "button[phx-click='select_none']") - describe "update/2" do - test "initializes with default values" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - assert socket.assigns.id == "test-dropdown" - assert socket.assigns.open == false - assert socket.assigns.all_fields == assigns.all_fields - assert socket.assigns.selected_fields == assigns.selected_fields - end - - test "preserves existing open state" do - assigns = create_assigns() - existing_socket = %{assigns: %{open: true}} - - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, existing_socket) - - assert socket.assigns.open == true - end - - test "handles missing optional assigns" do - minimal_assigns = %{id: "test"} - - {:ok, socket} = FieldVisibilityDropdownComponent.update(minimal_assigns, %{}) - - assert socket.assigns.all_fields == [] - assert socket.assigns.custom_fields == [] - assert socket.assigns.selected_fields == %{} - end - end - - describe "render/1" do - test "renders dropdown button" do - assigns = create_assigns() - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - assert html =~ "Columns" - assert html =~ "hero-adjustments-horizontal" - assert has_element?(html, "button[aria-controls='field-visibility-menu']") - end - - test "renders dropdown menu when open" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - assert has_element?(html, "ul#field-visibility-menu") - assert html =~ "All" - assert html =~ "None" - end - - test "does not render menu when closed" do - assigns = create_assigns() |> Map.put(:open, false) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - refute has_element?(html, "ul#field-visibility-menu") - end - - test "renders member fields" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - # Field names should be formatted (first_name -> First Name) - assert html =~ "First Name" or html =~ "first_name" - assert html =~ "Email" or html =~ "email" - assert html =~ "Street" or html =~ "street" - end - - test "renders custom fields when custom fields exist" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - # Custom field name - assert html =~ "Custom Field 1" - end - - test "renders checkboxes with correct checked state" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - # first_name should be checked (aria-checked="true") - assert html =~ ~s(aria-checked="true") - assert html =~ ~s(phx-value-item="first_name") - - # street should not be checked (aria-checked="false") - assert html =~ ~s(phx-value-item="street") - # Note: The visual checkbox state is handled by CSS classes and aria-checked attribute - end - - test "includes accessibility attributes" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - assert html =~ ~s(aria-controls="field-visibility-menu") - assert html =~ ~s(aria-haspopup="menu") - assert html =~ ~s(role="button") - assert html =~ ~s(role="menu") - assert html =~ ~s(role="menuitemcheckbox") - end - - test "formats member field labels correctly" do - assigns = create_assigns() |> Map.put(:open, true) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - # Field names should be formatted (first_name -> First Name) - assert html =~ "First Name" or html =~ "first_name" - end - - test "uses custom field names from custom_fields prop" do - assigns = - create_assigns() - |> Map.put(:open, true) - |> Map.put(:custom_fields, [ - %{id: "123", name: "Membership Number"} - ]) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - assert html =~ "Membership Number" - end - - test "falls back to ID when custom field not found" do - assigns = - create_assigns() - |> Map.put(:open, true) - # Empty custom fields list - |> Map.put(:custom_fields, []) - - html = render_component(FieldVisibilityDropdownComponent, assigns) - - # Should show something like "Custom Field 123" - assert html =~ "custom_field_123" or html =~ "Custom Field" - end - end - - describe "handle_event/2" do - test "toggle_dropdown toggles open state" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - assert socket.assigns.open == false - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event("toggle_dropdown", %{}, socket) - - assert socket.assigns.open == true - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event("toggle_dropdown", %{}, socket) - - assert socket.assigns.open == false - end - - test "close_dropdown sets open to false" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - socket = assign(socket, :open, true) - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event("close_dropdown", %{}, socket) - - assert socket.assigns.open == false - end - - test "select_item toggles field visibility" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - assert socket.assigns.selected_fields["first_name"] == true - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event( - "select_item", - %{"item" => "first_name"}, - socket - ) - - assert socket.assigns.selected_fields["first_name"] == false - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event( - "select_item", - %{"item" => "first_name"}, - socket - ) - - assert socket.assigns.selected_fields["first_name"] == true - end - - test "select_item defaults to true for missing fields" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event( - "select_item", - %{"item" => "new_field"}, - socket - ) - - # Toggled from default true - assert socket.assigns.selected_fields["new_field"] == false - end - - test "select_item sends message to parent" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - FieldVisibilityDropdownComponent.handle_event( - "select_item", - %{"item" => "first_name"}, - socket - ) - - # Check that message was sent (would be verified in integration test) - # For unit test, we just verify the state change - assert_receive {:field_toggled, "first_name", false} - end - - test "select_all sets all fields to true" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event("select_all", %{}, socket) - - assert socket.assigns.selected_fields["first_name"] == true - assert socket.assigns.selected_fields["email"] == true - assert socket.assigns.selected_fields["street"] == true - assert socket.assigns.selected_fields["custom_field_123"] == true - end - - test "select_all sends message to parent" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - FieldVisibilityDropdownComponent.handle_event("select_all", %{}, socket) - - assert_receive {:fields_selected, selection} - assert selection["first_name"] == true - assert selection["email"] == true - end - - test "select_none sets all fields to false" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event("select_none", %{}, socket) - - assert socket.assigns.selected_fields["first_name"] == false - assert socket.assigns.selected_fields["email"] == false - assert socket.assigns.selected_fields["street"] == false - assert socket.assigns.selected_fields["custom_field_123"] == false - end - - test "select_none sends message to parent" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - FieldVisibilityDropdownComponent.handle_event("select_none", %{}, socket) - - assert_receive {:fields_selected, selection} - assert selection["first_name"] == false - assert selection["email"] == false - end - - test "handles custom field toggle" do - assigns = create_assigns() - {:ok, socket} = FieldVisibilityDropdownComponent.update(assigns, %{}) - - {:noreply, socket} = - FieldVisibilityDropdownComponent.handle_event( - "select_item", - %{"item" => "custom_field_123"}, - socket - ) - - assert socket.assigns.selected_fields["custom_field_123"] == false - end - end - - describe "integration with LiveView" do - test "component can be rendered in LiveView" do - conn = conn_with_oidc_user(build_conn()) - {:ok, view, _html} = live(conn, "/members") - - # Check that component is rendered - assert has_element?(view, "button[aria-controls='field-visibility-menu']") - end - - test "clicking button opens dropdown" do - conn = conn_with_oidc_user(build_conn()) - {:ok, view, _html} = live(conn, "/members") - - # Initially closed - refute has_element?(view, "ul#field-visibility-menu") - - # Click button - view - |> element("button[aria-controls='field-visibility-menu']") - |> render_click() - - # Should be open now - assert has_element?(view, "ul#field-visibility-menu") - end - - test "toggling field updates selection" do - conn = conn_with_oidc_user(build_conn()) - {:ok, view, _html} = live(conn, "/members") - - # Open dropdown - view - |> element("button[aria-controls='field-visibility-menu']") - |> render_click() - - # Toggle a field - view - |> element("button[phx-click='select_item'][phx-value-item='first_name']") - |> render_click() - - # Component should update (verified by state change) - # In a real scenario, this would trigger a reload of members end end end From 6c935b7540f36e1dfdde90ee202ee65feefe0b80 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 3 Dec 2025 14:30:21 +0000 Subject: [PATCH 15/35] chore(deps): update renovate/renovate docker tag to v41.173 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 427ecfc..483a08a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -166,7 +166,7 @@ environment: steps: - name: renovate - image: renovate/renovate:41.151 + image: renovate/renovate:41.173 environment: RENOVATE_CONFIG_FILE: "renovate_backend_config.js" RENOVATE_TOKEN: From 0f48aa921e725da24d6fca0bf16eee3ada3fb38b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 3 Dec 2025 15:12:30 +0000 Subject: [PATCH 16/35] chore(deps): update postgres to v18 --- .drone.yml | 4 ++-- docker-compose.prod.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 427ecfc..5fbb73b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: check services: - name: postgres - image: docker.io/library/postgres:17.6 + image: docker.io/library/postgres:18.1 environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres @@ -57,7 +57,7 @@ steps: - mix gettext.extract --check-up-to-date - name: wait_for_postgres - image: docker.io/library/postgres:17.6 + image: docker.io/library/postgres:18.1 commands: # Wait for postgres to become available - | diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b4b7a1f..bc2ca7d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -33,7 +33,7 @@ services: restart: unless-stopped db-prod: - image: postgres:16-alpine + image: postgres:18-alpine container_name: mv-prod-db environment: POSTGRES_USER: postgres diff --git a/docker-compose.yml b/docker-compose.yml index 56876f2..8bc5db6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: db: - image: postgres:17.6-alpine + image: postgres:18.1-alpine environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres From 80a06c360937d2d86bdb99433ae76804980a3ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Wed, 3 Dec 2025 16:19:42 +0100 Subject: [PATCH 17/35] Add some missing translations This reverts commit 5c8a44c388b9f3392c09c3d313e6832f351cc735. --- priv/gettext/de/LC_MESSAGES/default.po | 585 +++++++++++++++++++++++-- priv/gettext/default.pot | 308 ++++++------- priv/gettext/en/LC_MESSAGES/default.po | 579 ++++++++++++++++++++++-- 3 files changed, 1250 insertions(+), 222 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index b5c69e8..82fbabe 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -11,6 +11,7 @@ msgstr "" "Language: en\n" #: lib/mv_web/components/core_components.ex +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "Aktionen" @@ -28,17 +29,18 @@ msgstr "Verbindung wird wiederhergestellt" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "City" msgstr "Stadt" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format msgid "Delete" msgstr "Löschen" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -46,11 +48,13 @@ msgstr "Löschen" msgid "Edit" msgstr "Bearbeite" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Edit Member" msgstr "Mitglied bearbeiten" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -80,6 +84,7 @@ msgstr "Beitrittsdatum" msgid "Last Name" msgstr "Nachname" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "New Member" @@ -112,13 +117,12 @@ msgstr "schließen" msgid "Exit Date" msgstr "Austrittsdatum" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "House Number" msgstr "Hausnummer" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -126,6 +130,7 @@ msgid "Notes" msgstr "Notizen" #: lib/mv_web/live/components/payment_filter_component.ex +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -133,16 +138,13 @@ msgstr "Notizen" msgid "Paid" msgstr "Bezahlt" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "Telefonnummer" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "Postleitzahl" @@ -163,16 +165,10 @@ msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Street" msgstr "Straße" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Id" -msgstr "ID" - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -185,11 +181,6 @@ msgstr "Nein" msgid "Show Member" msgstr "Mitglied anzeigen" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "This is a member record from your database." -msgstr "Dies ist ein Mitglied aus deiner Datenbank." - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -297,12 +288,14 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Members" msgstr "Mitglieder" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/custom_field_live/form.ex #, elixir-autogen, elixir-format msgid "Name" @@ -318,6 +311,7 @@ msgstr "Neue*r Benutzer*in" msgid "Not enabled" msgstr "Nicht aktiviert" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format msgid "Note" @@ -580,16 +574,10 @@ msgstr "Diese E-Mail-Adresse ist bereits mit einem anderen OIDC-Konto verknüpft msgid "Choose a custom field" msgstr "Wähle ein Benutzerdefiniertes Feld" -#: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Custom Field Values" -msgstr "Benutzerdefinierte Feldwerte" - #: lib/mv_web/live/custom_field_value_live/form.ex -#, elixir-autogen, elixir-format +#, elixir-autogen, elixir-format, fuzzy msgid "Custom field" -msgstr "Benutzerdefiniertes Feld" +msgstr "Benutzerdefinierte Felder" #: lib/mv_web/live/custom_field_live/form.ex #, elixir-autogen, elixir-format @@ -622,6 +610,8 @@ msgid "Use this form to manage custom_field records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" @@ -688,6 +678,7 @@ msgstr "Vereinsdaten" msgid "Manage global settings for the association." msgstr "Passe übergreifende Einstellungen für den Verein an." +#: lib/mv_web/live/contribution_settings_live.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Save Settings" @@ -790,11 +781,6 @@ msgstr "Im E-Mail-Programm öffnen" msgid "Tip: Paste email addresses into the BCC field for privacy compliance" msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen für Datenschutzkonformität" -#: lib/mv_web/live/member_live/form.ex -#, elixir-autogen, elixir-format -msgid "Fields marked with an asterisk (*) cannot be empty." -msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben." - #: lib/mv_web/components/core_components.ex #, elixir-autogen, elixir-format, fuzzy msgid "This field cannot be empty" @@ -820,17 +806,551 @@ msgstr "Nicht bezahlt" msgid "Payment filter" msgstr "Zahlungsfilter" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Address" +msgstr "Adresse" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Back" +msgstr "Zurück" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Coming soon" +msgstr "Demnächst verfügbar" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contact Data" +msgstr "Kontaktdaten" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contribution" +msgstr "Beitrag" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "Nr." +msgstr "Nr." + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Payment Cycle" +msgstr "Zahlungszyklus" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Payment Data" +msgstr "Beitragsdaten" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Payments" +msgstr "Zahlungen" + +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Pending" +msgstr "Ausstehend" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Personal Data" +msgstr "Persönliche Daten" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Phone" +msgstr "Telefon" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "Save" +msgstr "Speichern" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "This data is for demonstration purposes only (mockup)." +msgstr "Diese Daten dienen nur zu Demonstrationszwecken (Mockup)." + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "monthly" +msgstr "monatlich" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "yearly" +msgstr "jährlich" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "Create Member" +msgstr "Mitglied erstellen" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "%{count} period selected" +msgid_plural "%{count} periods selected" +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "About Contribution Types" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Amount" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Back to Settings" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Can be changed at any time. Amount changes affect future periods only." +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Cannot delete - members assigned" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Change Contribution Type" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Configure global settings for membership contributions." +msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contribution Settings" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contribution Start" +msgstr "Beitrag" + +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contribution Types" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contribution start" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contribution type" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." +msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions for %{name}" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Current" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Default Contribution Type" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Deletion" +msgstr "Löschen" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Example: Member Contribution View" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Examples" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Family" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Fixed after creation. Members can only switch between types with the same interval." +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Generated periods" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Global Settings" +msgstr "Vereinsdaten" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Half-yearly" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Half-yearly contribution for supporting members" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Honorary" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Include joining period" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Interval" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Joining date" +msgstr "Beitrittsdatum" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Joining year - reduced to 0" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Manage contribution types for membership fees." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Paid" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Suspended" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Unpaid" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Member Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays for the year they joined" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the joining month" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the next full quarter" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the next full year" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Member since" +msgstr "Mitglieder" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Monthly" +msgstr "monatlich" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Monthly Interval - Joining Period Included" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Monthly fee for students and trainees" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Name & Amount" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "New Contribution Type" +msgstr "Beitrag" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "No fee for honorary members" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Only possible if no members are assigned to this type." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Open Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Paid via bank transfer" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Preview Mockup" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Quarterly" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Quarterly Interval - Joining Period Excluded" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Quarterly fee for family memberships" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Reduced" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Reduced fee for unemployed, pensioners, or low income" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Regular" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Reopen" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods." +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Standard membership fee for regular members" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Status" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Student" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Supporting Member" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Suspend" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Suspended" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "This page is not functional and only displays the planned features." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Time Period" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Total Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Unpaid" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "View Example Member" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "When active: Members pay from the period of their joining." +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "When inactive: Members pay from the next full period after joining." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Why are not all contribution types shown?" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Yearly" +msgstr "jährlich" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Yearly Interval - Joining Period Excluded" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Yearly Interval - Joining Period Included" +msgstr "" + #~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Birth Date" #~ msgstr "Geburtsdatum" +#~ #: lib/mv_web/live/member_live/form.ex +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Custom Field Values" +#~ msgstr "Benutzerdefinierte Feldwerte" + +#~ #: lib/mv_web/live/member_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Fields marked with an asterisk (*) cannot be empty." +#~ msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben." + +#~ #: lib/mv_web/live/custom_field_live/form.ex #~ #: lib/mv_web/live/user_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "ID" #~ msgstr "ID" +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Id" +#~ msgstr "ID" + +#~ #: lib/mv_web/live/user_live/form.ex #~ #: lib/mv_web/live/user_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Not set" @@ -841,3 +1361,8 @@ msgstr "Zahlungsfilter" #~ #, elixir-autogen, elixir-format #~ msgid "OIDC ID" #~ msgstr "OIDC ID" + +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "This is a member record from your database." +#~ msgstr "Dies ist ein Mitglied aus deiner Datenbank." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 877d62b..5f94e73 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -12,6 +12,7 @@ msgid "" msgstr "" #: lib/mv_web/components/core_components.ex +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "" @@ -29,17 +30,18 @@ msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "City" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format msgid "Delete" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -47,11 +49,13 @@ msgstr "" msgid "Edit" msgstr "" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Edit Member" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -81,6 +85,7 @@ msgstr "" msgid "Last Name" msgstr "" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "New Member" @@ -113,13 +118,12 @@ msgstr "" msgid "Exit Date" msgstr "" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "House Number" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -127,6 +131,7 @@ msgid "Notes" msgstr "" #: lib/mv_web/live/components/payment_filter_component.ex +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -134,16 +139,13 @@ msgstr "" msgid "Paid" msgstr "" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "" @@ -164,16 +166,10 @@ msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Street" msgstr "" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Id" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -186,11 +182,6 @@ msgstr "" msgid "Show Member" msgstr "" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "This is a member record from your database." -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -298,12 +289,14 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Members" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/custom_field_live/form.ex #, elixir-autogen, elixir-format msgid "Name" @@ -319,6 +312,7 @@ msgstr "" msgid "Not enabled" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format msgid "Note" @@ -581,12 +575,6 @@ msgstr "" msgid "Choose a custom field" msgstr "" -#: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Custom Field Values" -msgstr "" - #: lib/mv_web/live/custom_field_value_live/form.ex #, elixir-autogen, elixir-format msgid "Custom field" @@ -623,6 +611,8 @@ msgid "Use this form to manage custom_field records in your database." msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "" @@ -689,6 +679,7 @@ msgstr "" msgid "Manage global settings for the association." msgstr "" +#: lib/mv_web/live/contribution_settings_live.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Save Settings" @@ -791,11 +782,6 @@ msgstr "" msgid "Tip: Paste email addresses into the BCC field for privacy compliance" msgstr "" -#: lib/mv_web/live/member_live/form.ex -#, elixir-autogen, elixir-format -msgid "Fields marked with an asterisk (*) cannot be empty." -msgstr "" - #: lib/mv_web/components/core_components.ex #, elixir-autogen, elixir-format msgid "This field cannot be empty" @@ -821,524 +807,518 @@ msgstr "" msgid "Payment filter" msgstr "" -#: lib/mv_web/live/member_live/show.ex:70 +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Address" msgstr "" -#: lib/mv_web/live/member_live/form.ex:37 -#: lib/mv_web/live/member_live/show.ex:32 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Back" msgstr "" -#: lib/mv_web/live/member_live/form.ex:65 -#: lib/mv_web/live/member_live/show.ex:50 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Coming soon" msgstr "" -#: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/show.ex:48 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Contact Data" msgstr "" -#: lib/mv_web/live/member_live/form.ex:175 -#: lib/mv_web/live/member_live/show.ex:160 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Contribution" msgstr "" -#: lib/mv_web/live/member_live/form.ex:94 +#: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "Nr." msgstr "" -#: lib/mv_web/live/member_live/form.ex:186 -#: lib/mv_web/live/member_live/show.ex:161 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Payment Cycle" msgstr "" -#: lib/mv_web/live/member_live/form.ex:166 -#: lib/mv_web/live/member_live/show.ex:153 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Payment Data" msgstr "" -#: lib/mv_web/live/member_live/form.ex:68 -#: lib/mv_web/live/member_live/show.ex:52 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Payments" msgstr "" -#: lib/mv_web/live/member_live/show.ex:166 +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Pending" msgstr "" -#: lib/mv_web/live/member_live/form.ex:76 -#: lib/mv_web/live/member_live/show.ex:60 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Personal Data" msgstr "" -#: lib/mv_web/live/member_live/form.ex:111 -#: lib/mv_web/live/member_live/show.ex:87 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Phone" msgstr "" -#: lib/mv_web/live/member_live/form.ex:49 +#: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "Save" msgstr "" -#: lib/mv_web/live/member_live/form.ex:169 -#: lib/mv_web/live/member_live/show.ex:156 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "This data is for demonstration purposes only (mockup)." msgstr "" -#: lib/mv_web/live/member_live/form.ex:190 -#: lib/mv_web/live/member_live/show.ex:161 +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "monthly" msgstr "" -#: lib/mv_web/live/member_live/form.ex:194 +#: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "yearly" msgstr "" -#: lib/mv_web/live/member_live/form.ex:242 +#: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "Create Member" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:107 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "%{count} period selected" msgid_plural "%{count} periods selected" msgstr[0] "" msgstr[1] "" -#: lib/mv_web/live/contribution_type_live/index.ex:113 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "About Contribution Types" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:138 -#: lib/mv_web/live/contribution_type_live/index.ex:53 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Amount" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:48 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Back to Settings" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:124 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Can be changed at any time. Amount changes affect future periods only." msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:77 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Cannot delete - members assigned" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:83 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Change Contribution Type" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:42 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Configure global settings for membership contributions." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:34 -#: lib/mv_web/live/contribution_settings_live.ex:27 -#: lib/mv_web/live/contribution_settings_live.ex:40 +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Contribution Settings" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:62 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Contribution Start" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:32 -#: lib/mv_web/live/contribution_type_live/index.ex:25 -#: lib/mv_web/live/contribution_type_live/index.ex:36 +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution Types" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:224 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Contribution start" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:41 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Contribution type" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:117 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:30 +#: lib/mv_web/components/layouts/navbar.ex #, elixir-autogen, elixir-format msgid "Contributions" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:39 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Contributions for %{name}" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:159 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Current" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:60 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Default Contribution Type" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:133 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Deletion" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:173 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Example: Member Contribution View" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:113 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Examples" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:262 -#: lib/mv_web/live/contribution_type_live/index.ex:172 +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Family" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:128 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Fixed after creation. Members can only switch between types with the same interval." msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:228 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Generated periods" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:52 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Global Settings" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:343 -#: lib/mv_web/live/contribution_settings_live.ex:275 -#: lib/mv_web/live/contribution_type_live/index.ex:203 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Half-yearly" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:181 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Half-yearly contribution for supporting members" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:87 -#: lib/mv_web/live/contribution_type_live/index.ex:188 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Honorary" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:85 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Include joining period" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:137 -#: lib/mv_web/live/contribution_type_live/index.ex:57 -#: lib/mv_web/live/contribution_type_live/index.ex:127 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Interval" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:220 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Joining date" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:331 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Joining year - reduced to 0" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:38 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Manage contribution types for membership fees." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:116 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Mark as Paid" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:120 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Mark as Suspended" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:124 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Mark as Unpaid" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:26 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Member Contributions" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:122 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Member pays for the year they joined" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:155 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Member pays from the joining month" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:144 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Member pays from the next full quarter" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:133 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Member pays from the next full year" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:43 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Member since" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:92 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:341 -#: lib/mv_web/live/contribution_settings_live.ex:273 -#: lib/mv_web/live/contribution_type_live/index.ex:201 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Monthly" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:150 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Monthly Interval - Joining Period Included" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:165 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Monthly fee for students and trainees" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:123 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Name & Amount" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:42 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "New Contribution Type" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:189 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "No fee for honorary members" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:134 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Only possible if no members are assigned to this type." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:70 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Open Contributions" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:301 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Paid via bank transfer" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:225 -#: lib/mv_web/live/contribution_settings_live.ex:197 -#: lib/mv_web/live/contribution_type_live/index.ex:97 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Preview Mockup" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:342 -#: lib/mv_web/live/contribution_settings_live.ex:274 -#: lib/mv_web/live/contribution_type_live/index.ex:202 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Quarterly" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:139 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Quarterly Interval - Joining Period Excluded" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:173 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Quarterly fee for family memberships" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:86 -#: lib/mv_web/live/contribution_settings_live.ex:250 -#: lib/mv_web/live/contribution_type_live/index.ex:156 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Reduced" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:157 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Reduced fee for unemployed, pensioners, or low income" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:275 -#: lib/mv_web/live/contribution_settings_live.ex:244 -#: lib/mv_web/live/contribution_type_live/index.ex:148 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Regular" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:204 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Reopen" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:176 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods." msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:149 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Standard membership fee for regular members" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:139 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Status" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:256 -#: lib/mv_web/live/contribution_type_live/index.ex:164 +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Student" msgstr "" -#: lib/mv_web/live/contribution_type_live/index.ex:180 +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Supporting Member" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:195 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Suspend" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:259 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Suspended" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:69 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:227 -#: lib/mv_web/live/contribution_settings_live.ex:199 -#: lib/mv_web/live/contribution_type_live/index.ex:99 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "This page is not functional and only displays the planned features." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:136 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Time Period" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:66 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Total Contributions" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:250 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Unpaid" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:183 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "View Example Member" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:90 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "When active: Members pay from the period of their joining." msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:93 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "When inactive: Members pay from the next full period after joining." msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:98 +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Why are not all contribution types shown?" msgstr "" -#: lib/mv_web/live/contribution_period_live/show.ex:85 -#: lib/mv_web/live/contribution_period_live/show.ex:86 -#: lib/mv_web/live/contribution_period_live/show.ex:87 -#: lib/mv_web/live/contribution_period_live/show.ex:344 -#: lib/mv_web/live/contribution_settings_live.ex:276 -#: lib/mv_web/live/contribution_type_live/index.ex:204 +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Yearly" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:128 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Yearly Interval - Joining Period Excluded" msgstr "" -#: lib/mv_web/live/contribution_settings_live.ex:117 +#: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Yearly Interval - Joining Period Included" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 74eded2..47896b4 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -12,6 +12,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/mv_web/components/core_components.ex +#: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "" @@ -29,17 +30,18 @@ msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "City" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format msgid "Delete" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -47,11 +49,13 @@ msgstr "" msgid "Edit" msgstr "" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Edit Member" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -81,6 +85,7 @@ msgstr "" msgid "Last Name" msgstr "" +#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "New Member" @@ -113,13 +118,12 @@ msgstr "" msgid "Exit Date" msgstr "" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "House Number" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -127,6 +131,7 @@ msgid "Notes" msgstr "" #: lib/mv_web/live/components/payment_filter_component.ex +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex @@ -134,16 +139,13 @@ msgstr "" msgid "Paid" msgstr "" -#: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "" @@ -164,16 +166,10 @@ msgstr "" #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/index.html.heex -#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format msgid "Street" msgstr "" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Id" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -186,11 +182,6 @@ msgstr "" msgid "Show Member" msgstr "" -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "This is a member record from your database." -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -298,12 +289,14 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Members" msgstr "" +#: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/custom_field_live/form.ex #, elixir-autogen, elixir-format msgid "Name" @@ -319,6 +312,7 @@ msgstr "" msgid "Not enabled" msgstr "" +#: lib/mv_web/live/contribution_period_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format, fuzzy msgid "Note" @@ -581,12 +575,6 @@ msgstr "" msgid "Choose a custom field" msgstr "" -#: lib/mv_web/live/member_live/form.ex -#: lib/mv_web/live/member_live/show.ex -#, elixir-autogen, elixir-format -msgid "Custom Field Values" -msgstr "" - #: lib/mv_web/live/custom_field_value_live/form.ex #, elixir-autogen, elixir-format msgid "Custom field" @@ -623,6 +611,8 @@ msgid "Use this form to manage custom_field records in your database." msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format, fuzzy msgid "Custom Fields" msgstr "" @@ -689,6 +679,7 @@ msgstr "" msgid "Manage global settings for the association." msgstr "" +#: lib/mv_web/live/contribution_settings_live.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Save Settings" @@ -791,11 +782,6 @@ msgstr "" msgid "Tip: Paste email addresses into the BCC field for privacy compliance" msgstr "" -#: lib/mv_web/live/member_live/form.ex -#, elixir-autogen, elixir-format -msgid "Fields marked with an asterisk (*) cannot be empty." -msgstr "" - #: lib/mv_web/components/core_components.ex #, elixir-autogen, elixir-format, fuzzy msgid "This field cannot be empty" @@ -821,17 +807,549 @@ msgstr "" msgid "Payment filter" msgstr "" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Address" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Back" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Coming soon" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contact Data" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contribution" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "Nr." +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Payment Cycle" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Payment Data" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Payments" +msgstr "" + +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Pending" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Personal Data" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Phone" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Save" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "This data is for demonstration purposes only (mockup)." +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "monthly" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "yearly" +msgstr "" + +#: lib/mv_web/live/member_live/form.ex +#, elixir-autogen, elixir-format +msgid "Create Member" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "%{count} period selected" +msgid_plural "%{count} periods selected" +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "About Contribution Types" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Amount" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Back to Settings" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Can be changed at any time. Amount changes affect future periods only." +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Cannot delete - members assigned" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Change Contribution Type" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Configure global settings for membership contributions." +msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Contribution Settings" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contribution Start" +msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Contribution Types" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Contribution start" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contribution type" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." +msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex +#, elixir-autogen, elixir-format +msgid "Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Contributions for %{name}" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Current" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Default Contribution Type" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Deletion" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Example: Member Contribution View" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Examples" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Family" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Fixed after creation. Members can only switch between types with the same interval." +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Generated periods" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Global Settings" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Half-yearly" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Half-yearly contribution for supporting members" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Honorary" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Include joining period" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Interval" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Joining date" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Joining year - reduced to 0" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Manage contribution types for membership fees." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Paid" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Suspended" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Mark as Unpaid" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Member Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays for the year they joined" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the joining month" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the next full quarter" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Member pays from the next full year" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Member since" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Members can only switch between contribution types with the same payment interval (e.g., yearly to yearly). This prevents complex period overlaps." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Monthly" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Monthly Interval - Joining Period Included" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Monthly fee for students and trainees" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Name & Amount" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "New Contribution Type" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "No fee for honorary members" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Only possible if no members are assigned to this type." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Open Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Paid via bank transfer" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Preview Mockup" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Quarterly" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Quarterly Interval - Joining Period Excluded" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Quarterly fee for family memberships" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Reduced" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Reduced fee for unemployed, pensioners, or low income" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Regular" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Reopen" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods." +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Standard membership fee for regular members" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Status" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Student" +msgstr "" + +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Supporting Member" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Suspend" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Suspended" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "This page is not functional and only displays the planned features." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Time Period" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Total Contributions" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Unpaid" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "View Example Member" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "When active: Members pay from the period of their joining." +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "When inactive: Members pay from the next full period after joining." +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#, elixir-autogen, elixir-format +msgid "Why are not all contribution types shown?" +msgstr "" + +#: lib/mv_web/live/contribution_period_live/show.ex +#: lib/mv_web/live/contribution_settings_live.ex +#: lib/mv_web/live/contribution_type_live/index.ex +#, elixir-autogen, elixir-format +msgid "Yearly" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Yearly Interval - Joining Period Excluded" +msgstr "" + +#: lib/mv_web/live/contribution_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Yearly Interval - Joining Period Included" +msgstr "" + #~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Birth Date" #~ msgstr "" +#~ #: lib/mv_web/live/member_live/form.ex +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Custom Field Values" +#~ msgstr "" + +#~ #: lib/mv_web/live/member_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Fields marked with an asterisk (*) cannot be empty." +#~ msgstr "" + #~ #: lib/mv_web/live/user_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "ID" #~ msgstr "" +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Id" +#~ msgstr "" + #~ #: lib/mv_web/live/user_live/show.ex #~ #, elixir-autogen, elixir-format, fuzzy #~ msgid "Not set" @@ -842,3 +1360,8 @@ msgstr "" #~ #, elixir-autogen, elixir-format #~ msgid "OIDC ID" #~ msgstr "" + +#~ #: lib/mv_web/live/member_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "This is a member record from your database." +#~ msgstr "" From a92771ffcae376b98bcc79bc88fc01cf0710fa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Wed, 3 Dec 2025 16:06:07 +0100 Subject: [PATCH 18/35] Also remove "-" prefix from merge conflicts in .po files --- Justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 25fb35c..2231525 100644 --- a/Justfile +++ b/Justfile @@ -90,7 +90,7 @@ clean: remove-gettext-conflicts: #!/usr/bin/env bash set -euo pipefail - find priv/gettext -type f -exec sed -i '/^<<<<<<>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \; + find priv/gettext -type f -exec sed -i '/^<<<<<<>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//; s/^-//' {} \; # Production environment commands # ================================ From ba5fc34d80480150a747d3e7496d0d042cd355b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Tue, 2 Dec 2025 19:24:45 +0100 Subject: [PATCH 19/35] Move custom fields to global admin settings --- lib/mv_web/components/layouts/navbar.ex | 2 +- lib/mv_web/live/custom_field_live/form.ex | 142 ---------- .../live/custom_field_live/form_component.ex | 122 +++++++++ lib/mv_web/live/custom_field_live/index.ex | 199 -------------- .../live/custom_field_live/index_component.ex | 259 ++++++++++++++++++ lib/mv_web/live/custom_field_live/show.ex | 75 ----- lib/mv_web/live/global_settings_live.ex | 47 +++- lib/mv_web/router.ex | 6 - priv/gettext/de/LC_MESSAGES/default.po | 117 ++++++-- priv/gettext/default.pot | 107 ++++++-- priv/gettext/en/LC_MESSAGES/default.po | 117 ++++++-- .../member_field_visibility_test.exs | 14 - .../live/custom_field_live/deletion_test.exs | 77 +++--- test/mv_web/live/profile_navigation_test.exs | 2 - 14 files changed, 719 insertions(+), 567 deletions(-) delete mode 100644 lib/mv_web/live/custom_field_live/form.ex create mode 100644 lib/mv_web/live/custom_field_live/form_component.ex delete mode 100644 lib/mv_web/live/custom_field_live/index.ex create mode 100644 lib/mv_web/live/custom_field_live/index_component.ex delete mode 100644 lib/mv_web/live/custom_field_live/show.ex delete mode 100644 test/membership/member_field_visibility_test.exs diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex index 1c1138e..4246c99 100644 --- a/lib/mv_web/components/layouts/navbar.ex +++ b/lib/mv_web/components/layouts/navbar.ex @@ -23,7 +23,7 @@ defmodule MvWeb.Layouts.Navbar do {@club_name}
  • <.link navigate="/members">{gettext("Members")}
    • -
  • <.link navigate="/custom_fields">{gettext("Custom Fields")}
    • +
  • <.link navigate="/settings">{gettext("Settings")}
  • <.link navigate="/users">{gettext("Users")}
  • diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex deleted file mode 100644 index 99317a9..0000000 --- a/lib/mv_web/live/custom_field_live/form.ex +++ /dev/null @@ -1,142 +0,0 @@ -defmodule MvWeb.CustomFieldLive.Form do - @moduledoc """ - LiveView form for creating and editing custom fields (admin). - - ## Features - - Create new custom field definitions - - Edit existing custom fields - - Select value type from supported types - - Set immutable and required flags - - Real-time validation - - ## Form Fields - **Required:** - - name - Unique identifier (e.g., "phone_mobile", "emergency_contact") - - value_type - Data type (:string, :integer, :boolean, :date, :email) - - **Optional:** - - description - Human-readable explanation - - immutable - If true, values cannot be changed after creation (default: false) - - required - If true, all members must have this custom field (default: false) - - show_in_overview - If true, this custom field will be displayed in the member overview table (default: true) - - ## Value Type Selection - - `:string` - Text data (unlimited length) - - `:integer` - Numeric data - - `:boolean` - True/false flags - - `:date` - Date values - - `:email` - Validated email addresses - - ## Events - - `validate` - Real-time form validation - - `save` - Submit form (create or update custom field) - - ## Security - Custom field management is restricted to admin users. - """ - use MvWeb, :live_view - - @impl true - def render(assigns) do - ~H""" - - <.header> - {@page_title} - <:subtitle> - {gettext("Use this form to manage custom_field records in your database.")} - - - - <.form for={@form} id="custom_field-form" phx-change="validate" phx-submit="save"> - <.input field={@form[:name]} type="text" label={gettext("Name")} /> - - <.input - field={@form[:value_type]} - type="select" - label={gettext("Value type")} - options={ - Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of] - } - /> - <.input field={@form[:description]} type="text" label={gettext("Description")} /> - <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} /> - <.input field={@form[:required]} type="checkbox" label={gettext("Required")} /> - <.input field={@form[:show_in_overview]} type="checkbox" label={gettext("Show in overview")} /> - - <.button phx-disable-with={gettext("Saving...")} variant="primary"> - {gettext("Save Custom field")} - - <.button navigate={return_path(@return_to, @custom_field)}>{gettext("Cancel")} - - - """ - end - - @impl true - def mount(params, _session, socket) do - custom_field = - case params["id"] do - nil -> nil - id -> Ash.get!(Mv.Membership.CustomField, id) - end - - action = if is_nil(custom_field), do: "New", else: "Edit" - page_title = action <> " " <> "Custom field" - - {:ok, - socket - |> assign(:return_to, return_to(params["return_to"])) - |> assign(custom_field: custom_field) - |> assign(:page_title, page_title) - |> assign_form()} - end - - defp return_to("show"), do: "show" - defp return_to(_), do: "index" - - @impl true - def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do - {:noreply, - assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))} - end - - def handle_event("save", %{"custom_field" => custom_field_params}, socket) do - case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do - {:ok, custom_field} -> - notify_parent({:saved, custom_field}) - - action = - case socket.assigns.form.source.type do - :create -> gettext("create") - :update -> gettext("update") - other -> to_string(other) - end - - socket = - socket - |> put_flash(:info, gettext("Custom field %{action} successfully", action: action)) - |> push_navigate(to: return_path(socket.assigns.return_to, custom_field)) - - {:noreply, socket} - - {:error, form} -> - {:noreply, assign(socket, form: form)} - end - end - - defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) - - defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do - form = - if custom_field do - AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field") - else - AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field") - end - - assign(socket, form: to_form(form)) - end - - defp return_path("index", _custom_field), do: ~p"/custom_fields" - defp return_path("show", custom_field), do: ~p"/custom_fields/#{custom_field.id}" -end diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex new file mode 100644 index 0000000..3c1b8d0 --- /dev/null +++ b/lib/mv_web/live/custom_field_live/form_component.ex @@ -0,0 +1,122 @@ +defmodule MvWeb.CustomFieldLive.FormComponent do + @moduledoc """ + LiveComponent form for creating and editing custom fields (embedded in settings). + + ## Features + - Create new custom field definitions + - Edit existing custom fields + - Select value type from supported types + - Set immutable and required flags + - Real-time validation + + ## Props + - `custom_field` - The custom field to edit (nil for new) + - `on_save` - Callback function to call when form is saved + - `on_cancel` - Callback function to call when form is cancelled + """ + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
    +
    +
    + <.button type="button" phx-click="cancel" phx-target={@myself} aria-label={gettext("Back to custom field overview")}> + <.icon name="hero-arrow-left" class="w-4 h-4" /> + +

    + {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")} +

    +
    + + <.form + for={@form} + id={@id <> "-form"} + phx-change="validate" + phx-submit="save" + phx-target={@myself} + > + <.input field={@form[:name]} type="text" label={gettext("Name")} /> + + <.input + field={@form[:value_type]} + type="select" + label={gettext("Value type")} + options={ + Ash.Resource.Info.attribute(Mv.Membership.CustomField, :value_type).constraints[:one_of] + } + /> + <.input field={@form[:description]} type="text" label={gettext("Description")} /> + <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} /> + <.input field={@form[:required]} type="checkbox" label={gettext("Required")} /> + <.input + field={@form[:show_in_overview]} + type="checkbox" + label={gettext("Show in overview")} + /> + +
    + <.button type="button" phx-click="cancel" phx-target={@myself}> + {gettext("Cancel")} + + <.button phx-disable-with={gettext("Saving...")} variant="primary"> + {gettext("Save Custom field")} + +
    + +
    +
    + """ + end + + @impl true + def update(assigns, socket) do + {:ok, + socket + |> assign(assigns) + |> assign_form()} + end + + @impl true + def handle_event("validate", %{"custom_field" => custom_field_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, custom_field_params))} + end + + @impl true + def handle_event("save", %{"custom_field" => custom_field_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do + {:ok, custom_field} -> + action = + case socket.assigns.form.source.type do + :create -> gettext("create") + :update -> gettext("update") + other -> to_string(other) + end + + socket.assigns.on_save.(custom_field, action) + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + @impl true + def handle_event("cancel", _params, socket) do + socket.assigns.on_cancel.() + {:noreply, socket} + end + + defp assign_form(%{assigns: %{custom_field: custom_field}} = socket) do + form = + if custom_field do + AshPhoenix.Form.for_update(custom_field, :update, as: "custom_field") + else + AshPhoenix.Form.for_create(Mv.Membership.CustomField, :create, as: "custom_field") + end + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex deleted file mode 100644 index f711323..0000000 --- a/lib/mv_web/live/custom_field_live/index.ex +++ /dev/null @@ -1,199 +0,0 @@ -defmodule MvWeb.CustomFieldLive.Index do - @moduledoc """ - LiveView for managing custom field definitions (admin). - - ## Features - - List all custom fields - - Display type information (name, value type, description) - - Show immutable and required flags - - Create new custom fields - - Edit existing custom fields - - Delete custom fields with confirmation (cascades to all custom field values) - - ## Displayed Information - - Name: Unique identifier for the custom field - - Value type: Data type constraint (string, integer, boolean, date, email) - - Description: Human-readable explanation - - Immutable: Whether custom field values can be changed after creation - - Required: Whether all members must have this custom field (future feature) - - ## Events - - `prepare_delete` - Opens deletion confirmation modal with member count - - `confirm_delete` - Executes deletion after slug verification - - `cancel_delete` - Cancels deletion and closes modal - - `update_slug_confirmation` - Updates slug input state - - ## Security - Custom field management is restricted to admin users. - Deletion requires entering the custom field's slug to prevent accidental deletions. - """ - use MvWeb, :live_view - - @impl true - def render(assigns) do - ~H""" - - <.header> - Listing Custom fields - <:actions> - <.button variant="primary" navigate={~p"/custom_fields/new"}> - <.icon name="hero-plus" /> New Custom field - - - - - <.table - id="custom_fields" - rows={@streams.custom_fields} - row_click={fn {_id, custom_field} -> JS.navigate(~p"/custom_fields/#{custom_field}") end} - > - <:col :let={{_id, custom_field}} label="Name">{custom_field.name} - - <:col :let={{_id, custom_field}} label="Description">{custom_field.description} - - <:action :let={{_id, custom_field}}> -
    - <.link navigate={~p"/custom_fields/#{custom_field}"}>Show -
    - - <.link navigate={~p"/custom_fields/#{custom_field}/edit"}>Edit - - - <:action :let={{_id, custom_field}}> - <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id})}> - Delete - - - - - <%!-- Delete Confirmation Modal --%> - -
    -

    {gettext("Delete Custom Field")}

    - -
    -
    - <.icon name="hero-exclamation-triangle" class="h-5 w-5" /> -
    -

    - {ngettext( - "%{count} member has a value assigned for this custom field.", - "%{count} members have values assigned for this custom field.", - @custom_field_to_delete.assigned_members_count, - count: @custom_field_to_delete.assigned_members_count - )} -

    -

    - {gettext( - "All custom field values will be permanently deleted when you delete this custom field." - )} -

    -
    -
    - -
    - -
    - {@custom_field_to_delete.slug} -
    -
    - -
    -
    -
    - -
    - - -
    -
    -     -     - """ - end - - @impl true - def mount(_params, _session, socket) do - {:ok, - socket - |> assign(:page_title, "Listing Custom fields") - |> assign(:show_delete_modal, false) - |> assign(:custom_field_to_delete, nil) - |> assign(:slug_confirmation, "") - |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField))} - end - - @impl true - def handle_event("prepare_delete", %{"id" => id}, socket) do - custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count]) - - {:noreply, - socket - |> assign(:custom_field_to_delete, custom_field) - |> assign(:show_delete_modal, true) - |> assign(:slug_confirmation, "")} - end - - @impl true - def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do - {:noreply, assign(socket, :slug_confirmation, slug)} - end - - @impl true - def handle_event("confirm_delete", _params, socket) do - custom_field = socket.assigns.custom_field_to_delete - - if socket.assigns.slug_confirmation == custom_field.slug do - # Delete the custom field (CASCADE will handle custom field values) - case Ash.destroy(custom_field) do - :ok -> - {:noreply, - socket - |> put_flash(:info, "Custom field deleted successfully") - |> assign(:show_delete_modal, false) - |> assign(:custom_field_to_delete, nil) - |> assign(:slug_confirmation, "") - |> stream_delete(:custom_fields, custom_field)} - - {:error, error} -> - {:noreply, - socket - |> put_flash(:error, "Failed to delete custom field: #{inspect(error)}")} - end - else - {:noreply, - socket - |> put_flash(:error, "Slug does not match. Deletion cancelled.")} - end - end - - @impl true - def handle_event("cancel_delete", _params, socket) do - {:noreply, - socket - |> assign(:show_delete_modal, false) - |> assign(:custom_field_to_delete, nil) - |> assign(:slug_confirmation, "")} - end -end diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex new file mode 100644 index 0000000..9b8ff0d --- /dev/null +++ b/lib/mv_web/live/custom_field_live/index_component.ex @@ -0,0 +1,259 @@ +defmodule MvWeb.CustomFieldLive.IndexComponent do + @moduledoc """ + LiveComponent for managing custom field definitions (embedded in settings). + + ## Features + - List all custom fields + - Display type information (name, value type, description) + - Show immutable and required flags + - Create new custom fields + - Edit existing custom fields + - Delete custom fields with confirmation (cascades to all custom field values) + """ + use MvWeb, :live_component + + @impl true + def render(assigns) do + ~H""" +
    + <.header> + {gettext("Custom Fields")} + <:subtitle> + {gettext("These will appear in addition to other data when adding new members.")} + + <:actions> + <.button variant="primary" phx-click="new_custom_field" phx-target={@myself}> + <.icon name="hero-plus" /> {gettext("New Custom field")} + + + + + <%!-- Show form when creating or editing --%> +
    + <.live_component + module={MvWeb.CustomFieldLive.FormComponent} + id={@form_id} + custom_field={@editing_custom_field} + on_save={fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end} + on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end} + /> +
    + + <%!-- Hide table when form is visible --%> + <.table + :if={!@show_form} + id="custom_fields" + rows={@streams.custom_fields} + row_click={ + fn {_id, custom_field} -> + JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself) + end + } + > + <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name} + + <:col :let={{_id, custom_field}} label={gettext("Value Type")}> + {custom_field.value_type} + + + <:col :let={{_id, custom_field}} label={gettext("Description")}> + {custom_field.description} + + + <:col :let={{_id, custom_field}} label={gettext("Show in Overview")}> + + {gettext("Yes")} + + + {gettext("No")} + + + + <:action :let={{_id, custom_field}}> + <.link phx-click={ + JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself) + }> + {gettext("Edit")} + + + + <:action :let={{_id, custom_field}}> + <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)}> + {gettext("Delete")} + + + + + <%!-- Delete Confirmation Modal --%> + +
    +

    {gettext("Delete Custom Field")}

    + +
    +
    + <.icon name="hero-exclamation-triangle" class="w-5 h-5" /> +
    +

    + {ngettext( + "%{count} member has a value assigned for this custom field.", + "%{count} members have values assigned for this custom field.", + @custom_field_to_delete.assigned_members_count, + count: @custom_field_to_delete.assigned_members_count + )} +

    +

    + {gettext( + "All custom field values will be permanently deleted when you delete this custom field." + )} +

    +
    +
    + +
    + +
    + {@custom_field_to_delete.slug} +
    +
    + +
    +
    +
    + +
    + + +
    +
    +     +
    + """ + end + + @impl true + def update(assigns, socket) do + # If show_form is explicitly provided in assigns, reset editing state + socket = + if Map.has_key?(assigns, :show_form) and assigns.show_form == false do + socket + |> assign(:editing_custom_field, nil) + |> assign(:form_id, "custom-field-form-new") + else + socket + end + + {:ok, + socket + |> assign(assigns) + |> assign_new(:show_form, fn -> false end) + |> assign_new(:form_id, fn -> "custom-field-form-new" end) + |> assign_new(:editing_custom_field, fn -> nil end) + |> assign_new(:show_delete_modal, fn -> false end) + |> assign_new(:custom_field_to_delete, fn -> nil end) + |> assign_new(:slug_confirmation, fn -> "" end) + |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField), reset: true)} + end + + @impl true + def handle_event("new_custom_field", _params, socket) do + {:noreply, + socket + |> assign(:show_form, true) + |> assign(:editing_custom_field, nil) + |> assign(:form_id, "custom-field-form-new")} + end + + @impl true + def handle_event("edit_custom_field", %{"id" => id}, socket) do + custom_field = Ash.get!(Mv.Membership.CustomField, id) + + {:noreply, + socket + |> assign(:show_form, true) + |> assign(:editing_custom_field, custom_field) + |> assign(:form_id, "custom-field-form-#{id}")} + end + + @impl true + def handle_event("prepare_delete", %{"id" => id}, socket) do + custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count]) + + {:noreply, + socket + |> assign(:custom_field_to_delete, custom_field) + |> assign(:show_delete_modal, true) + |> assign(:slug_confirmation, "")} + end + + @impl true + def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do + {:noreply, assign(socket, :slug_confirmation, slug)} + end + + @impl true + def handle_event("confirm_delete", _params, socket) do + custom_field = socket.assigns.custom_field_to_delete + + if socket.assigns.slug_confirmation == custom_field.slug do + case Ash.destroy(custom_field) do + :ok -> + send(self(), {:custom_field_deleted, custom_field}) + + {:noreply, + socket + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "") + |> stream_delete(:custom_fields, custom_field)} + + {:error, error} -> + send(self(), {:custom_field_delete_error, error}) + + {:noreply, + socket + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "")} + end + else + send(self(), :custom_field_slug_mismatch) + + {:noreply, + socket + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "")} + end + end + + @impl true + def handle_event("cancel_delete", _params, socket) do + {:noreply, + socket + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "")} + end +end diff --git a/lib/mv_web/live/custom_field_live/show.ex b/lib/mv_web/live/custom_field_live/show.ex deleted file mode 100644 index 239b844..0000000 --- a/lib/mv_web/live/custom_field_live/show.ex +++ /dev/null @@ -1,75 +0,0 @@ -defmodule MvWeb.CustomFieldLive.Show do - @moduledoc """ - LiveView for displaying a single custom field's details (admin). - - ## Features - - Display custom field definition - - Show all attributes (name, value type, description, flags) - - Navigate to edit form - - Return to custom field list - - ## Displayed Information - - ID: Internal UUID identifier - - Slug: URL-friendly identifier (auto-generated, immutable) - - Name: Unique identifier - - Value type: Data type constraint - - Description: Optional explanation - - Immutable flag: Whether values can be changed - - Required flag: Whether all members need this custom field - - ## Navigation - - Back to custom field list - - Edit custom field - - ## Security - Custom field details are restricted to admin users. - """ - use MvWeb, :live_view - - @impl true - def render(assigns) do - ~H""" - - <.header> - Custom field {@custom_field.slug} - <:subtitle>This is a custom_field record from your database. - - <:actions> - <.button navigate={~p"/custom_fields"}> - <.icon name="hero-arrow-left" /> - - <.button - variant="primary" - navigate={~p"/custom_fields/#{@custom_field}/edit?return_to=show"} - > - <.icon name="hero-pencil-square" /> Edit Custom field - - - - - <.list> - <:item title="Id">{@custom_field.id} - - <:item title="Slug"> - {@custom_field.slug} -

    - {gettext("Auto-generated identifier (immutable)")} -

    - - - <:item title="Name">{@custom_field.name} - - <:item title="Description">{@custom_field.description} - -     - """ - end - - @impl true - def mount(%{"id" => id}, _session, socket) do - {:ok, - socket - |> assign(:page_title, "Show Custom field") - |> assign(:custom_field, Ash.get!(Mv.Membership.CustomField, id))} - end -end diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 0be4559..bb919cb 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -4,6 +4,7 @@ defmodule MvWeb.GlobalSettingsLive do ## Features - Edit the association/club name + - Manage custom fields - Real-time form validation - Success/error feedback @@ -28,7 +29,7 @@ defmodule MvWeb.GlobalSettingsLive do {:ok, socket - |> assign(:page_title, gettext("Club Settings")) + |> assign(:page_title, gettext("Settings")) |> assign(:settings, settings) |> assign_form()} end @@ -38,12 +39,16 @@ defmodule MvWeb.GlobalSettingsLive do ~H""" <.header> - {gettext("Club Settings")} + {gettext("Settings")} <:subtitle> {gettext("Manage global settings for the association.")} + <%!-- Club Settings Section --%> + <.header> + {gettext("Club Settings")} + <.form for={@form} id="settings-form" phx-change="validate" phx-submit="save"> <.input field={@form[:club_name]} @@ -56,6 +61,12 @@ defmodule MvWeb.GlobalSettingsLive do {gettext("Save Settings")} + + <%!-- Custom Fields Section --%> + <.live_component + module={MvWeb.CustomFieldLive.IndexComponent} + id="custom-fields-component" + /> """ end @@ -66,6 +77,7 @@ defmodule MvWeb.GlobalSettingsLive do assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, setting_params))} end + @impl true def handle_event("save", %{"setting" => setting_params}, socket) do case AshPhoenix.Form.submit(socket.assigns.form, params: setting_params) do {:ok, updated_settings} -> @@ -82,6 +94,37 @@ defmodule MvWeb.GlobalSettingsLive do end end + @impl true + def handle_info({:custom_field_saved, _custom_field, action}, socket) do + send_update(MvWeb.CustomFieldLive.IndexComponent, + id: "custom-fields-component", + show_form: false + ) + + {:noreply, + put_flash(socket, :info, gettext("Custom field %{action} successfully", action: action))} + end + + @impl true + def handle_info({:custom_field_deleted, _custom_field}, socket) do + {:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))} + end + + @impl true + def handle_info({:custom_field_delete_error, error}, socket) do + {:noreply, + put_flash( + socket, + :error, + gettext("Failed to delete custom field: %{error}", error: inspect(error)) + )} + end + + @impl true + def handle_info(:custom_field_slug_mismatch, socket) do + {:noreply, put_flash(socket, :error, gettext("Slug does not match. Deletion cancelled."))} + end + defp assign_form(%{assigns: %{settings: settings}} = socket) do form = AshPhoenix.Form.for_update( diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex index c574e17..d6f108e 100644 --- a/lib/mv_web/router.ex +++ b/lib/mv_web/router.ex @@ -55,12 +55,6 @@ defmodule MvWeb.Router do live "/members/:id", MemberLive.Show, :show live "/members/:id/show/edit", MemberLive.Show, :edit - live "/custom_fields", CustomFieldLive.Index, :index - live "/custom_fields/new", CustomFieldLive.Form, :new - live "/custom_fields/:id/edit", CustomFieldLive.Form, :edit - live "/custom_fields/:id", CustomFieldLive.Show, :show - live "/custom_fields/:id/show/edit", CustomFieldLive.Show, :edit - live "/custom_field_values", CustomFieldValueLive.Index, :index live "/custom_field_values/new", CustomFieldValueLive.Form, :new live "/custom_field_values/:id/edit", CustomFieldValueLive.Form, :edit diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 82fbabe..3f80877 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -34,6 +34,7 @@ msgid "City" msgstr "Stadt" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format @@ -41,6 +42,7 @@ msgid "Delete" msgstr "Löschen" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -154,7 +156,7 @@ msgstr "Postleitzahl" msgid "Save Member" msgstr "Mitglied speichern" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/form.ex @@ -169,6 +171,7 @@ msgstr "Speichern..." msgid "Street" msgstr "Straße" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -181,6 +184,7 @@ msgstr "Nein" msgid "Show Member" msgstr "Mitglied anzeigen" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -188,14 +192,14 @@ msgstr "Mitglied anzeigen" msgid "Yes" msgstr "Ja" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "create" msgstr "erstellt" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format @@ -237,8 +241,8 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt" msgid "Your password has successfully been reset" msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" -#: lib/mv_web/live/custom_field_live/form.ex -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/user_live/form.ex @@ -251,7 +255,8 @@ msgstr "Abbrechen" msgid "Choose a member" msgstr "Mitglied auswählen" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Description" msgstr "Beschreibung" @@ -266,7 +271,7 @@ msgstr "Benutzer*in bearbeiten" msgid "Enabled" msgstr "Aktiviert" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Immutable" msgstr "Unveränderlich" @@ -296,7 +301,8 @@ msgid "Members" msgstr "Mitglieder" #: lib/mv_web/live/contribution_type_live/index.ex -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Name" msgstr "Name" @@ -327,7 +333,7 @@ msgstr "Passwort-Authentifizierung" msgid "Profil" msgstr "Profil" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Required" msgstr "Erforderlich" @@ -343,6 +349,7 @@ msgid "Select member" msgstr "Mitglied auswählen" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" msgstr "Einstellungen" @@ -383,7 +390,7 @@ msgstr "Benutzer*in" msgid "Value" msgstr "Wert" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Value type" msgstr "Wertetyp" @@ -579,7 +586,7 @@ msgstr "Wähle ein Benutzerdefiniertes Feld" msgid "Custom field" msgstr "Benutzerdefinierte Felder" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "Benutzerdefiniertes Feld erfolgreich %{action}" @@ -594,7 +601,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}" msgid "Please select a custom field first" msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "Benutzerdefiniertes Feld speichern" @@ -604,12 +611,7 @@ msgstr "Benutzerdefiniertes Feld speichern" msgid "Save Custom field value" msgstr "Benutzerdefinierten Feldwert speichern" -#: lib/mv_web/live/custom_field_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage custom_field records in your database." -msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." - -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -621,44 +623,39 @@ msgstr "Benutzerdefinierte Felder" msgid "Use this form to manage Custom Field Value records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten." -#: lib/mv_web/live/custom_field_live/show.ex -#, elixir-autogen, elixir-format -msgid "Auto-generated identifier (immutable)" -msgstr "Automatisch generierter Bezeichner (unveränderlich)" - -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "%{count} member has a value assigned for this custom field." msgid_plural "%{count} members have values assigned for this custom field." msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen." msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen." -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "All custom field values will be permanently deleted when you delete this custom field." msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht." -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field" msgstr "Benutzerdefiniertes Feld löschen" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "Benutzerdefiniertes Feld und alle Werte löschen" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Enter the text above to confirm" msgstr "Obigen Text zur Bestätigung eingeben" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format, fuzzy msgid "To confirm deletion, please enter this text:" msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Show in overview" msgstr "In der Mitglieder-Übersicht anzeigen" @@ -1322,6 +1319,61 @@ msgstr "" msgid "Yearly Interval - Joining Period Included" msgstr "" +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format +msgid "Back to custom field overview" +msgstr "Zurück zur Felderliste" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Custom field deleted successfully" +msgstr "Benutzerdefiniertes Feld erfolgreich %{action}" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit Custom Field" +msgstr "Benutzerdefiniertes Feld löschen" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Failed to delete custom field: %{error}" +msgstr "Konnte Feld nicht löschen: %{error}" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "New Custom Field" +msgstr "Benutzerdefiniertes Feld speichern" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "New Custom field" +msgstr "Benutzerdefiniertes Feld speichern" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Show in Overview" +msgstr "In der Mitglieder-Übersicht anzeigen" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Slug does not match. Deletion cancelled." +msgstr "Eingegebener Text war nicht korrekt. Vorgang abgebrochen." + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "These will appear in addition to other data when adding new members." +msgstr "Diese Felder können zusätzlich zu den normalen Daten ausgefüllt werden, wenn ein neues Mitglied angelegt wird." + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Value Type" +msgstr "Wertetyp" + +#~ #: lib/mv_web/live/custom_field_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Auto-generated identifier (immutable)" +#~ msgstr "Automatisch generierter Bezeichner (unveränderlich)" + #~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/show.ex #~ #, elixir-autogen, elixir-format @@ -1366,3 +1418,8 @@ msgstr "" #~ #, elixir-autogen, elixir-format #~ msgid "This is a member record from your database." #~ msgstr "Dies ist ein Mitglied aus deiner Datenbank." + +#~ #: lib/mv_web/live/custom_field_live/form.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Use this form to manage custom_field records in your database." +#~ msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5f94e73..9a479c6 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -35,6 +35,7 @@ msgid "City" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format @@ -42,6 +43,7 @@ msgid "Delete" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -155,7 +157,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/form.ex @@ -170,6 +172,7 @@ msgstr "" msgid "Street" msgstr "" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -182,6 +185,7 @@ msgstr "" msgid "Show Member" msgstr "" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -189,14 +193,14 @@ msgstr "" msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format @@ -238,8 +242,8 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/user_live/form.ex @@ -252,7 +256,8 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -267,7 +272,7 @@ msgstr "" msgid "Enabled" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -297,7 +302,8 @@ msgid "Members" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Name" msgstr "" @@ -328,7 +334,7 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Required" msgstr "" @@ -344,6 +350,7 @@ msgid "Select member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -384,7 +391,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -580,7 +587,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -595,7 +602,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -605,12 +612,7 @@ msgstr "" msgid "Save Custom field value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex -#, elixir-autogen, elixir-format -msgid "Use this form to manage custom_field records in your database." -msgstr "" - -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -622,44 +624,39 @@ msgstr "" msgid "Use this form to manage Custom Field Value records in your database." msgstr "" -#: lib/mv_web/live/custom_field_live/show.ex -#, elixir-autogen, elixir-format -msgid "Auto-generated identifier (immutable)" -msgstr "" - -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "%{count} member has a value assigned for this custom field." msgid_plural "%{count} members have values assigned for this custom field." msgstr[0] "" msgstr[1] "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "All custom field values will be permanently deleted when you delete this custom field." msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Enter the text above to confirm" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "To confirm deletion, please enter this text:" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Show in overview" msgstr "" @@ -1322,3 +1319,53 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Yearly Interval - Joining Period Included" msgstr "" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format +msgid "Back to custom field overview" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Custom field deleted successfully" +msgstr "" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format +msgid "Edit Custom Field" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Failed to delete custom field: %{error}" +msgstr "" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format +msgid "New Custom Field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "New Custom field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "Show in Overview" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Slug does not match. Deletion cancelled." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "These will appear in addition to other data when adding new members." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "Value Type" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 47896b4..3d80e4d 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -35,6 +35,7 @@ msgid "City" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/index.html.heex #, elixir-autogen, elixir-format @@ -42,6 +43,7 @@ msgid "Delete" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/user_live/form.ex #: lib/mv_web/live/user_live/index.html.heex @@ -155,7 +157,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/form.ex @@ -170,6 +172,7 @@ msgstr "" msgid "Street" msgstr "" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -182,6 +185,7 @@ msgstr "" msgid "Show Member" msgstr "" +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/index/formatter.ex #: lib/mv_web/live/member_live/show.ex @@ -189,14 +193,14 @@ msgstr "" msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #, elixir-autogen, elixir-format @@ -238,8 +242,8 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/user_live/form.ex @@ -252,7 +256,8 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -267,7 +272,7 @@ msgstr "" msgid "Enabled" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -297,7 +302,8 @@ msgid "Members" msgstr "" #: lib/mv_web/live/contribution_type_live/index.ex -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Name" msgstr "" @@ -328,7 +334,7 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Required" msgstr "" @@ -344,6 +350,7 @@ msgid "Select member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -384,7 +391,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -580,7 +587,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -595,7 +602,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -605,12 +612,7 @@ msgstr "" msgid "Save Custom field value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Use this form to manage custom_field records in your database." -msgstr "" - -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format, fuzzy @@ -622,44 +624,39 @@ msgstr "" msgid "Use this form to manage Custom Field Value records in your database." msgstr "" -#: lib/mv_web/live/custom_field_live/show.ex -#, elixir-autogen, elixir-format -msgid "Auto-generated identifier (immutable)" -msgstr "" - -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "%{count} member has a value assigned for this custom field." msgid_plural "%{count} members have values assigned for this custom field." msgstr[0] "" msgstr[1] "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "All custom field values will be permanently deleted when you delete this custom field." msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format msgid "Enter the text above to confirm" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex +#: lib/mv_web/live/custom_field_live/index_component.ex #, elixir-autogen, elixir-format, fuzzy msgid "To confirm deletion, please enter this text:" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex +#: lib/mv_web/live/custom_field_live/form_component.ex #, elixir-autogen, elixir-format msgid "Show in overview" msgstr "" @@ -1323,6 +1320,61 @@ msgstr "" msgid "Yearly Interval - Joining Period Included" msgstr "" +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format +msgid "Back to custom field overview" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Custom field deleted successfully" +msgstr "" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit Custom Field" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Failed to delete custom field: %{error}" +msgstr "" + +#: lib/mv_web/live/custom_field_live/form_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "New Custom Field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "New Custom field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Show in Overview" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Slug does not match. Deletion cancelled." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format +msgid "These will appear in addition to other data when adding new members." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index_component.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Value Type" +msgstr "" + +#~ #: lib/mv_web/live/custom_field_live/show.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Auto-generated identifier (immutable)" +#~ msgstr "" + #~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/show.ex #~ #, elixir-autogen, elixir-format @@ -1365,3 +1417,8 @@ msgstr "" #~ #, elixir-autogen, elixir-format #~ msgid "This is a member record from your database." #~ msgstr "" + +#~ #: lib/mv_web/live/custom_field_live/form.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Use this form to manage custom_field records in your database." +#~ msgstr "" diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs deleted file mode 100644 index 9963169..0000000 --- a/test/membership/member_field_visibility_test.exs +++ /dev/null @@ -1,14 +0,0 @@ -defmodule Mv.Membership.MemberFieldVisibilityTest do - @moduledoc """ - Tests for member field visibility configuration. - - Tests cover: - - Member fields are visible by default (show_in_overview: true) - - Member fields can be hidden (show_in_overview: false) - - Checking if a specific field is visible - - Configuration is stored in Settings resource - """ - use Mv.DataCase, async: true - - alias Mv.Membership.Member -end diff --git a/test/mv_web/live/custom_field_live/deletion_test.exs b/test/mv_web/live/custom_field_live/deletion_test.exs index f0317e0..322cf38 100644 --- a/test/mv_web/live/custom_field_live/deletion_test.exs +++ b/test/mv_web/live/custom_field_live/deletion_test.exs @@ -1,6 +1,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do @moduledoc """ - Tests for CustomFieldLive.Index deletion modal and slug confirmation. + Tests for CustomFieldLive.IndexComponent deletion modal and slug confirmation. + Tests the custom field management component embedded in the settings page. Tests cover: - Opening deletion confirmation modal @@ -39,11 +40,11 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do # Create custom field value create_custom_field_value(member, custom_field, "test") - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") - # Click delete button + # Click delete button - find the delete link within the component view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() # Modal should be visible @@ -65,10 +66,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do create_custom_field_value(member1, custom_field, "test1") create_custom_field_value(member2, custom_field, "test2") - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() # Should show plural form @@ -78,10 +79,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do test "shows 0 members for custom field without values", %{conn: conn} do {:ok, _custom_field} = create_custom_field("test_field", :string) - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() # Should show 0 members @@ -93,15 +94,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do test "updates confirmation state when typing", %{conn: conn} do {:ok, custom_field} = create_custom_field("test_field", :string) - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() - # Type in slug input + # Type in slug input - use element to find the form with phx-target view - |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug}) + |> element("#delete-custom-field-modal form") + |> render_change(%{"slug" => custom_field.slug}) # Confirm button should be enabled now (no disabled attribute) html = render(view) @@ -111,15 +113,16 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do test "delete button is disabled when slug doesn't match", %{conn: conn} do {:ok, _custom_field} = create_custom_field("test_field", :string) - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() - # Type wrong slug + # Type wrong slug - use element to find the form with phx-target view - |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"}) + |> element("#delete-custom-field-modal form") + |> render_change(%{"slug" => "wrong-slug"}) # Button should be disabled html = render(view) @@ -133,20 +136,21 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do {:ok, custom_field} = create_custom_field("test_field", :string) {:ok, custom_field_value} = create_custom_field_value(member, custom_field, "test") - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") # Open modal view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() - # Enter correct slug + # Enter correct slug - use element to find the form with phx-target view - |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug}) + |> element("#delete-custom-field-modal form") + |> render_change(%{"slug" => custom_field.slug}) # Click confirm view - |> element("button", "Delete Custom Field and All Values") + |> element("#delete-custom-field-modal button", "Delete Custom Field and All Values") |> render_click() # Should show success message @@ -162,27 +166,28 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do assert {:ok, _} = Ash.get(Member, member.id) end - test "shows error when slug doesn't match", %{conn: conn} do + test "button remains disabled and custom field not deleted when slug doesn't match", %{ + conn: conn + } do {:ok, custom_field} = create_custom_field("test_field", :string) - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() - # Enter wrong slug + # Enter wrong slug - use element to find the form with phx-target view - |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"}) + |> element("#delete-custom-field-modal form") + |> render_change(%{"slug" => "wrong-slug"}) - # Try to confirm (button should be disabled, but test the handler anyway) - view - |> render_click("confirm_delete", %{}) + # Button should be disabled and we cannot click it + # The test verifies that the button is properly disabled in the UI + html = render(view) + assert html =~ ~r/disabled(?:=""|(?!\w))/ - # Should show error message - assert render(view) =~ "Slug does not match" - - # Custom field should still exist + # Custom field should still exist since deletion couldn't proceed assert {:ok, _} = Ash.get(CustomField, custom_field.id) end end @@ -191,10 +196,10 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do test "closes modal without deleting", %{conn: conn} do {:ok, custom_field} = create_custom_field("test_field", :string) - {:ok, view, _html} = live(conn, ~p"/custom_fields") + {:ok, view, _html} = live(conn, ~p"/settings") view - |> element("a", "Delete") + |> element("#custom-fields-component a", "Delete") |> render_click() # Modal should be visible @@ -202,7 +207,7 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do # Click cancel view - |> element("button", "Cancel") + |> element("#delete-custom-field-modal button", "Cancel") |> render_click() # Modal should be gone diff --git a/test/mv_web/live/profile_navigation_test.exs b/test/mv_web/live/profile_navigation_test.exs index 5ba5eb0..4b383c6 100644 --- a/test/mv_web/live/profile_navigation_test.exs +++ b/test/mv_web/live/profile_navigation_test.exs @@ -148,8 +148,6 @@ defmodule MvWeb.ProfileNavigationTest do "/members/new", "/custom_field_values", "/custom_field_values/new", - "/custom_fields", - "/custom_fields/new", "/users", "/users/new" ] From 8ce89a72274e68b2235150b4eac19f2f3923d229 Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 3 Dec 2025 17:44:01 +0100 Subject: [PATCH 20/35] formatting --- lib/mv_web/live/custom_field_live/form_component.ex | 7 ++++++- lib/mv_web/live/custom_field_live/index_component.ex | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex index 3c1b8d0..4fe8579 100644 --- a/lib/mv_web/live/custom_field_live/form_component.ex +++ b/lib/mv_web/live/custom_field_live/form_component.ex @@ -22,7 +22,12 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
    - <.button type="button" phx-click="cancel" phx-target={@myself} aria-label={gettext("Back to custom field overview")}> + <.button + type="button" + phx-click="cancel" + phx-target={@myself} + aria-label={gettext("Back to custom field overview")} + > <.icon name="hero-arrow-left" class="w-4 h-4" />

    diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex index 9b8ff0d..50eeaae 100644 --- a/lib/mv_web/live/custom_field_live/index_component.ex +++ b/lib/mv_web/live/custom_field_live/index_component.ex @@ -34,7 +34,9 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do module={MvWeb.CustomFieldLive.FormComponent} id={@form_id} custom_field={@editing_custom_field} - on_save={fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end} + on_save={ + fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end + } on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end} />

    From 75e1fc8a3a703602a25768a4f9465255f59409c9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:07:37 +0100 Subject: [PATCH 21/35] fix: use all_custom_fields in handle_info(:field_toggled) Fixes bug where globally hidden custom fields could not be enabled via dropdown --- lib/mv_web/live/member_live/index.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 3e56ca9..6d489a2 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -292,12 +292,12 @@ defmodule MvWeb.MemberLive.Index do # Save to session (cookie will be saved on next page load via handle_params) socket = update_session_field_selection(socket, new_selection) - # Merge with global settings + # Merge with global settings (use all_custom_fields to allow enabling globally hidden fields) final_selection = FieldVisibility.merge_with_global_settings( new_selection, socket.assigns.settings, - socket.assigns.custom_fields_visible + socket.assigns.all_custom_fields ) # Get visible fields From 4bbba650383a449aaa9babff1fa3be082565a1e8 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:09:08 +0100 Subject: [PATCH 22/35] fix: remove duplicate member_fields_visible assignment in mount/3 Removes dead code and fixes initialization to use FieldVisibility module --- lib/mv_web/live/member_live/index.ex | 30 ---------------------------- 1 file changed, 30 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 6d489a2..086765c 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -104,12 +104,10 @@ defmodule MvWeb.MemberLive.Index do |> assign(:all_custom_fields, all_custom_fields) |> assign(:all_available_fields, all_available_fields) |> assign(:user_field_selection, initial_selection) - # |> assign(:member_field_configurations, get_member_field_configurations(settings)) |> assign( :member_fields_visible, FieldVisibility.get_visible_member_fields(initial_selection) ) - |> assign(:member_fields_visible, get_visible_member_fields(settings)) # We call handle params to use the query from the URL {:ok, socket} @@ -1093,34 +1091,6 @@ defmodule MvWeb.MemberLive.Index do end end - # Gets the list of member fields that should be visible in the overview. - # - # Reads the visibility configuration from Settings and returns only the fields - # where show_in_overview is true. Fields not configured in settings default to true. - # - # Performance: This function uses the already-loaded settings to avoid N+1 queries. - # Settings should be loaded once in mount/3 and passed to this function. - # - # Parameters: - # - `settings` - The settings struct loaded from the database - # - # Returns a list of atoms representing visible member field names. - # - # Fields are read from the global Constants module. - @spec get_visible_member_fields(map()) :: [atom()] - defp get_visible_member_fields(settings) do - # Get all eligible fields from the global constants - all_fields = Mv.Constants.member_fields() - - # JSONB stores keys as strings - visibility_config = settings.member_field_visibility || %{} - - # Filter to only return visible fields - Enum.filter(all_fields, fn field -> - Map.get(visibility_config, Atom.to_string(field), true) - end) - end - # Public helper function to format dates for use in templates def format_date(date), do: DateFormatter.format_date(date) end From 690083bdf07decb07d94eb488c9ceec9ac29045b Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:10:13 +0100 Subject: [PATCH 23/35] refactor: fix Credo warnings in field visibility modules Use Enum.map_join and reduce nesting in format_custom_field_label --- .../field_visibility_dropdown_component.ex | 20 +++++++++---------- .../live/member_live/index/field_selection.ex | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/mv_web/live/components/field_visibility_dropdown_component.ex b/lib/mv_web/live/components/field_visibility_dropdown_component.ex index 1ee0487..f2dfad9 100644 --- a/lib/mv_web/live/components/field_visibility_dropdown_component.ex +++ b/lib/mv_web/live/components/field_visibility_dropdown_component.ex @@ -153,20 +153,20 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do |> field_to_string() |> String.replace("_", " ") |> String.split() - |> Enum.map(&String.capitalize/1) - |> Enum.join(" ") + |> Enum.map_join(" ", &String.capitalize/1) end defp format_custom_field_label(field_string, custom_fields) do - case String.trim_leading(field_string, "custom_field_") do - "" -> - field_string + id = String.trim_leading(field_string, "custom_field_") + find_custom_field_name(id, field_string, custom_fields) + end - id -> - case Enum.find(custom_fields, fn cf -> to_string(cf.id) == id end) do - nil -> gettext("Custom Field %{id}", id: id) - custom_field -> custom_field.name - end + defp find_custom_field_name("", field_string, _custom_fields), do: field_string + + defp find_custom_field_name(id, _field_string, custom_fields) do + case Enum.find(custom_fields, fn cf -> to_string(cf.id) == id end) do + nil -> gettext("Custom Field %{id}", id: id) + custom_field -> custom_field.name end end end diff --git a/lib/mv_web/live/member_live/index/field_selection.ex b/lib/mv_web/live/member_live/index/field_selection.ex index 4d29dae..d3e3acc 100644 --- a/lib/mv_web/live/member_live/index/field_selection.ex +++ b/lib/mv_web/live/member_live/index/field_selection.ex @@ -198,8 +198,7 @@ defmodule MvWeb.MemberLive.Index.FieldSelection do def to_url_param(selection) when is_map(selection) do selection |> Enum.filter(fn {_field, visible} -> visible end) - |> Enum.map(fn {field, _visible} -> field end) - |> Enum.join(",") + |> Enum.map_join(",", fn {field, _visible} -> field end) end def to_url_param(_), do: "" From b9bd5882e7150bd6574955909e08956734160fb8 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:11:24 +0100 Subject: [PATCH 24/35] i18n: fix German translations for field visibility dropdown Remove fuzzy flags and add correct translations for Columns, None, Options, etc --- priv/gettext/de/LC_MESSAGES/default.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 9cc264a..3a70cd8 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -1326,37 +1326,37 @@ msgstr "" #: lib/mv_web/live/components/field_visibility_dropdown_component.ex #, elixir-autogen, elixir-format msgid "Columns" -msgstr "" +msgstr "Spalten" #: lib/mv_web/live/components/field_visibility_dropdown_component.ex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Custom Field %{id}" -msgstr "Benutzerdefinierte Felder" +msgstr "Benutzerdefiniertes Feld %{id}" #: lib/mv_web/live/member_live/index.html.heex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Last name" msgstr "Nachname" #: lib/mv_web/components/core_components.ex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "None" -msgstr "Hinweis" +msgstr "Keine" #: lib/mv_web/components/core_components.ex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Options" -msgstr "Aktionen" +msgstr "Optionen" #: lib/mv_web/components/core_components.ex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Select all" -msgstr "Alle Benutzer*innen auswählen" +msgstr "Alle auswählen" #: lib/mv_web/components/core_components.ex -#, elixir-autogen, elixir-format, fuzzy +#, elixir-autogen, elixir-format msgid "Select none" -msgstr "Ausgewählt" +msgstr "Keine auswählen" #~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/show.ex From ecc6522571623f17845868bc38455170d834b848 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:13:30 +0100 Subject: [PATCH 25/35] test: restore deleted tests with dynamic field visibility support Adapts icon distribution test for dynamic fields, restores empty cell test --- .../components/sort_header_component_test.exs | 23 +++++++++++++++++++ .../index_custom_fields_display_test.exs | 22 ++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/test/mv_web/components/sort_header_component_test.exs b/test/mv_web/components/sort_header_component_test.exs index 5003da0..e199635 100644 --- a/test/mv_web/components/sort_header_component_test.exs +++ b/test/mv_web/components/sort_header_component_test.exs @@ -149,6 +149,29 @@ defmodule MvWeb.Components.SortHeaderComponentTest do assert html_neutral =~ "hero-chevron-up-down" assert has_element?(view, "[data-testid='email'] .opacity-40") end + + test "icon distribution shows exactly one active sort icon", %{conn: conn} do + conn = conn_with_oidc_user(conn) + + # Test neutral state - only one field should have active sort icon + {:ok, _view, html_neutral} = live(conn, "/members") + + # Count active icons (should be exactly 1 - ascending for default sort field) + up_count = html_neutral |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1) + down_count = html_neutral |> String.split("hero-chevron-down ") |> length() |> Kernel.-(1) + + assert up_count == 1, "Expected exactly 1 ascending icon, got #{up_count}" + assert down_count == 0, "Expected 0 descending icons, got #{down_count}" + + # Test descending state + {:ok, _view, html_desc} = live(conn, "/members?sort_field=first_name&sort_order=desc") + + up_count = html_desc |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1) + down_count = html_desc |> String.split("hero-chevron-down ") |> length() |> Kernel.-(1) + + assert up_count == 0, "Expected 0 ascending icons, got #{up_count}" + assert down_count == 1, "Expected exactly 1 descending icon, got #{down_count}" + end end describe "accessibility" do diff --git a/test/mv_web/member_live/index_custom_fields_display_test.exs b/test/mv_web/member_live/index_custom_fields_display_test.exs index 4556e6c..b720099 100644 --- a/test/mv_web/member_live/index_custom_fields_display_test.exs +++ b/test/mv_web/member_live/index_custom_fields_display_test.exs @@ -241,4 +241,26 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do assert html =~ "alice.private@example.com" end + + test "shows empty cell for members without custom field values", %{ + conn: conn, + member2: _member2, + field_show_string: field + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # The custom field column should exist + assert html =~ field.name + + # Member2 should exist in the table (first_name and last_name are in separate columns) + assert html =~ "Bob" + assert html =~ "Brown" + + # The value from member1 should appear (phone number) + assert html =~ "+49123456789" + + # Note: Member2 doesn't have this custom field value, so the cell is empty + # The implementation shows "" for missing values, which is the expected behavior + end end From 3b038d451d3c666c7d56a84749c18bdfd0b2042a Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:20:32 +0100 Subject: [PATCH 26/35] fix: use all_custom_fields in prepare_dynamic_cols Allows users to enable globally hidden custom fields in the table view --- lib/mv_web/live/member_live/index.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 086765c..0e39cc6 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -405,8 +405,9 @@ defmodule MvWeb.MemberLive.Index do defp prepare_dynamic_cols(socket) do visible_custom_field_ids = socket.assigns[:visible_custom_field_ids] || [] + # Use all_custom_fields to allow users to enable globally hidden custom fields dynamic_cols = - socket.assigns.custom_fields_visible + socket.assigns.all_custom_fields |> Enum.filter(fn custom_field -> custom_field.id in visible_custom_field_ids end) |> Enum.map(fn custom_field -> %{ From 217ed632fa729304aa96e2c3acb7b12f0beeac43 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:36:13 +0100 Subject: [PATCH 27/35] fix: preserve paid_filter in URL when toggling field visibility --- lib/mv_web/live/member_live/index.ex | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 0e39cc6..f379ede 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -524,12 +524,20 @@ defmodule MvWeb.MemberLive.Index do # Pushes URL with updated field selection defp push_field_selection_url(socket) do - query_params = - build_query_params(socket, %{ - "sort_field" => field_to_string(socket.assigns.sort_field), - "sort_order" => Atom.to_string(socket.assigns.sort_order) - }) + base_params = %{ + "sort_field" => field_to_string(socket.assigns.sort_field), + "sort_order" => Atom.to_string(socket.assigns.sort_order) + } + # Include paid_filter if set + base_params = + case socket.assigns.paid_filter do + nil -> base_params + :paid -> Map.put(base_params, "paid_filter", "paid") + :not_paid -> Map.put(base_params, "paid_filter", "not_paid") + end + + query_params = build_query_params(socket, base_params) new_path = ~p"/members?#{query_params}" push_patch(socket, to: new_path, replace: true) From 6cf955b02437dcafc4e88129a4d0190850f2315d Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:37:51 +0100 Subject: [PATCH 28/35] fix: get_from_cookie now correctly handles list return from get_req_header --- .../live/member_live/index/field_selection.ex | 10 +++--- .../index/field_selection_test.exs | 32 ++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/lib/mv_web/live/member_live/index/field_selection.ex b/lib/mv_web/live/member_live/index/field_selection.ex index d3e3acc..1e77b09 100644 --- a/lib/mv_web/live/member_live/index/field_selection.ex +++ b/lib/mv_web/live/member_live/index/field_selection.ex @@ -69,17 +69,17 @@ defmodule MvWeb.MemberLive.Index.FieldSelection do Returns a map of field names (strings) to boolean visibility values. Returns empty map if no cookie is present. - Note: This function requires the connection to have cookies parsed. - In LiveView, cookies are typically accessed via get_connect_info. + Note: This function parses the raw Cookie header. In LiveView, cookies + are typically accessed via get_connect_info. """ @spec get_from_cookie(Plug.Conn.t()) :: %{String.t() => boolean()} def get_from_cookie(conn) do + # get_req_header always returns a list ([] if no header, [value] if present) case Plug.Conn.get_req_header(conn, "cookie") do - nil -> + [] -> %{} - cookie_header -> - # Parse cookies manually from header + [cookie_header | _rest] -> cookies = parse_cookie_header(cookie_header) case Map.get(cookies, @cookie_name) do diff --git a/test/mv_web/live/member_live/index/field_selection_test.exs b/test/mv_web/live/member_live/index/field_selection_test.exs index 8ab9389..9d6aa77 100644 --- a/test/mv_web/live/member_live/index/field_selection_test.exs +++ b/test/mv_web/live/member_live/index/field_selection_test.exs @@ -93,7 +93,15 @@ defmodule MvWeb.MemberLive.Index.FieldSelectionTest do end describe "get_from_cookie/1" do - test "returns empty map when cookie is missing" do + test "returns empty map when cookie header is missing" do + conn = %Plug.Conn{} + + result = FieldSelection.get_from_cookie(conn) + + assert result == %{} + end + + test "returns empty map when cookie is empty string" do conn = Plug.Conn.put_req_header(%Plug.Conn{}, "cookie", "") result = FieldSelection.get_from_cookie(conn) @@ -101,6 +109,17 @@ defmodule MvWeb.MemberLive.Index.FieldSelectionTest do assert result == %{} end + test "parses valid JSON from cookie" do + selection = %{"first_name" => true, "email" => false} + cookie_value = selection |> Jason.encode!() |> URI.encode() + cookie_header = "member_field_selection=#{cookie_value}" + conn = %Plug.Conn{} |> Plug.Conn.put_req_header("cookie", cookie_header) + + result = FieldSelection.get_from_cookie(conn) + + assert result == selection + end + test "handles invalid JSON in cookie gracefully" do cookie_value = URI.encode("invalid{[") cookie_header = "member_field_selection=#{cookie_value}" @@ -110,6 +129,17 @@ defmodule MvWeb.MemberLive.Index.FieldSelectionTest do assert result == %{} end + + test "handles cookie with other values" do + selection = %{"street" => true} + cookie_value = selection |> Jason.encode!() |> URI.encode() + cookie_header = "other_cookie=value; member_field_selection=#{cookie_value}; another=test" + conn = %Plug.Conn{} |> Plug.Conn.put_req_header("cookie", cookie_header) + + result = FieldSelection.get_from_cookie(conn) + + assert result == selection + end end describe "save_to_cookie/2" do From 6029920c3fd1647bdedff9f12b527ae290992a19 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:42:49 +0100 Subject: [PATCH 29/35] refactor: cleanup dropdown_menu component (required attr, remove redundant defaults, fix checkbox) --- lib/mv_web/components/core_components.ex | 33 +++++-------------- .../index_field_visibility_test.exs | 28 +--------------- 2 files changed, 10 insertions(+), 51 deletions(-) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index 3804505..be64655 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -124,7 +124,7 @@ defmodule MvWeb.CoreComponents do ## Examples - <.dropdown_menu items={@items} open={@open} phx-target={@myself} /> + <.dropdown_menu items={@items} open={@open} phx_target={@myself} /> """ attr :id, :string, default: "dropdown-menu" attr :items, :list, required: true, doc: "List of %{label: string, value: any} maps" @@ -134,24 +134,9 @@ defmodule MvWeb.CoreComponents do attr :selected, :map, default: %{} attr :open, :boolean, default: false, doc: "Whether the dropdown is open" attr :show_select_buttons, :boolean, default: false, doc: "Show select all/none buttons" - attr :phx_target, :any, default: nil + attr :phx_target, :any, required: true, doc: "The LiveView/LiveComponent target for events" def dropdown_menu(assigns) do - unless Map.has_key?(assigns, :phx_target) do - raise ArgumentError, ":phx_target is required in dropdown_menu/1" - end - - assigns = - assign_new(assigns, :items, fn -> [] end) - |> assign_new(:button_label, fn -> "Dropdown" end) - |> assign_new(:icon, fn -> nil end) - |> assign_new(:checkboxes, fn -> false end) - |> assign_new(:selected, fn -> %{} end) - |> assign_new(:open, fn -> false end) - |> assign_new(:show_select_buttons, fn -> false end) - |> assign(:phx_target, assigns.phx_target) - |> assign_new(:id, fn -> "dropdown-menu" end) - ~H"""
    <%= if @checkboxes do %> - + /> <% end %> {item.label} diff --git a/test/mv_web/member_live/index_field_visibility_test.exs b/test/mv_web/member_live/index_field_visibility_test.exs index 70128fc..6e1642a 100644 --- a/test/mv_web/member_live/index_field_visibility_test.exs +++ b/test/mv_web/member_live/index_field_visibility_test.exs @@ -420,7 +420,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do assert html =~ ~s(tabindex="0") # Check that keyboard events are supported assert html =~ ~s(phx-keydown="select_item") - assert html =~ ~s(phx-key="Enter Space") + assert html =~ ~s(phx-key="Enter") end test "keyboard activation with Enter key works", %{conn: conn} do @@ -448,31 +448,5 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do html = render(view) refute html =~ "alice@example.com" end - - test "keyboard activation with Space key works", %{conn: conn} do - conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members") - - # Verify email is visible initially - html = render(view) - assert html =~ "alice@example.com" - - # Open dropdown - view - |> element("button[aria-controls='field-visibility-menu']") - |> render_click() - - # Simulate Space key press on email field button - view - |> element("button[phx-click='select_item'][phx-value-item='email']") - |> render_keydown(%{key: " "}) - - # Wait for update - :timer.sleep(100) - - # Email should no longer be visible - html = render(view) - refute html =~ "alice@example.com" - end end end From fabfe64468eb4dce9f90671cc8f904744cd257ea Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:44:17 +0100 Subject: [PATCH 30/35] refactor: rename custom_fields/member_fields to extract_*_field_keys for clarity --- .../field_visibility_dropdown_component.ex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mv_web/live/components/field_visibility_dropdown_component.ex b/lib/mv_web/live/components/field_visibility_dropdown_component.ex index f2dfad9..574262c 100644 --- a/lib/mv_web/live/components/field_visibility_dropdown_component.ex +++ b/lib/mv_web/live/components/field_visibility_dropdown_component.ex @@ -45,13 +45,13 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do custom_fields = assigns.custom_fields || [] all_items = - Enum.map(member_fields(all_fields), fn field -> + Enum.map(extract_member_field_keys(all_fields), fn field -> %{ value: field_to_string(field), label: format_field_label(field) } end) ++ - Enum.map(custom_fields(all_fields), fn field -> + Enum.map(extract_custom_field_keys(all_fields), fn field -> %{ value: field, label: format_custom_field_label(field, custom_fields) @@ -128,18 +128,18 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do # HELPERS (with defensive nil guards) # --------------------------------------------------------------------------- - defp member_fields(nil), do: [] + defp extract_member_field_keys(nil), do: [] - defp member_fields(fields) do + defp extract_member_field_keys(fields) do Enum.filter(fields, fn field -> is_atom(field) || (is_binary(field) && not String.starts_with?(field, "custom_field_")) end) end - defp custom_fields(nil), do: [] + defp extract_custom_field_keys(nil), do: [] - defp custom_fields(fields) do + defp extract_custom_field_keys(fields) do Enum.filter(fields, fn field -> is_binary(field) && String.starts_with?(field, "custom_field_") end) From cf6a1080492d89b1746fbfa0f8f9fdc297b1f63d Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 3 Dec 2025 18:47:27 +0100 Subject: [PATCH 31/35] refactor: DRY - use Mv.Constants.custom_field_prefix() instead of string literals --- lib/mv/constants.ex | 12 ++++++++++++ .../field_visibility_dropdown_component.ex | 10 +++++++--- lib/mv_web/live/member_live/index.ex | 4 ++-- .../live/member_live/index/field_visibility.ex | 10 +++++++--- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex index 334bcc1..7bfb07b 100644 --- a/lib/mv/constants.ex +++ b/lib/mv/constants.ex @@ -18,5 +18,17 @@ defmodule Mv.Constants do :postal_code ] + @custom_field_prefix "custom_field_" + def member_fields, do: @member_fields + + @doc """ + Returns the prefix used for custom field keys in field visibility maps. + + ## Examples + + iex> Mv.Constants.custom_field_prefix() + "custom_field_" + """ + def custom_field_prefix, do: @custom_field_prefix end diff --git a/lib/mv_web/live/components/field_visibility_dropdown_component.ex b/lib/mv_web/live/components/field_visibility_dropdown_component.ex index 574262c..642273c 100644 --- a/lib/mv_web/live/components/field_visibility_dropdown_component.ex +++ b/lib/mv_web/live/components/field_visibility_dropdown_component.ex @@ -131,17 +131,21 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do defp extract_member_field_keys(nil), do: [] defp extract_member_field_keys(fields) do + prefix = Mv.Constants.custom_field_prefix() + Enum.filter(fields, fn field -> is_atom(field) || - (is_binary(field) && not String.starts_with?(field, "custom_field_")) + (is_binary(field) && not String.starts_with?(field, prefix)) end) end defp extract_custom_field_keys(nil), do: [] defp extract_custom_field_keys(fields) do + prefix = Mv.Constants.custom_field_prefix() + Enum.filter(fields, fn field -> - is_binary(field) && String.starts_with?(field, "custom_field_") + is_binary(field) && String.starts_with?(field, prefix) end) end @@ -157,7 +161,7 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do end defp format_custom_field_label(field_string, custom_fields) do - id = String.trim_leading(field_string, "custom_field_") + id = String.trim_leading(field_string, Mv.Constants.custom_field_prefix()) find_custom_field_name(id, field_string, custom_fields) end diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index f379ede..ad4a4a9 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -37,7 +37,7 @@ defmodule MvWeb.MemberLive.Index do alias MvWeb.MemberLive.Index.FieldVisibility # Prefix used in sort field names for custom fields (e.g., "custom_field_") - @custom_field_prefix "custom_field_" + @custom_field_prefix Mv.Constants.custom_field_prefix() # Member fields that are loaded for the overview # Uses constants from Mv.Constants to ensure consistency @@ -796,7 +796,7 @@ defmodule MvWeb.MemberLive.Index do # Format: "custom_field_" -> defp extract_custom_field_ids(visible_custom_fields) do Enum.map(visible_custom_fields, fn field_string -> - case String.split(field_string, "custom_field_") do + case String.split(field_string, @custom_field_prefix) do ["", id] -> id _ -> nil end diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex index 8dd36fc..c9c8bd6 100644 --- a/lib/mv_web/live/member_live/index/field_visibility.ex +++ b/lib/mv_web/live/member_live/index/field_visibility.ex @@ -155,9 +155,11 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do """ @spec get_visible_custom_fields(%{String.t() => boolean()}) :: [String.t()] def get_visible_custom_fields(field_selection) when is_map(field_selection) do + prefix = Mv.Constants.custom_field_prefix() + field_selection |> Enum.filter(fn {field_string, visible} -> - visible && String.starts_with?(field_string, "custom_field_") + visible && String.starts_with?(field_string, prefix) end) |> Enum.map(fn {field_string, _visible} -> field_string end) end @@ -188,8 +190,10 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do # Gets custom field visibility (all custom fields with show_in_overview=true are visible) defp get_custom_field_visibility(custom_fields) do + prefix = Mv.Constants.custom_field_prefix() + Enum.reduce(custom_fields, %{}, fn custom_field, acc -> - field_string = "custom_field_#{custom_field.id}" + field_string = "#{prefix}#{custom_field.id}" visible = Map.get(custom_field, :show_in_overview, true) Map.put(acc, field_string, visible) end) @@ -218,7 +222,7 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do # Converts field string to atom (for member fields) or keeps as string (for custom fields) defp to_field_identifier(field_string) when is_binary(field_string) do - if String.starts_with?(field_string, "custom_field_") do + if String.starts_with?(field_string, Mv.Constants.custom_field_prefix()) do field_string else try do From f0391d3fefeba5353edccea81cbcfdcd4914ef9c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Dec 2025 20:34:33 +0100 Subject: [PATCH 32/35] fix: oidc with authentik not working --- README.md | 31 +++++++++++++++++++++++++------ config/runtime.exs | 19 +++++++++++++++---- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 14435db..090f4e9 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Our philosophy: **software should help people spend less time on administration - 🚧 Sorting & filtering - 🚧 Roles & permissions (e.g. board, treasurer) - ✅ Custom fields (flexible per club needs) -- ✅ SSO via OIDC (tested with Rauthy) +- ✅ SSO via OIDC (works with Authentik, Rauthy, Keycloak, etc.) - 🚧 Self-service & online application - 🚧 Accessibility, GDPR, usability improvements - 🚧 Email sending @@ -147,7 +147,26 @@ Mila uses OIDC for Single Sign-On. In development, a local **Rauthy** instance i 5. copy client secret to `.env` file 6. abort and run `just run` again -Now you can log in to Mila via OIDC! +Now you can log in to Mila via OIDC! + +### OIDC with other providers (Authentik, Keycloak, etc.) + +Mila works with any OIDC-compliant provider. The internal strategy is named `:rauthy`, but this is just a name — it works with any provider. + +**Important:** The redirect URI must always end with `/auth/user/rauthy/callback`. + +Example for Authentik: +1. Create an OAuth2/OpenID Provider in Authentik +2. Set the redirect URI to: `https://your-domain.com/auth/user/rauthy/callback` +3. Configure environment variables: + ```bash + DOMAIN=your-domain.com # or PHX_HOST=your-domain.com + OIDC_CLIENT_ID=your-client-id + OIDC_BASE_URL=https://auth.example.com/application/o/your-app + OIDC_CLIENT_SECRET=your-client-secret # or use OIDC_CLIENT_SECRET_FILE + ``` + +The `OIDC_REDIRECT_URI` is auto-generated as `https://{DOMAIN}/auth/user/rauthy/callback` if not explicitly set. ## ⚙️ Configuration @@ -210,13 +229,13 @@ For testing the production Docker build locally: # Required variables: SECRET_KEY_BASE= TOKEN_SIGNING_SECRET= - PHX_HOST=localhost + DOMAIN=localhost # or PHX_HOST=localhost - # Optional (have defaults in docker-compose.prod.yml): + # Optional OIDC configuration: # OIDC_CLIENT_ID=mv # OIDC_BASE_URL=http://localhost:8080/auth/v1 - # OIDC_REDIRECT_URI=http://localhost:4001/auth/user/rauthy/callback - # OIDC_CLIENT_SECRET= + # OIDC_CLIENT_SECRET= + # OIDC_REDIRECT_URI is auto-generated as https://{DOMAIN}/auth/user/rauthy/callback # Alternative: Use _FILE variables for Docker secrets (takes priority over regular vars): # SECRET_KEY_BASE_FILE=/run/secrets/secret_key_base diff --git a/config/runtime.exs b/config/runtime.exs index 71138ef..765a884 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -112,12 +112,20 @@ if config_env() == :prod do You can generate one by calling: mix phx.gen.secret """) - host = System.get_env("PHX_HOST") || raise "Please define the PHX_HOST environment variable." + # PHX_HOST or DOMAIN can be used to set the host for the application. + # DOMAIN is commonly used in deployment environments (e.g., Portainer templates). + host = + System.get_env("PHX_HOST") || + System.get_env("DOMAIN") || + raise "Please define the PHX_HOST or DOMAIN environment variable." port = String.to_integer(System.get_env("PORT") || "4000") config :mv, :dns_cluster_query, System.get_env("DNS_CLUSTER_QUERY") - # Rauthy OIDC configuration + # OIDC configuration (works with any OIDC provider: Authentik, Rauthy, Keycloak, etc.) + # Note: The strategy is named :rauthy internally, but works with any OIDC provider. + # The redirect_uri callback path is always /auth/user/rauthy/callback regardless of provider. + # # Supports OIDC_CLIENT_SECRET or OIDC_CLIENT_SECRET_FILE for Docker secrets. # OIDC_CLIENT_SECRET is required only if OIDC is being used (indicated by explicit OIDC env vars). oidc_base_url = System.get_env("OIDC_BASE_URL") @@ -134,12 +142,15 @@ if config_env() == :prod do get_env_or_file.("OIDC_CLIENT_SECRET", nil) end + # Build redirect_uri: use OIDC_REDIRECT_URI if set, otherwise build from host. + # Uses HTTPS since production runs behind TLS termination. + default_redirect_uri = "https://#{host}/auth/user/rauthy/callback" + config :mv, :rauthy, client_id: oidc_client_id || "mv", base_url: oidc_base_url || "http://localhost:8080/auth/v1", client_secret: client_secret, - redirect_uri: - System.get_env("OIDC_REDIRECT_URI") || "http://#{host}:#{port}/auth/user/rauthy/callback" + redirect_uri: System.get_env("OIDC_REDIRECT_URI") || default_redirect_uri # Token signing secret from environment variable # This overrides the placeholder value set in prod.exs From e03693ada541982ab2670920a9ebeed20f55adf1 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Dec 2025 20:51:26 +0100 Subject: [PATCH 33/35] style: fix formatting --- config/runtime.exs | 1 + 1 file changed, 1 insertion(+) diff --git a/config/runtime.exs b/config/runtime.exs index 765a884..06a2cd8 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -118,6 +118,7 @@ if config_env() == :prod do System.get_env("PHX_HOST") || System.get_env("DOMAIN") || raise "Please define the PHX_HOST or DOMAIN environment variable." + port = String.to_integer(System.get_env("PORT") || "4000") config :mv, :dns_cluster_query, System.get_env("DNS_CLUSTER_QUERY") From 613a5f2643a8b404098b0c28a10a03d8daa98869 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Dec 2025 21:51:12 +0100 Subject: [PATCH 34/35] feat: support email scope to retrieve oidc info --- lib/accounts/user.ex | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index 749740d..3b7e80b 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -69,7 +69,7 @@ defmodule Mv.Accounts.User do # Default actions for framework/tooling integration: # - :read -> Standard read used across the app and by admin tooling. # - :destroy-> Standard delete used by admin tooling and maintenance tasks. - # + # # NOTE: :create is INTENTIONALLY excluded from defaults! # Using a default :create would bypass email-synchronization logic. # Always use one of these explicit create actions instead: @@ -185,7 +185,9 @@ defmodule Mv.Accounts.User do oidc_user_info = Ash.Changeset.get_argument(changeset, :oidc_user_info) # Get the new email from OIDC user_info - new_email = Map.get(oidc_user_info, "preferred_username") + # Support both "email" (standard OIDC) and "preferred_username" (Rauthy) + new_email = + Map.get(oidc_user_info, "email") || Map.get(oidc_user_info, "preferred_username") changeset |> Ash.Changeset.change_attribute(:oidc_id, oidc_id) @@ -239,8 +241,11 @@ defmodule Mv.Accounts.User do change fn changeset, _ctx -> user_info = Ash.Changeset.get_argument(changeset, :user_info) + # Support both "email" (standard OIDC like Authentik, Keycloak) and "preferred_username" (Rauthy) + email = user_info["email"] || user_info["preferred_username"] + changeset - |> Ash.Changeset.change_attribute(:email, user_info["preferred_username"]) + |> Ash.Changeset.change_attribute(:email, email) |> Ash.Changeset.change_attribute(:oidc_id, user_info["sub"] || user_info["id"]) end From 9cda832b82bf79307e65d293860f9ba5ad531e0b Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 3 Dec 2025 22:02:23 +0100 Subject: [PATCH 35/35] fix: request scopes email and profile --- lib/accounts/user.ex | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index 3b7e80b..dbc62b2 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -54,6 +54,9 @@ defmodule Mv.Accounts.User do auth_method :client_secret_jwt code_verifier true + # Request email and profile scopes from OIDC provider (required for Authentik, Keycloak, etc.) + authorization_params scope: "openid email profile" + # id_token_signed_response_alg "EdDSA" #-> https://git.local-it.org/local-it/mitgliederverwaltung/issues/87 end