From cf957563bb8295ae0bc2946860ac752242358b6b Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 08:45:18 +0100 Subject: [PATCH 01/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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 e2ace3d2a8b53fb87b67f083f1e83cdfaa782463 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 2 Dec 2025 10:02:58 +0100 Subject: [PATCH 07/17] feat: add bulk email copy for selected members (#230) Copy selected members' emails to clipboard in 'First Last ' format --- CHANGELOG.md | 6 + assets/js/app.js | 27 +++ docs/development-progress-log.md | 31 ++- docs/feature-roadmap.md | 1 + email-copy-feature.plan.md | 235 ++++++++++++++++++++ lib/mv_web/live/member_live/index.ex | 62 ++++++ lib/mv_web/live/member_live/index.html.heex | 10 + priv/gettext/de/LC_MESSAGES/default.po | 64 ++++-- priv/gettext/default.pot | 61 +++-- priv/gettext/en/LC_MESSAGES/default.po | 64 ++++-- test/mv_web/member_live/index_test.exs | 161 ++++++++++++++ 11 files changed, 661 insertions(+), 61 deletions(-) create mode 100644 email-copy-feature.plan.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 74df997..71d9147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - PostgreSQL trigram-based member search with typo tolerance - WCAG 2.1 AA compliant autocomplete dropdown with ARIA support - Bilingual UI (German/English) for member linking workflow +- **Bulk email copy feature** - Copy email addresses of selected members to clipboard (#230) + - Email format: "First Last " with semicolon separator (compatible with email clients) + - CopyToClipboard JavaScript hook with fallback for older browsers + - Button shows count of visible selected members (respects search/filter) + - German/English translations ### Fixed - Email validation false positive when linking user and member with identical emails (#168 Problem #4) - Relationship data extraction from Ash manage_relationship during validation +- Copy button count now shows only visible selected members when filtering diff --git a/assets/js/app.js b/assets/js/app.js index e55a06d..883ca30 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -27,6 +27,33 @@ let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute(" // Hooks for LiveView components let Hooks = {} +// CopyToClipboard hook: Copies text to clipboard when triggered by server event +Hooks.CopyToClipboard = { + mounted() { + this.handleEvent("copy_to_clipboard", ({text}) => { + if (navigator.clipboard) { + navigator.clipboard.writeText(text).catch(err => { + console.error("Clipboard write failed:", err) + }) + } else { + // Fallback for older browsers + const textArea = document.createElement("textarea") + textArea.value = text + textArea.style.position = "fixed" + textArea.style.left = "-999999px" + document.body.appendChild(textArea) + textArea.select() + try { + document.execCommand("copy") + } catch (err) { + console.error("Fallback clipboard copy failed:", err) + } + document.body.removeChild(textArea) + } + }) + } +} + // ComboBox hook: Prevents form submission when Enter is pressed in dropdown Hooks.ComboBox = { mounted() { diff --git a/docs/development-progress-log.md b/docs/development-progress-log.md index 5669a19..629987e 100644 --- a/docs/development-progress-log.md +++ b/docs/development-progress-log.md @@ -1327,6 +1327,33 @@ end --- +## Session: Bulk Email Copy Feature (2025-12-02) + +### Feature Summary +Implemented bulk email copy functionality for selected members (#230). Users can select members and copy their email addresses to clipboard. + +**Key Features:** +- Copy button appears only when visible members are selected +- Email format: `First Last ` with semicolon separator (email client compatible) +- Button shows count of visible selected members (respects search/filter) +- CopyToClipboard JavaScript hook with clipboard API + fallback for older browsers +- Bilingual UI (English/German) + +### Key Decisions + +1. **Email Format:** "First Last " with semicolon - standard for all major email clients +2. **Visible Member Count:** Button shows only visible selected members, not total selected (better UX when filtering) +3. **Server→Client:** Used `push_event/3` - server formats data, client handles clipboard + +### Files Changed +- `lib/mv_web/live/member_live/index.ex` - Event handler, helper function +- `lib/mv_web/live/member_live/index.html.heex` - Copy button +- `assets/js/app.js` - CopyToClipboard hook +- `test/mv_web/member_live/index_test.exs` - 9 new tests +- `priv/gettext/de/LC_MESSAGES/default.po` - German translations + +--- + ## Session: User-Member Linking UI Enhancement (2025-01-13) ### Feature Summary @@ -1559,8 +1586,8 @@ This project demonstrates a modern Phoenix application built with: --- -**Document Version:** 1.2 -**Last Updated:** 2025-11-27 +**Document Version:** 1.3 +**Last Updated:** 2025-12-02 **Maintainer:** Development Team **Status:** Living Document (update as project evolves) diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md index 2313fd7..60432d0 100644 --- a/docs/feature-roadmap.md +++ b/docs/feature-roadmap.md @@ -65,6 +65,7 @@ - ✅ Sorting by basic fields - ✅ User-Member linking (optional 1:1) - ✅ Email synchronization between User and Member +- ✅ **Bulk email copy** - Copy selected members' email addresses to clipboard (Issue #230) **Closed Issues:** - ✅ [#162](https://git.local-it.org/local-it/mitgliederverwaltung/issues/162) - Fuzzy and substring search (closed 2025-11-12) diff --git a/email-copy-feature.plan.md b/email-copy-feature.plan.md new file mode 100644 index 0000000..7895798 --- /dev/null +++ b/email-copy-feature.plan.md @@ -0,0 +1,235 @@ +# Bulk Email Copy Feature - Detaillierter Implementierungsplan + +## Aktueller Stand + +Die Checkbox-Funktionalität existiert bereits vollständig: + +- `select_member` und `select_all` Events in [`lib/mv_web/live/member_live/index.ex`](lib/mv_web/live/member_live/index.ex) (Zeilen 91-117) +- Checkboxen im Template [`lib/mv_web/live/member_live/index.html.heex`](lib/mv_web/live/member_live/index.html.heex) (Zeilen 28-54) +- `@selected_members` enthält die UUIDs der ausgewählten Mitglieder als Liste + +## Gewählte Implementierung: JavaScript Hook mit LiveView Event + +**Ablauf:** + +1. User wählt Mitglieder über Checkboxen aus +2. User klickt "E-Mail-Adressen kopieren" Button +3. LiveView Event `copy_emails` wird ausgelöst +4. Server filtert Member aus `@members` nach `@selected_members` +5. Server formatiert E-Mails im Format `Vorname Nachname ` +6. Server pusht `copy_to_clipboard` Event mit formatiertem String an Client +7. JavaScript Hook empfängt Event und kopiert via `navigator.clipboard.writeText()` +8. Server zeigt Flash-Nachricht mit Erfolgsbestätigung + +--- + +## Implementierungsschritte + +### Schritt 1: JavaScript Hook erstellen + +**Datei:** `assets/js/app.js` + +- Neuen Hook `CopyToClipboard` zum bestehenden `Hooks` Objekt hinzufügen +- Hook lauscht auf `copy_to_clipboard` Event vom Server +- Nutzt `navigator.clipboard.writeText()` API für das Kopieren +- Fallback-Behandlung für Browser ohne Clipboard API (ältere Browser) +- Fehlerbehandlung bei fehlgeschlagenem Kopieren + +### Schritt 2: LiveView Event Handler implementieren + +**Datei:** `lib/mv_web/live/member_live/index.ex` + +- Neuen `handle_event("copy_emails", ...)` Callback hinzufügen +- Member aus `@members` filtern, deren ID in `@selected_members` enthalten ist +- Jeden Member im Format `"Vorname Nachname "` formatieren +- Formatierte Strings mit `"; "` (Semikolon + Leerzeichen) verbinden +- `push_event/3` nutzen um `copy_to_clipboard` Event zu senden +- `put_flash/3` für Erfolgsbestätigung mit Anzahl der kopierten Adressen +- Private Helper-Funktion für die E-Mail-Formatierung + +### Schritt 3: UI Button hinzufügen + +**Datei:** `lib/mv_web/live/member_live/index.html.heex` + +- Button im Header-Bereich neben "New Member" Button platzieren +- Button nur anzeigen wenn mindestens ein Mitglied ausgewählt ist (`:if` Bedingung) +- `phx-hook="CopyToClipboard"` Attribut für JavaScript Hook Anbindung +- `phx-click="copy_emails"` für Event-Auslösung +- Icon: `hero-clipboard-document` oder `hero-envelope` +- Button-Text mit Anzahl der ausgewählten Mitglieder anzeigen +- Accessibility: `aria-label` für Screen Reader + +### Schritt 4: Gettext Übersetzungen hinzufügen + +**Dateien:** + +- `priv/gettext/default.pot` - Template aktualisieren via `mix gettext.extract` +- `priv/gettext/de/LC_MESSAGES/default.po` - Deutsche Übersetzungen +- `priv/gettext/en/LC_MESSAGES/default.po` - Englische Übersetzungen (falls vorhanden) + +**Zu übersetzende Strings:** + +- Button-Text: "Copy Email Addresses" +- Flash-Nachricht Erfolg: "Copied %{count} email address(es) to clipboard" +- Flash-Nachricht Fehler: "No members selected" + +### Schritt 5: Moduledoc aktualisieren + +**Datei:** `lib/mv_web/live/member_live/index.ex` + +- `@moduledoc` um neues Event `copy_emails` erweitern +- Dokumentation der Funktionalität hinzufügen + +--- + +## Edge Cases + +### E1: Keine Mitglieder ausgewählt + +- Button wird nicht angezeigt (UI-seitig gelöst) +- Falls Event dennoch ausgelöst wird: Error-Flash anzeigen, nichts kopieren + +### E2: Ausgewählte Mitglieder nicht mehr in `@members` Liste + +- Kann passieren wenn Member zwischenzeitlich gelöscht wurde +- Nur vorhandene Member verarbeiten, keine Fehler werfen +- Flash zeigt tatsächliche Anzahl kopierter Adressen + +### E3: Member ohne E-Mail-Adresse + +- Defensive Programmierung: Member ohne E-Mail überspringen + +### E4: Member mit leerem Vor- oder Nachnamen + +- Defensive Programmierung: Leere Namen graceful behandeln + +### E5: Sonderzeichen in Namen + +- Namen können Umlaute, Akzente, etc. enthalten +- Keine Escaping nötig, da Text direkt in Zwischenablage kopiert wird +- E-Mail-Clients verarbeiten Unicode korrekt + +### E6: Sehr lange Liste (100+ Mitglieder) + +- String kann sehr lang werden +- Clipboard API hat kein praktisches Limit +- Kein spezielles Handling nötig + +### E7: Browser unterstützt Clipboard API nicht + +- `navigator.clipboard` ist nicht in allen Browsern verfügbar +- Fallback: `document.execCommand('copy')` (deprecated aber breit unterstützt) +- Oder: Fehler-Flash anzeigen + +### E8: Clipboard-Zugriff vom Browser blockiert + +- Moderne Browser können Clipboard-Zugriff einschränken +- HTTPS erforderlich (in Produktion gegeben) +- User muss ggf. Berechtigung erteilen +- Fehlerbehandlung im Hook nötig + +### E9: Parallel laufende Suche/Filter ändert `@members` + +- User wählt Mitglieder, dann ändert Suche die Liste +- `@selected_members` bleibt erhalten, aber IDs passen nicht mehr zu `@members` +- Nur noch vorhandene (angezeigte) Members werden kopiert +- Entscheidung: Selection bei Suche beibehalten? + +### E10: "Select All" nach Filterung + +- Wenn gefiltert und "Select All" geklickt, werden nur sichtbare Members ausgewählt +- Bestehendes Verhalten, kein neues Problem + +--- + +## Testplan + +### Unit Tests (index.ex) + +**T1: copy_emails Event - Erfolgsfall** + +- Setup: 3 Members in `@members`, 2 davon in `@selected_members` +- Assert: `push_event` wird mit korrektem String aufgerufen +- Assert: Flash-Nachricht mit count=2 + +**T2: copy_emails Event - Keine Auswahl** + +- Setup: `@selected_members` ist leer +- Assert: Kein `push_event` +- Assert: Error-Flash oder keine Aktion + +**T3: copy_emails Event - Alle ausgewählt** + +- Setup: Alle Members in `@selected_members` +- Assert: Alle E-Mails im Output-String + +**T4: E-Mail Formatierung** + +- Assert: Format ist `"Vorname Nachname "` +- Assert: Mehrere E-Mails mit `"; "` getrennt + +**T5: Member mit Sonderzeichen im Namen** + +- Setup: Member mit Name "Müller-Lüdenscheidt" +- Assert: Name wird korrekt übernommen + +**T6: Teilweise nicht vorhandene Member** + +- Setup: `@selected_members` enthält ID die nicht in `@members` ist +- Assert: Nur vorhandene Members werden verarbeitet, kein Crash + +### LiveView Integration Tests + +**T7: Button Sichtbarkeit** + +- Assert: Button nicht sichtbar wenn `@selected_members` leer +- Assert: Button sichtbar wenn mindestens 1 Member ausgewählt + +**T8: Button zeigt korrekte Anzahl** + +- Setup: 3 Members ausgewählt +- Assert: Button-Text enthält "(3)" + +**T9: Click löst Event aus** + +- Action: Click auf Copy-Button +- Assert: `copy_emails` Event wird gesendet + +**T10: Vollständiger Flow** + +- Action: Member auswählen, Button klicken +- Assert: Flash-Nachricht erscheint + +## Zu ändernde Dateien + +| Datei | Änderungstyp | + +|-------|--------------| + +| `assets/js/app.js` | Hook hinzufügen | + +| `lib/mv_web/live/member_live/index.ex` | Event Handler + Helper | + +| `lib/mv_web/live/member_live/index.html.heex` | Button UI | + +| `priv/gettext/de/LC_MESSAGES/default.po` | Übersetzungen | + +| `test/mv_web/member_live/index_test.exs` | Tests | + +--- + +## E-Mail Output Format + +**Einzelne E-Mail:** + +``` +Max Mustermann +``` + +**Mehrere E-Mails:** + +``` +Max Mustermann ; Erika Musterfrau ; Hans Müller +``` + +**Hinweis:** Semikolon als Trennzeichen ist Standard für E-Mail-Clients (Outlook, Thunderbird, etc.) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 85ee4fb..3087d7e 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -18,6 +18,7 @@ defmodule MvWeb.MemberLive.Index do - `delete` - Remove a member from the database - `select_member` - Toggle individual member selection - `select_all` - Toggle selection of all visible members + - `copy_emails` - Copy email addresses of selected members to clipboard ## Implementation Notes - Search uses PostgreSQL full-text search (plainto_tsquery) @@ -116,6 +117,49 @@ defmodule MvWeb.MemberLive.Index do {:noreply, assign(socket, :selected_members, selected)} end + @impl true + def handle_event("copy_emails", _params, socket) do + selected_ids = socket.assigns.selected_members + + if selected_ids == [] do + {:noreply, put_flash(socket, :error, gettext("No members selected"))} + else + # Filter members that are in the selection + selected_members = + socket.assigns.members + |> Enum.filter(fn member -> member.id in selected_ids end) + + # Format emails and filter out members without email + formatted_emails = + selected_members + |> Enum.filter(fn member -> member.email && member.email != "" end) + |> Enum.map(&format_member_email/1) + + email_count = length(formatted_emails) + + if email_count == 0 do + {:noreply, put_flash(socket, :error, gettext("No email addresses found"))} + else + email_string = Enum.join(formatted_emails, "; ") + + socket = + socket + |> push_event("copy_to_clipboard", %{text: email_string}) + |> put_flash( + :info, + ngettext( + "Copied %{count} email address to clipboard", + "Copied %{count} email addresses to clipboard", + email_count, + count: email_count + ) + ) + + {:noreply, socket} + end + end + end + # ----------------------------------------------------------------- # Handle Infos from Child Components # ----------------------------------------------------------------- @@ -733,4 +777,22 @@ defmodule MvWeb.MemberLive.Index do nil end end + + # Formats a member's email in the format "First Last " + # Used for copy_emails feature to create email-client-friendly format. + defp format_member_email(member) do + first_name = member.first_name || "" + last_name = member.last_name || "" + + name = + [first_name, last_name] + |> Enum.filter(&(&1 != "")) + |> Enum.join(" ") + + if name == "" do + member.email + else + "#{name} <#{member.email}>" + 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..1ab9b3d 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -2,6 +2,16 @@ <.header> {gettext("Members")} <:actions> + <.button + :if={Enum.any?(@members, &(&1.id in @selected_members))} + id="copy-emails-btn" + phx-hook="CopyToClipboard" + phx-click="copy_emails" + aria-label={gettext("Copy email addresses of selected members")} + > + <.icon name="hero-clipboard-document" /> + {gettext("Copy emails")} ({Enum.count(@members, &(&1.id in @selected_members))}) + <.button variant="primary" navigate={~p"/members/new"}> <.icon name="hero-plus" /> {gettext("New Member")} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index e9214fc..d75ec52 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -15,7 +15,7 @@ msgstr "" msgid "Actions" msgstr "Aktionen" -#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/member_live/index.html.heex:212 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" @@ -28,19 +28,19 @@ msgid "Attempting to reconnect" msgstr "Verbindung wird wiederhergestellt" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:148 +#: lib/mv_web/live/member_live/index.html.heex:158 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "Stadt" -#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "Löschen" -#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/member_live/index.html.heex:206 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -54,7 +54,7 @@ msgid "Edit Member" msgstr "Mitglied bearbeiten" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:80 +#: lib/mv_web/live/member_live/index.html.heex:90 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -70,7 +70,7 @@ msgid "First Name" msgstr "Vorname" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:182 +#: lib/mv_web/live/member_live/index.html.heex:192 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -82,12 +82,12 @@ msgstr "Beitrittsdatum" msgid "Last Name" msgstr "Nachname" -#: lib/mv_web/live/member_live/index.html.heex:6 +#: lib/mv_web/live/member_live/index.html.heex:16 #, elixir-autogen, elixir-format msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/member_live/index.html.heex:203 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" @@ -121,7 +121,7 @@ msgid "Exit Date" msgstr "Austrittsdatum" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:114 +#: lib/mv_web/live/member_live/index.html.heex:124 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -140,14 +140,14 @@ msgid "Paid" msgstr "Bezahlt" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:165 +#: lib/mv_web/live/member_live/index.html.heex:175 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "Telefonnummer" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:131 +#: lib/mv_web/live/member_live/index.html.heex:141 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -168,7 +168,7 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:97 +#: lib/mv_web/live/member_live/index.html.heex:107 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -311,7 +311,7 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/live/member_live/index.ex:58 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -365,12 +365,12 @@ msgstr "Profil" msgid "Required" msgstr "Erforderlich" -#: lib/mv_web/live/member_live/index.html.heex:37 +#: lib/mv_web/live/member_live/index.html.heex:47 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "Alle Mitglieder auswählen" -#: lib/mv_web/live/member_live/index.html.heex:51 +#: lib/mv_web/live/member_live/index.html.heex:61 #, elixir-autogen, elixir-format msgid "Select member" msgstr "Mitglied auswählen" @@ -556,7 +556,7 @@ msgid "Toggle dark mode" msgstr "Dunklen Modus umschalten" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:15 +#: lib/mv_web/live/member_live/index.html.heex:25 #, elixir-autogen, elixir-format msgid "Search..." msgstr "Suchen..." @@ -572,7 +572,7 @@ msgstr "Benutzer*innen" msgid "Click to sort" msgstr "Klicke um zu sortieren" -#: lib/mv_web/live/member_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:73 #, elixir-autogen, elixir-format msgid "First name" msgstr "Vorname" @@ -782,7 +782,29 @@ msgstr "Mitglied entverknüpfen" msgid "Unlinking scheduled" msgstr "Entverknüpfung geplant" -#~ #: lib/mv_web/live/custom_field_live/index.ex:97 -#~ #, elixir-autogen, elixir-format -#~ msgid "To confirm deletion, please enter the custom field slug:" -#~ msgstr "Um die Löschung zu bestätigen, gib bitte den Slug des benutzerdefinierten Feldes ein:" +#: lib/mv_web/live/member_live/index.ex:150 +#, elixir-autogen, elixir-format +msgid "Copied %{count} email address to clipboard" +msgid_plural "Copied %{count} email addresses to clipboard" +msgstr[0] "%{count} E-Mail-Adresse in die Zwischenablage kopiert" +msgstr[1] "%{count} E-Mail-Adressen in die Zwischenablage kopiert" + +#: lib/mv_web/live/member_live/index.html.heex:10 +#, elixir-autogen, elixir-format +msgid "Copy email addresses of selected members" +msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren" + +#: lib/mv_web/live/member_live/index.html.heex:13 +#, elixir-autogen, elixir-format +msgid "Copy emails" +msgstr "E-Mails kopieren" + +#: lib/mv_web/live/member_live/index.ex:141 +#, elixir-autogen, elixir-format +msgid "No email addresses found" +msgstr "Keine E-Mail-Adressen gefunden" + +#: lib/mv_web/live/member_live/index.ex:125 +#, elixir-autogen, elixir-format +msgid "No members selected" +msgstr "Keine Mitglieder ausgewählt" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 47fe4dd..ca8bd14 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -16,7 +16,7 @@ msgstr "" msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/member_live/index.html.heex:212 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" @@ -29,19 +29,19 @@ msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:148 +#: lib/mv_web/live/member_live/index.html.heex:158 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/member_live/index.html.heex:206 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -55,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:80 +#: lib/mv_web/live/member_live/index.html.heex:90 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:182 +#: lib/mv_web/live/member_live/index.html.heex:192 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -83,12 +83,12 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:6 +#: lib/mv_web/live/member_live/index.html.heex:16 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/member_live/index.html.heex:203 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" @@ -122,7 +122,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:114 +#: lib/mv_web/live/member_live/index.html.heex:124 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -141,14 +141,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:165 +#: lib/mv_web/live/member_live/index.html.heex:175 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:131 +#: lib/mv_web/live/member_live/index.html.heex:141 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -169,7 +169,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:97 +#: lib/mv_web/live/member_live/index.html.heex:107 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/live/member_live/index.ex:58 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:37 +#: lib/mv_web/live/member_live/index.html.heex:47 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:51 +#: lib/mv_web/live/member_live/index.html.heex:61 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -557,7 +557,7 @@ msgid "Toggle dark mode" msgstr "" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:15 +#: lib/mv_web/live/member_live/index.html.heex:25 #, elixir-autogen, elixir-format msgid "Search..." msgstr "" @@ -573,7 +573,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:73 #, elixir-autogen, elixir-format msgid "First name" msgstr "" @@ -782,3 +782,30 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Unlinking scheduled" msgstr "" + +#: lib/mv_web/live/member_live/index.ex:150 +#, elixir-autogen, elixir-format +msgid "Copied %{count} email address to clipboard" +msgid_plural "Copied %{count} email addresses to clipboard" +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/member_live/index.html.heex:10 +#, elixir-autogen, elixir-format +msgid "Copy email addresses of selected members" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:13 +#, elixir-autogen, elixir-format +msgid "Copy emails" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:141 +#, elixir-autogen, elixir-format +msgid "No email addresses found" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:125 +#, elixir-autogen, elixir-format +msgid "No members selected" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index a9e59e8..e9158d9 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -16,7 +16,7 @@ msgstr "" msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/member_live/index.html.heex:212 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" @@ -29,19 +29,19 @@ msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:148 +#: lib/mv_web/live/member_live/index.html.heex:158 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/member_live/index.html.heex:206 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -55,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:80 +#: lib/mv_web/live/member_live/index.html.heex:90 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:182 +#: lib/mv_web/live/member_live/index.html.heex:192 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -83,12 +83,12 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:6 +#: lib/mv_web/live/member_live/index.html.heex:16 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/member_live/index.html.heex:203 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" @@ -122,7 +122,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:114 +#: lib/mv_web/live/member_live/index.html.heex:124 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -141,14 +141,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:165 +#: lib/mv_web/live/member_live/index.html.heex:175 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:131 +#: lib/mv_web/live/member_live/index.html.heex:141 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -169,7 +169,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:97 +#: lib/mv_web/live/member_live/index.html.heex:107 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/live/member_live/index.ex:58 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:37 +#: lib/mv_web/live/member_live/index.html.heex:47 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:51 +#: lib/mv_web/live/member_live/index.html.heex:61 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -557,7 +557,7 @@ msgid "Toggle dark mode" msgstr "" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:15 +#: lib/mv_web/live/member_live/index.html.heex:25 #, elixir-autogen, elixir-format msgid "Search..." msgstr "" @@ -573,7 +573,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:73 #, elixir-autogen, elixir-format, fuzzy msgid "First name" msgstr "" @@ -783,7 +783,29 @@ msgstr "" msgid "Unlinking scheduled" msgstr "" -#~ #: lib/mv_web/live/custom_field_live/index.ex:97 -#~ #, elixir-autogen, elixir-format -#~ msgid "To confirm deletion, please enter the custom field slug:" -#~ msgstr "" +#: lib/mv_web/live/member_live/index.ex:150 +#, elixir-autogen, elixir-format +msgid "Copied %{count} email address to clipboard" +msgid_plural "Copied %{count} email addresses to clipboard" +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/member_live/index.html.heex:10 +#, elixir-autogen, elixir-format +msgid "Copy email addresses of selected members" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:13 +#, elixir-autogen, elixir-format +msgid "Copy emails" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:141 +#, elixir-autogen, elixir-format +msgid "No email addresses found" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:125 +#, elixir-autogen, elixir-format, fuzzy +msgid "No members selected" +msgstr "" diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index 0668202..6e91b4c 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -249,4 +249,165 @@ defmodule MvWeb.MemberLive.IndexTest do # Verify the member was actually deleted from the database assert not (Mv.Membership.Member |> Ash.Query.filter(id == ^member.id) |> Ash.exists?()) end + + describe "copy_emails feature" do + setup do + # Create test members + {:ok, member1} = + Mv.Membership.create_member(%{ + first_name: "Max", + last_name: "Mustermann", + email: "max@example.com" + }) + + {:ok, member2} = + Mv.Membership.create_member(%{ + first_name: "Erika", + last_name: "Musterfrau", + email: "erika@example.com" + }) + + {:ok, member3} = + Mv.Membership.create_member(%{ + first_name: "Hans", + last_name: "Müller-Lüdenscheidt", + email: "hans@example.com" + }) + + %{member1: member1, member2: member2, member3: member3} + end + + test "copy_emails event formats selected members correctly", %{ + conn: conn, + member1: member1, + member2: member2 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select two members + view + |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") + |> render_click() + + view + |> element("[phx-click='select_member'][phx-value-id='#{member2.id}']") + |> render_click() + + # Trigger copy_emails event + view |> element("#copy-emails-btn") |> render_click() + + # Verify flash message shows correct count + assert render(view) =~ "2" + end + + test "copy_emails event with no selection shows error flash", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Trigger copy_emails event directly (button not visible when no selection) + # This tests the edge case where event is triggered without selection + result = render_hook(view, "copy_emails", %{}) + + # Should show error flash + assert result =~ "No members selected" or result =~ "Keine Mitglieder" + end + + test "copy_emails event with all members selected formats all emails", %{ + conn: conn + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select all members via select_all + view |> element("[phx-click='select_all']") |> render_click() + + # Trigger copy_emails event + view |> element("#copy-emails-btn") |> render_click() + + # Verify flash message shows correct count (3 members) + assert render(view) =~ "3" + end + + test "copy_emails handles members with special characters in names", %{ + conn: conn, + member3: member3 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select member with umlauts + view + |> element("[phx-click='select_member'][phx-value-id='#{member3.id}']") + |> render_click() + + # Trigger copy_emails event - should not crash + view |> element("#copy-emails-btn") |> render_click() + + # Verify flash message shows success + assert render(view) =~ "1" + end + + test "copy_emails handles case where selected members are deleted", %{ + conn: conn, + member1: member1 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select a member + view + |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") + |> render_click() + + # Click copy button - should work correctly + view |> element("#copy-emails-btn") |> render_click() + + # Should show count of actual members found (1) + assert render(view) =~ "1" + end + + test "copy button is not visible when no members are selected", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Ensure no members are selected (default state) + refute has_element?(view, "#copy-emails-btn") + end + + test "copy button is visible when members are selected", %{ + conn: conn, + member1: member1 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select a member + view + |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") + |> render_click() + + # Button should now be visible + assert has_element?(view, "#copy-emails-btn") + end + + test "copy button click triggers event and shows flash", %{ + conn: conn, + member1: member1 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select a member + view + |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") + |> render_click() + + # Click copy button + view |> element("#copy-emails-btn") |> render_click() + + # Flash message should appear + assert has_element?(view, "#flash-group") + end + end end From ba78a6ac7af31b5c9f8295516f4fbcdd80a063c8 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 2 Dec 2025 11:42:11 +0100 Subject: [PATCH 08/17] feat: improve email copy UX with colored alerts and mailto button - Green success alert for copied confirmation - Blue info alert with BCC privacy tip - Mailto button opens email program with BCC recipients - Alerts stack vertically instead of overlapping --- lib/mv_web/components/core_components.ex | 40 +++++++------ lib/mv_web/components/layouts.ex | 4 +- lib/mv_web/live/member_live/index.ex | 6 +- lib/mv_web/live/member_live/index.html.heex | 8 +++ priv/gettext/de/LC_MESSAGES/default.po | 65 +++++++++++++-------- priv/gettext/default.pot | 65 +++++++++++++-------- priv/gettext/en/LC_MESSAGES/default.po | 65 +++++++++++++-------- 7 files changed, 159 insertions(+), 94 deletions(-) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index b8fe0fc..ae50ecb 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -42,7 +42,11 @@ defmodule MvWeb.CoreComponents do attr :id, :string, doc: "the optional id of flash container" attr :flash, :map, default: %{}, doc: "the map of flash messages to display" attr :title, :string, default: nil - attr :kind, :atom, values: [:info, :error], doc: "used for styling and flash lookup" + + attr :kind, :atom, + values: [:info, :error, :success, :warning], + doc: "used for styling and flash lookup" + attr :rest, :global, doc: "the arbitrary HTML attributes to add to the flash container" slot :inner_block, doc: "the optional inner block that renders the flash message" @@ -56,25 +60,27 @@ defmodule MvWeb.CoreComponents do id={@id} phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")} role="alert" - class="toast toast-top toast-end z-50" - {@rest} - > -
- <.icon :if={@kind == :info} name="hero-information-circle" class="size-5 shrink-0" /> - <.icon :if={@kind == :error} name="hero-exclamation-circle" class="size-5 shrink-0" /> -
-

{@title}

-

{msg}

-
-
- + @kind == :error && "alert-error", + @kind == :success && "bg-green-500 text-white", + @kind == :warning && "bg-blue-100 text-blue-800 border border-blue-300" + ]} + {@rest} + > + <.icon :if={@kind == :info} name="hero-information-circle" class="size-5 shrink-0" /> + <.icon :if={@kind == :error} name="hero-exclamation-circle" class="size-5 shrink-0" /> + <.icon :if={@kind == :success} name="hero-check-circle" class="size-5 shrink-0" /> + <.icon :if={@kind == :warning} name="hero-information-circle" class="size-5 shrink-0" /> +
+

{@title}

+

{msg}

+
+
""" end diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index b7f7568..487a01f 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -65,7 +65,9 @@ defmodule MvWeb.Layouts do def flash_group(assigns) do ~H""" -
+
+ <.flash kind={:success} flash={@flash} /> + <.flash kind={:warning} flash={@flash} /> <.flash kind={:info} flash={@flash} /> <.flash kind={:error} flash={@flash} /> diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 3087d7e..ad867ab 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -146,7 +146,7 @@ defmodule MvWeb.MemberLive.Index do socket |> push_event("copy_to_clipboard", %{text: email_string}) |> put_flash( - :info, + :success, ngettext( "Copied %{count} email address to clipboard", "Copied %{count} email addresses to clipboard", @@ -154,6 +154,10 @@ defmodule MvWeb.MemberLive.Index do count: email_count ) ) + |> put_flash( + :warning, + gettext("Tip: Paste email addresses into the BCC field for privacy compliance") + ) {:noreply, socket} end diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 1ab9b3d..0dabbaf 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -12,6 +12,14 @@ <.icon name="hero-clipboard-document" /> {gettext("Copy emails")} ({Enum.count(@members, &(&1.id in @selected_members))}) + <.button + :if={Enum.any?(@members, &(&1.id in @selected_members))} + href={"mailto:?bcc=#{@members |> Enum.filter(&(&1.id in @selected_members and &1.email)) |> Enum.map(& &1.email) |> Enum.join(",")}"} + aria-label={gettext("Open email program with BCC recipients")} + > + <.icon name="hero-envelope" /> + {gettext("Open in email program")} + <.button variant="primary" navigate={~p"/members/new"}> <.icon name="hero-plus" /> {gettext("New Member")} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index d75ec52..770cc09 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -10,37 +10,37 @@ msgid "" msgstr "" "Language: en\n" -#: lib/mv_web/components/core_components.ex:356 +#: lib/mv_web/components/core_components.ex:360 #, elixir-autogen, elixir-format msgid "Actions" msgstr "Aktionen" -#: lib/mv_web/live/member_live/index.html.heex:212 +#: lib/mv_web/live/member_live/index.html.heex:220 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "Bist du sicher?" -#: lib/mv_web/components/layouts.ex:80 -#: lib/mv_web/components/layouts.ex:92 +#: lib/mv_web/components/layouts.ex:82 +#: lib/mv_web/components/layouts.ex:94 #, elixir-autogen, elixir-format msgid "Attempting to reconnect" msgstr "Verbindung wird wiederhergestellt" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:158 +#: lib/mv_web/live/member_live/index.html.heex:166 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "Stadt" -#: lib/mv_web/live/member_live/index.html.heex:214 +#: lib/mv_web/live/member_live/index.html.heex:222 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "Löschen" -#: lib/mv_web/live/member_live/index.html.heex:206 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -54,7 +54,7 @@ msgid "Edit Member" msgstr "Mitglied bearbeiten" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:90 +#: lib/mv_web/live/member_live/index.html.heex:98 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -70,7 +70,7 @@ msgid "First Name" msgstr "Vorname" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:192 +#: lib/mv_web/live/member_live/index.html.heex:200 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -82,28 +82,28 @@ msgstr "Beitrittsdatum" msgid "Last Name" msgstr "Nachname" -#: lib/mv_web/live/member_live/index.html.heex:16 +#: lib/mv_web/live/member_live/index.html.heex:24 #, elixir-autogen, elixir-format msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:203 +#: lib/mv_web/live/member_live/index.html.heex:211 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "Anzeigen" -#: lib/mv_web/components/layouts.ex:87 +#: lib/mv_web/components/layouts.ex:89 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "Etwas ist schiefgelaufen!" -#: lib/mv_web/components/layouts.ex:75 +#: lib/mv_web/components/layouts.ex:77 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "Keine Internetverbindung gefunden" -#: lib/mv_web/components/core_components.ex:74 +#: lib/mv_web/components/core_components.ex:78 #, elixir-autogen, elixir-format msgid "close" msgstr "schließen" @@ -121,7 +121,7 @@ msgid "Exit Date" msgstr "Austrittsdatum" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:124 +#: lib/mv_web/live/member_live/index.html.heex:132 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -140,14 +140,14 @@ msgid "Paid" msgstr "Bezahlt" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:175 +#: lib/mv_web/live/member_live/index.html.heex:183 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "Telefonnummer" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:141 +#: lib/mv_web/live/member_live/index.html.heex:149 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -168,7 +168,7 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:107 +#: lib/mv_web/live/member_live/index.html.heex:115 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -365,12 +365,12 @@ msgstr "Profil" msgid "Required" msgstr "Erforderlich" -#: lib/mv_web/live/member_live/index.html.heex:47 +#: lib/mv_web/live/member_live/index.html.heex:55 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "Alle Mitglieder auswählen" -#: lib/mv_web/live/member_live/index.html.heex:61 +#: lib/mv_web/live/member_live/index.html.heex:69 #, elixir-autogen, elixir-format msgid "Select member" msgstr "Mitglied auswählen" @@ -556,7 +556,7 @@ msgid "Toggle dark mode" msgstr "Dunklen Modus umschalten" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:25 +#: lib/mv_web/live/member_live/index.html.heex:33 #, elixir-autogen, elixir-format msgid "Search..." msgstr "Suchen..." @@ -572,7 +572,7 @@ msgstr "Benutzer*innen" msgid "Click to sort" msgstr "Klicke um zu sortieren" -#: lib/mv_web/live/member_live/index.html.heex:73 +#: lib/mv_web/live/member_live/index.html.heex:81 #, elixir-autogen, elixir-format msgid "First name" msgstr "Vorname" @@ -782,7 +782,7 @@ msgstr "Mitglied entverknüpfen" msgid "Unlinking scheduled" msgstr "Entverknüpfung geplant" -#: lib/mv_web/live/member_live/index.ex:150 +#: lib/mv_web/live/member_live/index.ex:159 #, elixir-autogen, elixir-format msgid "Copied %{count} email address to clipboard" msgid_plural "Copied %{count} email addresses to clipboard" @@ -799,12 +799,27 @@ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren" msgid "Copy emails" msgstr "E-Mails kopieren" -#: lib/mv_web/live/member_live/index.ex:141 +#: lib/mv_web/live/member_live/index.ex:142 #, elixir-autogen, elixir-format msgid "No email addresses found" msgstr "Keine E-Mail-Adressen gefunden" -#: lib/mv_web/live/member_live/index.ex:125 +#: lib/mv_web/live/member_live/index.ex:126 #, elixir-autogen, elixir-format msgid "No members selected" msgstr "Keine Mitglieder ausgewählt" + +#: lib/mv_web/live/member_live/index.html.heex:18 +#, elixir-autogen, elixir-format +msgid "Open email program with BCC recipients" +msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen" + +#: lib/mv_web/live/member_live/index.html.heex:21 +#, elixir-autogen, elixir-format +msgid "Open in email program" +msgstr "Im E-Mail-Programm öffnen" + +#: lib/mv_web/live/member_live/index.ex:168 +#, elixir-autogen, elixir-format +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" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index ca8bd14..682b780 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -11,37 +11,37 @@ msgid "" msgstr "" -#: lib/mv_web/components/core_components.ex:356 +#: lib/mv_web/components/core_components.ex:360 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:212 +#: lib/mv_web/live/member_live/index.html.heex:220 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" -#: lib/mv_web/components/layouts.ex:80 -#: lib/mv_web/components/layouts.ex:92 +#: lib/mv_web/components/layouts.ex:82 +#: lib/mv_web/components/layouts.ex:94 #, elixir-autogen, elixir-format msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:158 +#: lib/mv_web/live/member_live/index.html.heex:166 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:214 +#: lib/mv_web/live/member_live/index.html.heex:222 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:206 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -55,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:90 +#: lib/mv_web/live/member_live/index.html.heex:98 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:192 +#: lib/mv_web/live/member_live/index.html.heex:200 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -83,28 +83,28 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:16 +#: lib/mv_web/live/member_live/index.html.heex:24 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:203 +#: lib/mv_web/live/member_live/index.html.heex:211 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" -#: lib/mv_web/components/layouts.ex:87 +#: lib/mv_web/components/layouts.ex:89 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "" -#: lib/mv_web/components/layouts.ex:75 +#: lib/mv_web/components/layouts.ex:77 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "" -#: lib/mv_web/components/core_components.ex:74 +#: lib/mv_web/components/core_components.ex:78 #, elixir-autogen, elixir-format msgid "close" msgstr "" @@ -122,7 +122,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:124 +#: lib/mv_web/live/member_live/index.html.heex:132 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -141,14 +141,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:175 +#: lib/mv_web/live/member_live/index.html.heex:183 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:141 +#: lib/mv_web/live/member_live/index.html.heex:149 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -169,7 +169,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:107 +#: lib/mv_web/live/member_live/index.html.heex:115 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:47 +#: lib/mv_web/live/member_live/index.html.heex:55 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:61 +#: lib/mv_web/live/member_live/index.html.heex:69 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -557,7 +557,7 @@ msgid "Toggle dark mode" msgstr "" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:25 +#: lib/mv_web/live/member_live/index.html.heex:33 #, elixir-autogen, elixir-format msgid "Search..." msgstr "" @@ -573,7 +573,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:73 +#: lib/mv_web/live/member_live/index.html.heex:81 #, elixir-autogen, elixir-format msgid "First name" msgstr "" @@ -783,7 +783,7 @@ msgstr "" msgid "Unlinking scheduled" msgstr "" -#: lib/mv_web/live/member_live/index.ex:150 +#: lib/mv_web/live/member_live/index.ex:159 #, elixir-autogen, elixir-format msgid "Copied %{count} email address to clipboard" msgid_plural "Copied %{count} email addresses to clipboard" @@ -800,12 +800,27 @@ msgstr "" msgid "Copy emails" msgstr "" -#: lib/mv_web/live/member_live/index.ex:141 +#: lib/mv_web/live/member_live/index.ex:142 #, elixir-autogen, elixir-format msgid "No email addresses found" msgstr "" -#: lib/mv_web/live/member_live/index.ex:125 +#: lib/mv_web/live/member_live/index.ex:126 #, elixir-autogen, elixir-format msgid "No members selected" msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:18 +#, elixir-autogen, elixir-format +msgid "Open email program with BCC recipients" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:21 +#, elixir-autogen, elixir-format +msgid "Open in email program" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:168 +#, elixir-autogen, elixir-format +msgid "Tip: Paste email addresses into the BCC field for privacy compliance" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index e9158d9..a3fdfa4 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -11,37 +11,37 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/mv_web/components/core_components.ex:356 +#: lib/mv_web/components/core_components.ex:360 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:212 +#: lib/mv_web/live/member_live/index.html.heex:220 #: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" -#: lib/mv_web/components/layouts.ex:80 -#: lib/mv_web/components/layouts.ex:92 +#: lib/mv_web/components/layouts.ex:82 +#: lib/mv_web/components/layouts.ex:94 #, elixir-autogen, elixir-format msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:158 +#: lib/mv_web/live/member_live/index.html.heex:166 #: lib/mv_web/live/member_live/show.ex:59 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:214 +#: lib/mv_web/live/member_live/index.html.heex:222 #: lib/mv_web/live/user_live/index.html.heex:74 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:206 +#: lib/mv_web/live/member_live/index.html.heex:214 #: lib/mv_web/live/user_live/form.ex:265 #: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format @@ -55,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:47 -#: lib/mv_web/live/member_live/index.html.heex:90 +#: lib/mv_web/live/member_live/index.html.heex:98 #: lib/mv_web/live/member_live/show.ex:50 #: lib/mv_web/live/user_live/form.ex:46 #: lib/mv_web/live/user_live/index.html.heex:44 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:51 -#: lib/mv_web/live/member_live/index.html.heex:192 +#: lib/mv_web/live/member_live/index.html.heex:200 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -83,28 +83,28 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:16 +#: lib/mv_web/live/member_live/index.html.heex:24 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:203 +#: lib/mv_web/live/member_live/index.html.heex:211 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" -#: lib/mv_web/components/layouts.ex:87 +#: lib/mv_web/components/layouts.ex:89 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "" -#: lib/mv_web/components/layouts.ex:75 +#: lib/mv_web/components/layouts.ex:77 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "" -#: lib/mv_web/components/core_components.ex:74 +#: lib/mv_web/components/core_components.ex:78 #, elixir-autogen, elixir-format msgid "close" msgstr "" @@ -122,7 +122,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:56 -#: lib/mv_web/live/member_live/index.html.heex:124 +#: lib/mv_web/live/member_live/index.html.heex:132 #: lib/mv_web/live/member_live/show.ex:61 #, elixir-autogen, elixir-format msgid "House Number" @@ -141,14 +141,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:50 -#: lib/mv_web/live/member_live/index.html.heex:175 +#: lib/mv_web/live/member_live/index.html.heex:183 #: lib/mv_web/live/member_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:57 -#: lib/mv_web/live/member_live/index.html.heex:141 +#: lib/mv_web/live/member_live/index.html.heex:149 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -169,7 +169,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:107 +#: lib/mv_web/live/member_live/index.html.heex:115 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:47 +#: lib/mv_web/live/member_live/index.html.heex:55 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:61 +#: lib/mv_web/live/member_live/index.html.heex:69 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -557,7 +557,7 @@ msgid "Toggle dark mode" msgstr "" #: lib/mv_web/live/components/search_bar_component.ex:15 -#: lib/mv_web/live/member_live/index.html.heex:25 +#: lib/mv_web/live/member_live/index.html.heex:33 #, elixir-autogen, elixir-format msgid "Search..." msgstr "" @@ -573,7 +573,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:73 +#: lib/mv_web/live/member_live/index.html.heex:81 #, elixir-autogen, elixir-format, fuzzy msgid "First name" msgstr "" @@ -783,7 +783,7 @@ msgstr "" msgid "Unlinking scheduled" msgstr "" -#: lib/mv_web/live/member_live/index.ex:150 +#: lib/mv_web/live/member_live/index.ex:159 #, elixir-autogen, elixir-format msgid "Copied %{count} email address to clipboard" msgid_plural "Copied %{count} email addresses to clipboard" @@ -800,12 +800,27 @@ msgstr "" msgid "Copy emails" msgstr "" -#: lib/mv_web/live/member_live/index.ex:141 +#: lib/mv_web/live/member_live/index.ex:142 #, elixir-autogen, elixir-format msgid "No email addresses found" msgstr "" -#: lib/mv_web/live/member_live/index.ex:125 +#: lib/mv_web/live/member_live/index.ex:126 #, elixir-autogen, elixir-format, fuzzy msgid "No members selected" msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:18 +#, elixir-autogen, elixir-format +msgid "Open email program with BCC recipients" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:21 +#, elixir-autogen, elixir-format +msgid "Open in email program" +msgstr "" + +#: lib/mv_web/live/member_live/index.ex:168 +#, elixir-autogen, elixir-format +msgid "Tip: Paste email addresses into the BCC field for privacy compliance" +msgstr "" From 39d2cb7820a322240ba3573c8a39c934021c0dcf Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 2 Dec 2025 12:10:59 +0100 Subject: [PATCH 09/17] refactor: improve email copy with MapSet, RFC 5322 commas, and cond Performance optimization, RFC-compliant separator, better tests --- email-copy-feature.plan.md | 235 -------------------- lib/mv_web/live/member_live/index.ex | 49 ++-- lib/mv_web/live/member_live/index.html.heex | 12 +- test/mv_web/member_live/index_test.exs | 67 +++++- 4 files changed, 92 insertions(+), 271 deletions(-) delete mode 100644 email-copy-feature.plan.md diff --git a/email-copy-feature.plan.md b/email-copy-feature.plan.md deleted file mode 100644 index 7895798..0000000 --- a/email-copy-feature.plan.md +++ /dev/null @@ -1,235 +0,0 @@ -# Bulk Email Copy Feature - Detaillierter Implementierungsplan - -## Aktueller Stand - -Die Checkbox-Funktionalität existiert bereits vollständig: - -- `select_member` und `select_all` Events in [`lib/mv_web/live/member_live/index.ex`](lib/mv_web/live/member_live/index.ex) (Zeilen 91-117) -- Checkboxen im Template [`lib/mv_web/live/member_live/index.html.heex`](lib/mv_web/live/member_live/index.html.heex) (Zeilen 28-54) -- `@selected_members` enthält die UUIDs der ausgewählten Mitglieder als Liste - -## Gewählte Implementierung: JavaScript Hook mit LiveView Event - -**Ablauf:** - -1. User wählt Mitglieder über Checkboxen aus -2. User klickt "E-Mail-Adressen kopieren" Button -3. LiveView Event `copy_emails` wird ausgelöst -4. Server filtert Member aus `@members` nach `@selected_members` -5. Server formatiert E-Mails im Format `Vorname Nachname ` -6. Server pusht `copy_to_clipboard` Event mit formatiertem String an Client -7. JavaScript Hook empfängt Event und kopiert via `navigator.clipboard.writeText()` -8. Server zeigt Flash-Nachricht mit Erfolgsbestätigung - ---- - -## Implementierungsschritte - -### Schritt 1: JavaScript Hook erstellen - -**Datei:** `assets/js/app.js` - -- Neuen Hook `CopyToClipboard` zum bestehenden `Hooks` Objekt hinzufügen -- Hook lauscht auf `copy_to_clipboard` Event vom Server -- Nutzt `navigator.clipboard.writeText()` API für das Kopieren -- Fallback-Behandlung für Browser ohne Clipboard API (ältere Browser) -- Fehlerbehandlung bei fehlgeschlagenem Kopieren - -### Schritt 2: LiveView Event Handler implementieren - -**Datei:** `lib/mv_web/live/member_live/index.ex` - -- Neuen `handle_event("copy_emails", ...)` Callback hinzufügen -- Member aus `@members` filtern, deren ID in `@selected_members` enthalten ist -- Jeden Member im Format `"Vorname Nachname "` formatieren -- Formatierte Strings mit `"; "` (Semikolon + Leerzeichen) verbinden -- `push_event/3` nutzen um `copy_to_clipboard` Event zu senden -- `put_flash/3` für Erfolgsbestätigung mit Anzahl der kopierten Adressen -- Private Helper-Funktion für die E-Mail-Formatierung - -### Schritt 3: UI Button hinzufügen - -**Datei:** `lib/mv_web/live/member_live/index.html.heex` - -- Button im Header-Bereich neben "New Member" Button platzieren -- Button nur anzeigen wenn mindestens ein Mitglied ausgewählt ist (`:if` Bedingung) -- `phx-hook="CopyToClipboard"` Attribut für JavaScript Hook Anbindung -- `phx-click="copy_emails"` für Event-Auslösung -- Icon: `hero-clipboard-document` oder `hero-envelope` -- Button-Text mit Anzahl der ausgewählten Mitglieder anzeigen -- Accessibility: `aria-label` für Screen Reader - -### Schritt 4: Gettext Übersetzungen hinzufügen - -**Dateien:** - -- `priv/gettext/default.pot` - Template aktualisieren via `mix gettext.extract` -- `priv/gettext/de/LC_MESSAGES/default.po` - Deutsche Übersetzungen -- `priv/gettext/en/LC_MESSAGES/default.po` - Englische Übersetzungen (falls vorhanden) - -**Zu übersetzende Strings:** - -- Button-Text: "Copy Email Addresses" -- Flash-Nachricht Erfolg: "Copied %{count} email address(es) to clipboard" -- Flash-Nachricht Fehler: "No members selected" - -### Schritt 5: Moduledoc aktualisieren - -**Datei:** `lib/mv_web/live/member_live/index.ex` - -- `@moduledoc` um neues Event `copy_emails` erweitern -- Dokumentation der Funktionalität hinzufügen - ---- - -## Edge Cases - -### E1: Keine Mitglieder ausgewählt - -- Button wird nicht angezeigt (UI-seitig gelöst) -- Falls Event dennoch ausgelöst wird: Error-Flash anzeigen, nichts kopieren - -### E2: Ausgewählte Mitglieder nicht mehr in `@members` Liste - -- Kann passieren wenn Member zwischenzeitlich gelöscht wurde -- Nur vorhandene Member verarbeiten, keine Fehler werfen -- Flash zeigt tatsächliche Anzahl kopierter Adressen - -### E3: Member ohne E-Mail-Adresse - -- Defensive Programmierung: Member ohne E-Mail überspringen - -### E4: Member mit leerem Vor- oder Nachnamen - -- Defensive Programmierung: Leere Namen graceful behandeln - -### E5: Sonderzeichen in Namen - -- Namen können Umlaute, Akzente, etc. enthalten -- Keine Escaping nötig, da Text direkt in Zwischenablage kopiert wird -- E-Mail-Clients verarbeiten Unicode korrekt - -### E6: Sehr lange Liste (100+ Mitglieder) - -- String kann sehr lang werden -- Clipboard API hat kein praktisches Limit -- Kein spezielles Handling nötig - -### E7: Browser unterstützt Clipboard API nicht - -- `navigator.clipboard` ist nicht in allen Browsern verfügbar -- Fallback: `document.execCommand('copy')` (deprecated aber breit unterstützt) -- Oder: Fehler-Flash anzeigen - -### E8: Clipboard-Zugriff vom Browser blockiert - -- Moderne Browser können Clipboard-Zugriff einschränken -- HTTPS erforderlich (in Produktion gegeben) -- User muss ggf. Berechtigung erteilen -- Fehlerbehandlung im Hook nötig - -### E9: Parallel laufende Suche/Filter ändert `@members` - -- User wählt Mitglieder, dann ändert Suche die Liste -- `@selected_members` bleibt erhalten, aber IDs passen nicht mehr zu `@members` -- Nur noch vorhandene (angezeigte) Members werden kopiert -- Entscheidung: Selection bei Suche beibehalten? - -### E10: "Select All" nach Filterung - -- Wenn gefiltert und "Select All" geklickt, werden nur sichtbare Members ausgewählt -- Bestehendes Verhalten, kein neues Problem - ---- - -## Testplan - -### Unit Tests (index.ex) - -**T1: copy_emails Event - Erfolgsfall** - -- Setup: 3 Members in `@members`, 2 davon in `@selected_members` -- Assert: `push_event` wird mit korrektem String aufgerufen -- Assert: Flash-Nachricht mit count=2 - -**T2: copy_emails Event - Keine Auswahl** - -- Setup: `@selected_members` ist leer -- Assert: Kein `push_event` -- Assert: Error-Flash oder keine Aktion - -**T3: copy_emails Event - Alle ausgewählt** - -- Setup: Alle Members in `@selected_members` -- Assert: Alle E-Mails im Output-String - -**T4: E-Mail Formatierung** - -- Assert: Format ist `"Vorname Nachname "` -- Assert: Mehrere E-Mails mit `"; "` getrennt - -**T5: Member mit Sonderzeichen im Namen** - -- Setup: Member mit Name "Müller-Lüdenscheidt" -- Assert: Name wird korrekt übernommen - -**T6: Teilweise nicht vorhandene Member** - -- Setup: `@selected_members` enthält ID die nicht in `@members` ist -- Assert: Nur vorhandene Members werden verarbeitet, kein Crash - -### LiveView Integration Tests - -**T7: Button Sichtbarkeit** - -- Assert: Button nicht sichtbar wenn `@selected_members` leer -- Assert: Button sichtbar wenn mindestens 1 Member ausgewählt - -**T8: Button zeigt korrekte Anzahl** - -- Setup: 3 Members ausgewählt -- Assert: Button-Text enthält "(3)" - -**T9: Click löst Event aus** - -- Action: Click auf Copy-Button -- Assert: `copy_emails` Event wird gesendet - -**T10: Vollständiger Flow** - -- Action: Member auswählen, Button klicken -- Assert: Flash-Nachricht erscheint - -## Zu ändernde Dateien - -| Datei | Änderungstyp | - -|-------|--------------| - -| `assets/js/app.js` | Hook hinzufügen | - -| `lib/mv_web/live/member_live/index.ex` | Event Handler + Helper | - -| `lib/mv_web/live/member_live/index.html.heex` | Button UI | - -| `priv/gettext/de/LC_MESSAGES/default.po` | Übersetzungen | - -| `test/mv_web/member_live/index_test.exs` | Tests | - ---- - -## E-Mail Output Format - -**Einzelne E-Mail:** - -``` -Max Mustermann -``` - -**Mehrere E-Mails:** - -``` -Max Mustermann ; Erika Musterfrau ; Hans Müller -``` - -**Hinweis:** Semikolon als Trennzeichen ist Standard für E-Mail-Clients (Outlook, Thunderbird, etc.) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index ad867ab..b0a9bc2 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -59,7 +59,7 @@ defmodule MvWeb.MemberLive.Index do |> assign(:query, "") |> assign_new(:sort_field, fn -> :first_name end) |> assign_new(:sort_order, fn -> :asc end) - |> assign(:selected_members, []) + |> assign(:selected_members, MapSet.new()) |> assign(:custom_fields_visible, custom_fields_visible) # We call handle params to use the query from the URL @@ -92,10 +92,10 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_event("select_member", %{"id" => id}, socket) do selected = - if id in socket.assigns.selected_members do - List.delete(socket.assigns.selected_members, id) + if MapSet.member?(socket.assigns.selected_members, id) do + MapSet.delete(socket.assigns.selected_members, id) else - [id | socket.assigns.selected_members] + MapSet.put(socket.assigns.selected_members, id) end {:noreply, assign(socket, :selected_members, selected)} @@ -103,13 +103,11 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_event("select_all", _params, socket) do - members = socket.assigns.members - - all_ids = Enum.map(members, & &1.id) + all_ids = socket.assigns.members |> Enum.map(& &1.id) |> MapSet.new() selected = - if Enum.sort(socket.assigns.selected_members) == Enum.sort(all_ids) do - [] + if MapSet.equal?(socket.assigns.selected_members, all_ids) do + MapSet.new() else all_ids end @@ -121,26 +119,26 @@ defmodule MvWeb.MemberLive.Index do def handle_event("copy_emails", _params, socket) do selected_ids = socket.assigns.selected_members - if selected_ids == [] do - {:noreply, put_flash(socket, :error, gettext("No members selected"))} - else - # Filter members that are in the selection - selected_members = - socket.assigns.members - |> Enum.filter(fn member -> member.id in selected_ids end) + # Filter members that are in the selection and have email addresses + formatted_emails = + socket.assigns.members + |> Enum.filter(fn member -> + MapSet.member?(selected_ids, member.id) && member.email && member.email != "" + end) + |> Enum.map(&format_member_email/1) - # Format emails and filter out members without email - formatted_emails = - selected_members - |> Enum.filter(fn member -> member.email && member.email != "" end) - |> Enum.map(&format_member_email/1) + email_count = length(formatted_emails) - email_count = length(formatted_emails) + cond do + MapSet.size(selected_ids) == 0 -> + {:noreply, put_flash(socket, :error, gettext("No members selected"))} - if email_count == 0 do + email_count == 0 -> {:noreply, put_flash(socket, :error, gettext("No email addresses found"))} - else - email_string = Enum.join(formatted_emails, "; ") + + true -> + # RFC 5322 uses comma as separator for email address lists + email_string = Enum.join(formatted_emails, ", ") socket = socket @@ -160,7 +158,6 @@ defmodule MvWeb.MemberLive.Index do ) {:noreply, socket} - 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 0dabbaf..633dd9c 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -3,18 +3,18 @@ {gettext("Members")} <:actions> <.button - :if={Enum.any?(@members, &(&1.id in @selected_members))} + :if={Enum.any?(@members, &MapSet.member?(@selected_members, &1.id))} id="copy-emails-btn" phx-hook="CopyToClipboard" phx-click="copy_emails" aria-label={gettext("Copy email addresses of selected members")} > <.icon name="hero-clipboard-document" /> - {gettext("Copy emails")} ({Enum.count(@members, &(&1.id in @selected_members))}) + {gettext("Copy emails")} ({Enum.count(@members, &MapSet.member?(@selected_members, &1.id))}) <.button - :if={Enum.any?(@members, &(&1.id in @selected_members))} - href={"mailto:?bcc=#{@members |> Enum.filter(&(&1.id in @selected_members and &1.email)) |> Enum.map(& &1.email) |> Enum.join(",")}"} + :if={Enum.any?(@members, &MapSet.member?(@selected_members, &1.id))} + href={"mailto:?bcc=#{@members |> Enum.filter(&(MapSet.member?(@selected_members, &1.id) && &1.email)) |> Enum.map(& &1.email) |> Enum.join(",")}"} aria-label={gettext("Open email program with BCC recipients")} > <.icon name="hero-envelope" /> @@ -51,7 +51,7 @@ type="checkbox" name="select_all" phx-click="select_all" - checked={Enum.sort(@selected_members) == Enum.map(@members, & &1.id) |> Enum.sort()} + checked={MapSet.equal?(@selected_members, @members |> Enum.map(& &1.id) |> MapSet.new())} aria-label={gettext("Select all members")} role="checkbox" /> @@ -63,7 +63,7 @@ name={member.id} phx-click="select_member" phx-value-id={member.id} - checked={member.id in @selected_members} + checked={MapSet.member?(@selected_members, member.id)} phx-capture-click phx-stop-propagation aria-label={gettext("Select member")} diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index 6e91b4c..e3ad5bb 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -348,7 +348,7 @@ defmodule MvWeb.MemberLive.IndexTest do assert render(view) =~ "1" end - test "copy_emails handles case where selected members are deleted", %{ + test "copy_emails handles case where selected member is deleted before copy", %{ conn: conn, member1: member1 } do @@ -360,10 +360,69 @@ defmodule MvWeb.MemberLive.IndexTest do |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") |> render_click() - # Click copy button - should work correctly - view |> element("#copy-emails-btn") |> render_click() + # Delete the member from the database + Ash.destroy!(member1) - # Should show count of actual members found (1) + # Trigger copy_emails event directly - selection still contains the deleted ID + # but the member is no longer in @members list after reload + result = render_hook(view, "copy_emails", %{}) + + # Should show error since no visible members match selection + assert result =~ "No email" or result =~ "Keine E-Mail" or result =~ "0" + end + + test "copy_emails formats emails as RFC 5322 compliant comma-separated list", %{ + conn: conn, + member1: member1, + member2: member2 + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Select two members + view + |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']") + |> render_click() + + view + |> element("[phx-click='select_member'][phx-value-id='#{member2.id}']") + |> render_click() + + # Get the socket state to verify the formatted email string + state = :sys.get_state(view.pid) + selected_members = state.socket.assigns.selected_members + + # Verify MapSet is used + assert %MapSet{} = selected_members + assert MapSet.size(selected_members) == 2 + end + + test "email format is 'First Last ' with comma separator", %{ + conn: conn, + member1: _member1 + } do + # Test the format_member_email function indirectly + # by checking the push_event payload structure + conn = conn_with_oidc_user(conn) + + # Create a member with known data + {:ok, test_member} = + Mv.Membership.create_member(%{ + first_name: "Test", + last_name: "Format", + email: "test.format@example.com" + }) + + {:ok, view, _html} = live(conn, "/members") + + # Select the test member + view + |> element("[phx-click='select_member'][phx-value-id='#{test_member.id}']") + |> render_click() + + # The format should be "Test Format " + # We verify this by checking the flash shows 1 email was copied + view |> element("#copy-emails-btn") |> render_click() assert render(view) =~ "1" end From f25f0216ec6a855c62095a4047dde963abb87c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Tue, 2 Dec 2025 12:16:02 +0100 Subject: [PATCH 10/17] Refactor column visibility logic --- lib/membership/member.ex | 64 ---------------- lib/membership/membership.ex | 8 +- lib/membership/setting.ex | 75 +++++++------------ lib/mv_web/live/member_live/index.ex | 69 +++-------------- .../member_field_visibility_test.exs | 66 ---------------- .../index_member_fields_display_test.exs | 2 +- 6 files changed, 43 insertions(+), 241 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 31a825b..bcd505e 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -410,70 +410,6 @@ 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 516448c..f5a708b 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -134,8 +134,8 @@ defmodule Mv.Membership do ## 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}`) + - `visibility_config` - A map of member field names (strings) to boolean visibility values + (e.g., `%{"street" => false, "house_number" => false}`) ## Returns @@ -145,9 +145,9 @@ defmodule Mv.Membership do ## Examples iex> {:ok, settings} = Mv.Membership.get_settings() - iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false}) + 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} + %{"street" => false, "house_number" => false} """ def update_member_field_visibility(settings, visibility_config) do diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex index 3405a3f..52c0328 100644 --- a/lib/membership/setting.ex +++ b/lib/membership/setting.ex @@ -10,7 +10,7 @@ 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`. + (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. @@ -32,7 +32,7 @@ defmodule Mv.Membership.Setting do {: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}) + {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{"street" => false, "house_number" => false}) """ use Ash.Resource, domain: Mv.Membership, @@ -67,43 +67,6 @@ defmodule Mv.Membership.Setting 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 @@ -111,23 +74,39 @@ defmodule Mv.Membership.Setting 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 member_field_visibility map structure and content validate fn changeset, _context -> visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) if visibility && is_map(visibility) do - invalid_entries = + # Validate all values are booleans + invalid_values = 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"} + # Validate all keys are valid member fields + valid_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + invalid_keys = + Enum.filter(visibility, fn {key, _value} -> + key not in valid_field_strings + end) + |> Enum.map(fn {key, _value} -> key end) + + cond do + not Enum.empty?(invalid_values) -> + {:error, + field: :member_field_visibility, + message: "All values in member_field_visibility must be booleans"} + + not Enum.empty?(invalid_keys) -> + {:error, + field: :member_field_visibility, + message: "Invalid member field keys: #{inspect(invalid_keys)}"} + + true -> + :ok end else :ok diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 6bce495..c301592 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -74,9 +74,7 @@ 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(settings)) |> assign(:member_fields_visible, get_visible_member_fields(settings)) # We call handle params to use the query from the URL @@ -736,11 +734,10 @@ defmodule MvWeb.MemberLive.Index do end end - # Gets the configuration for all member fields with their show_in_overview values. + # Gets the list of member fields that should be visible in the overview. # - # 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. + # 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. @@ -748,64 +745,20 @@ defmodule MvWeb.MemberLive.Index do # Parameters: # - `settings` - The settings struct loaded from the database # - # 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 + # Returns a list of atoms representing visible member field names. # # Fields are read from the global Constants module. - @spec get_member_field_configurations(map()) :: %{atom() => boolean()} - defp get_member_field_configurations(settings) do + @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() - # Normalize visibility config (JSONB may return string keys) - visibility_config = normalize_visibility_config(settings.member_field_visibility || %{}) + # JSONB stores keys as strings + visibility_config = settings.member_field_visibility || %{} - Enum.reduce(all_fields, %{}, fn field, acc -> - show_in_overview = Map.get(visibility_config, field, true) - Map.put(acc, field, show_in_overview) + # Filter to only return visible fields + Enum.filter(all_fields, fn field -> + Map.get(visibility_config, Atom.to_string(field), true) 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. - # 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/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs index 46bdb74..9963169 100644 --- a/test/membership/member_field_visibility_test.exs +++ b/test/membership/member_field_visibility_test.exs @@ -11,70 +11,4 @@ defmodule Mv.Membership.MemberFieldVisibilityTest do 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 index c4a5b9f..6b4f50c 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 @@ -51,7 +51,7 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do {:ok, _} = Mv.Membership.update_settings(settings, %{ - member_field_visibility: Map.new(fields_to_hide, &{&1, false}) + member_field_visibility: Map.new(fields_to_hide, &{Atom.to_string(&1), false}) }) conn = conn_with_oidc_user(conn) From d10f2ecc90046b62841d9399c4efc4df8c1492fd Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 08:45:18 +0100 Subject: [PATCH 11/17] 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 944b868478d37892a31c4a36516711cee4630633 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:22:26 +0100 Subject: [PATCH 12/17] 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 831149f46331032c27b8497908e647651572538d Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:22:49 +0100 Subject: [PATCH 13/17] 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 397cbde9d6555c665c4ab0e9443eaa19ff885801 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:23:23 +0100 Subject: [PATCH 14/17] 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 e81aecce48a90e6bef4d282f737024c9e8ea2ba1 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 09:23:37 +0100 Subject: [PATCH 15/17] 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 b0a9bc2..830cfd9 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -61,6 +61,8 @@ defmodule MvWeb.MemberLive.Index do |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, MapSet.new()) |> 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} @@ -796,4 +798,39 @@ defmodule MvWeb.MemberLive.Index do "#{name} <#{member.email}>" 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 633dd9c..41536e3 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -87,9 +87,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} @@ -100,13 +98,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} @@ -117,13 +112,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} @@ -134,13 +126,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} @@ -151,13 +140,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} @@ -168,13 +154,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} @@ -185,13 +168,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} @@ -202,8 +182,7 @@ sort_order={@sort_order} /> """ - } - > + }> {member.join_date} <:action :let={member}> From dce2053ce7ca07755f507437a9c83700ea29a3b1 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 10:02:52 +0100 Subject: [PATCH 16/17] 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 | 95 +++++++++++++------ lib/mv_web/live/member_live/index.html.heex | 56 ++++++++--- .../index_member_fields_display_test.exs | 11 --- 6 files changed, 149 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 830cfd9..a15063e 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -30,11 +30,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. @@ -53,6 +60,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")) @@ -61,8 +76,8 @@ defmodule MvWeb.MemberLive.Index do |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, MapSet.new()) |> 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} @@ -360,18 +375,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) @@ -480,18 +484,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 @@ -805,6 +804,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: @@ -813,12 +818,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 @@ -827,10 +836,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 41536e3..55b0a20 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -87,7 +87,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} @@ -98,10 +101,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} @@ -112,10 +119,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} @@ -126,10 +137,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} @@ -140,10 +155,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} @@ -154,10 +173,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} @@ -168,10 +191,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} @@ -182,7 +209,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 13f77b5c0ae190dac2ce7de4ee9e4fc74d357b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Tue, 2 Dec 2025 12:16:02 +0100 Subject: [PATCH 17/17] Refactor column visibility logic --- lib/membership/member.ex | 64 ---------------- lib/membership/membership.ex | 8 +- lib/membership/setting.ex | 75 +++++++------------ lib/mv_web/live/member_live/index.ex | 68 +++-------------- .../member_field_visibility_test.exs | 66 ---------------- .../index_member_fields_display_test.exs | 2 +- 6 files changed, 43 insertions(+), 240 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 31a825b..bcd505e 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -410,70 +410,6 @@ 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 516448c..f5a708b 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -134,8 +134,8 @@ defmodule Mv.Membership do ## 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}`) + - `visibility_config` - A map of member field names (strings) to boolean visibility values + (e.g., `%{"street" => false, "house_number" => false}`) ## Returns @@ -145,9 +145,9 @@ defmodule Mv.Membership do ## Examples iex> {:ok, settings} = Mv.Membership.get_settings() - iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false}) + 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} + %{"street" => false, "house_number" => false} """ def update_member_field_visibility(settings, visibility_config) do diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex index 3405a3f..52c0328 100644 --- a/lib/membership/setting.ex +++ b/lib/membership/setting.ex @@ -10,7 +10,7 @@ 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`. + (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. @@ -32,7 +32,7 @@ defmodule Mv.Membership.Setting do {: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}) + {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{"street" => false, "house_number" => false}) """ use Ash.Resource, domain: Mv.Membership, @@ -67,43 +67,6 @@ defmodule Mv.Membership.Setting 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 @@ -111,23 +74,39 @@ defmodule Mv.Membership.Setting 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 member_field_visibility map structure and content validate fn changeset, _context -> visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility) if visibility && is_map(visibility) do - invalid_entries = + # Validate all values are booleans + invalid_values = 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"} + # Validate all keys are valid member fields + valid_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + invalid_keys = + Enum.filter(visibility, fn {key, _value} -> + key not in valid_field_strings + end) + |> Enum.map(fn {key, _value} -> key end) + + cond do + not Enum.empty?(invalid_values) -> + {:error, + field: :member_field_visibility, + message: "All values in member_field_visibility must be booleans"} + + not Enum.empty?(invalid_keys) -> + {:error, + field: :member_field_visibility, + message: "Invalid member field keys: #{inspect(invalid_keys)}"} + + true -> + :ok end else :ok diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index a15063e..4d444b9 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -76,7 +76,6 @@ defmodule MvWeb.MemberLive.Index do |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, MapSet.new()) |> assign(:custom_fields_visible, custom_fields_visible) - |> 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 @@ -798,11 +797,10 @@ defmodule MvWeb.MemberLive.Index do end end - # Gets the configuration for all member fields with their show_in_overview values. + # Gets the list of member fields that should be visible in the overview. # - # 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. + # 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. @@ -810,64 +808,20 @@ defmodule MvWeb.MemberLive.Index do # Parameters: # - `settings` - The settings struct loaded from the database # - # 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 + # Returns a list of atoms representing visible member field names. # # Fields are read from the global Constants module. - @spec get_member_field_configurations(map()) :: %{atom() => boolean()} - defp get_member_field_configurations(settings) do + @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() - # Normalize visibility config (JSONB may return string keys) - visibility_config = normalize_visibility_config(settings.member_field_visibility || %{}) + # JSONB stores keys as strings + visibility_config = settings.member_field_visibility || %{} - Enum.reduce(all_fields, %{}, fn field, acc -> - show_in_overview = Map.get(visibility_config, field, true) - Map.put(acc, field, show_in_overview) + # Filter to only return visible fields + Enum.filter(all_fields, fn field -> + Map.get(visibility_config, Atom.to_string(field), true) 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. - # 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/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs index 46bdb74..9963169 100644 --- a/test/membership/member_field_visibility_test.exs +++ b/test/membership/member_field_visibility_test.exs @@ -11,70 +11,4 @@ defmodule Mv.Membership.MemberFieldVisibilityTest do 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 index c4a5b9f..6b4f50c 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 @@ -51,7 +51,7 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do {:ok, _} = Mv.Membership.update_settings(settings, %{ - member_field_visibility: Map.new(fields_to_hide, &{&1, false}) + member_field_visibility: Map.new(fields_to_hide, &{Atom.to_string(&1), false}) }) conn = conn_with_oidc_user(conn)