From 65ee1819ae9dfe8608823bd42aef2f1c42c72aa9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 20 Oct 2025 16:43:13 +0000 Subject: [PATCH 001/119] chore(deps): update ghcr.io/sebadob/rauthy docker tag to v0.32.5 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0071ba6..1b5f8bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: rauthy: container_name: rauthy-dev - image: ghcr.io/sebadob/rauthy:0.32.0 + image: ghcr.io/sebadob/rauthy:0.32.5 environment: - LOCAL_TEST=true - SMTP_URL=mailcrab From 7882370f4aa38987dcbceb424b53e9a076f9c46b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 20 Oct 2025 16:43:16 +0000 Subject: [PATCH 002/119] chore(deps): update postgres to v17.6 --- .drone.yml | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index e720275..20d3ed7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: check services: - name: postgres - image: docker.io/library/postgres:17.5 + image: docker.io/library/postgres:17.6 environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres @@ -55,7 +55,7 @@ steps: - mix credo - name: wait_for_postgres - image: docker.io/library/postgres:17.5 + image: docker.io/library/postgres:17.6 commands: # Wait for postgres to become available - | diff --git a/docker-compose.yml b/docker-compose.yml index 0071ba6..297b4af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ networks: services: db: - image: postgres:17.5-alpine + image: postgres:17.6-alpine environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres From 91c5e17994589f475fd5bdfff3f2c081f3f79580 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 16 Oct 2025 16:57:34 +0200 Subject: [PATCH 003/119] email sync tests --- test/accounts/email_sync_edge_cases_test.exs | 93 ++++++++++ test/accounts/user_email_sync_test.exs | 169 +++++++++++++++++++ test/membership/member_email_sync_test.exs | 127 ++++++++++++++ 3 files changed, 389 insertions(+) create mode 100644 test/accounts/email_sync_edge_cases_test.exs create mode 100644 test/accounts/user_email_sync_test.exs create mode 100644 test/membership/member_email_sync_test.exs diff --git a/test/accounts/email_sync_edge_cases_test.exs b/test/accounts/email_sync_edge_cases_test.exs new file mode 100644 index 0000000..b872235 --- /dev/null +++ b/test/accounts/email_sync_edge_cases_test.exs @@ -0,0 +1,93 @@ +defmodule Mv.Accounts.EmailSyncEdgeCasesTest do + @moduledoc """ + Edge case tests for email synchronization between User and Member. + Tests various boundary conditions and validation scenarios. + """ + use Mv.DataCase, async: false + alias Mv.Accounts + alias Mv.Membership + + describe "Email sync edge cases" do + @valid_user_attrs %{ + email: "user@example.com" + } + + @valid_member_attrs %{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + } + + test "simultaneous email updates use user email as source of truth" do + # Create linked user and member + {:ok, member} = Membership.create_member(@valid_member_attrs) + + {:ok, user} = + Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member.id})) + + # Verify link and initial sync + {:ok, synced_member} = Ash.get(Mv.Membership.Member, member.id) + assert synced_member.email == "user@example.com" + + # Scenario: Both emails are updated "simultaneously" + # In practice, this tests that when a member email is updated, + # it syncs to user, and user remains the source of truth + + # Update member email first + {:ok, _updated_member} = + Membership.update_member(member, %{email: "member-new@example.com"}) + + # Verify it synced to user + {:ok, user_after_member_update} = Ash.get(Mv.Accounts.User, user.id) + assert to_string(user_after_member_update.email) == "member-new@example.com" + + # Now update user email - this should override + {:ok, _updated_user} = + Accounts.update_user(user_after_member_update, %{email: "user-final@example.com"}) + + # Reload both + {:ok, final_user} = Ash.get(Mv.Accounts.User, user.id) + {:ok, final_member} = Ash.get(Mv.Membership.Member, member.id) + + # User email should be the final truth + assert to_string(final_user.email) == "user-final@example.com" + assert final_member.email == "user-final@example.com" + end + + test "email validation works for both user and member" do + # Test that invalid emails are rejected for both resources + + # Invalid email for user + invalid_user_result = Accounts.create_user(%{email: "not-an-email"}) + assert {:error, %Ash.Error.Invalid{}} = invalid_user_result + + # Invalid email for member + invalid_member_attrs = Map.put(@valid_member_attrs, :email, "also-not-an-email") + invalid_member_result = Membership.create_member(invalid_member_attrs) + assert {:error, %Ash.Error.Invalid{}} = invalid_member_result + + # Valid emails should work + {:ok, _user} = Accounts.create_user(@valid_user_attrs) + {:ok, _member} = Membership.create_member(@valid_member_attrs) + end + + test "identity constraints prevent duplicate emails" do + # Create first user with an email + {:ok, user1} = Accounts.create_user(%{email: "duplicate@example.com"}) + assert to_string(user1.email) == "duplicate@example.com" + + # Try to create second user with same email - should fail due to unique constraint + result = Accounts.create_user(%{email: "duplicate@example.com"}) + assert {:error, %Ash.Error.Invalid{}} = result + + # Same for members + member_attrs = Map.put(@valid_member_attrs, :email, "member-dup@example.com") + {:ok, member1} = Membership.create_member(member_attrs) + assert member1.email == "member-dup@example.com" + + # Try to create second member with same email - should fail + result2 = Membership.create_member(member_attrs) + assert {:error, %Ash.Error.Invalid{}} = result2 + end + end +end diff --git a/test/accounts/user_email_sync_test.exs b/test/accounts/user_email_sync_test.exs new file mode 100644 index 0000000..6d08d61 --- /dev/null +++ b/test/accounts/user_email_sync_test.exs @@ -0,0 +1,169 @@ +defmodule Mv.Accounts.UserEmailSyncTest do + @moduledoc """ + Tests for email synchronization from User to Member. + When a user and member are linked, email changes should sync bidirectionally. + User.email is the source of truth when linking occurs. + """ + use Mv.DataCase, async: false + alias Mv.Accounts + alias Mv.Membership + + describe "User email synchronization to linked Member" do + @valid_user_attrs %{ + email: "user@example.com" + } + + @valid_member_attrs %{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + } + + test "updating user email syncs to linked member" do + # Create a member + {:ok, member} = Membership.create_member(@valid_member_attrs) + assert member.email == "member@example.com" + + # Create a user linked to the member + {:ok, user} = + Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member.id})) + + # Verify initial state - member email should be overridden by user email + {:ok, member_after_link} = Ash.get(Mv.Membership.Member, member.id) + assert member_after_link.email == "user@example.com" + + # Update user email + {:ok, updated_user} = Accounts.update_user(user, %{email: "newemail@example.com"}) + assert to_string(updated_user.email) == "newemail@example.com" + + # Verify member email was also updated + {:ok, synced_member} = Ash.get(Mv.Membership.Member, member.id) + assert synced_member.email == "newemail@example.com" + end + + test "creating user linked to member overrides member email" do + # Create a member with their own email + {:ok, member} = Membership.create_member(@valid_member_attrs) + assert member.email == "member@example.com" + + # Create a user linked to this member + {:ok, user} = + Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member.id})) + + assert to_string(user.email) == "user@example.com" + assert user.member_id == member.id + + # Verify member email was overridden with user email + {:ok, updated_member} = Ash.get(Mv.Membership.Member, member.id) + assert updated_member.email == "user@example.com" + end + + test "linking user to existing member syncs user email to member" do + # Create a standalone member + {:ok, member} = Membership.create_member(@valid_member_attrs) + assert member.email == "member@example.com" + + # Create a standalone user + {:ok, user} = Accounts.create_user(@valid_user_attrs) + assert to_string(user.email) == "user@example.com" + assert user.member_id == nil + + # Link the user to the member + {:ok, linked_user} = Accounts.update_user(user, %{member: %{id: member.id}}) + assert linked_user.member_id == member.id + + # Verify member email was overridden with user email + {:ok, synced_member} = Ash.get(Mv.Membership.Member, member.id) + assert synced_member.email == "user@example.com" + end + + test "updating user email when no member linked does not error" do + # Create a standalone user without member link + {:ok, user} = Accounts.create_user(@valid_user_attrs) + assert to_string(user.email) == "user@example.com" + assert user.member_id == nil + + # Update user email - should work fine without error + {:ok, updated_user} = Accounts.update_user(user, %{email: "newemail@example.com"}) + assert to_string(updated_user.email) == "newemail@example.com" + assert updated_user.member_id == nil + end + + test "unlinking user from member does not sync email" do + # Create member + {:ok, member} = Membership.create_member(@valid_member_attrs) + + # Create user linked to member + {:ok, user} = + Accounts.create_user(Map.put(@valid_user_attrs, :member, %{id: member.id})) + + assert user.member_id == member.id + + # Verify member email was synced + {:ok, synced_member} = Ash.get(Mv.Membership.Member, member.id) + assert synced_member.email == "user@example.com" + + # Unlink user from member + {:ok, unlinked_user} = Accounts.update_user(user, %{member: nil}) + assert unlinked_user.member_id == nil + + # Member email should remain unchanged after unlinking + {:ok, member_after_unlink} = Ash.get(Mv.Membership.Member, member.id) + assert member_after_unlink.email == "user@example.com" + end + end + + describe "AshAuthentication compatibility" do + test "AshAuthentication password strategy still works with email" do + # This test ensures that the email field remains accessible for password auth + email = "test@example.com" + password = "securepassword123" + + # Create user with password strategy (simulating registration) + {:ok, user} = + Mv.Accounts.User + |> Ash.Changeset.for_create(:register_with_password, %{ + email: email, + password: password + }) + |> Ash.create() + + assert to_string(user.email) == email + assert user.hashed_password != nil + + # Verify we can sign in with email + {:ok, signed_in_user} = + Mv.Accounts.User + |> Ash.Query.for_read(:sign_in_with_password, %{ + email: email, + password: password + }) + |> Ash.read_one() + + assert signed_in_user.id == user.id + assert to_string(signed_in_user.email) == email + end + + test "AshAuthentication OIDC strategy still works with email" do + # This test ensures the OIDC flow can still set email + user_info = %{ + "preferred_username" => "oidc@example.com", + "sub" => "oidc-user-123" + } + + oauth_tokens = %{"access_token" => "mock_token"} + + # Simulate OIDC registration + {:ok, user} = + Mv.Accounts.User + |> Ash.Changeset.for_create(:register_with_rauthy, %{ + user_info: user_info, + oauth_tokens: oauth_tokens + }) + |> Ash.create() + + assert to_string(user.email) == "oidc@example.com" + assert user.oidc_id == "oidc-user-123" + end + end +end diff --git a/test/membership/member_email_sync_test.exs b/test/membership/member_email_sync_test.exs new file mode 100644 index 0000000..eeef210 --- /dev/null +++ b/test/membership/member_email_sync_test.exs @@ -0,0 +1,127 @@ +defmodule Mv.Membership.MemberEmailSyncTest do + @moduledoc """ + Tests for email synchronization from Member to User. + When a member and user are linked, email changes should sync bidirectionally. + User.email is the source of truth when linking occurs. + """ + use Mv.DataCase, async: false + alias Mv.Accounts + alias Mv.Membership + + describe "Member email synchronization to linked User" do + @valid_user_attrs %{ + email: "user@example.com" + } + + @valid_member_attrs %{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + } + + test "updating member email syncs to linked user" do + # Create a user + {:ok, user} = Accounts.create_user(@valid_user_attrs) + assert to_string(user.email) == "user@example.com" + + # Create a member linked to the user + {:ok, member} = + Membership.create_member(Map.put(@valid_member_attrs, :user, %{id: user.id})) + + # Verify initial state - member email should be overridden by user email + {:ok, member_after_create} = Ash.get(Mv.Membership.Member, member.id) + assert member_after_create.email == "user@example.com" + + # Update member email + {:ok, updated_member} = + Membership.update_member(member, %{email: "newmember@example.com"}) + + assert updated_member.email == "newmember@example.com" + + # Verify user email was also updated + {:ok, synced_user} = Ash.get(Mv.Accounts.User, user.id) + assert to_string(synced_user.email) == "newmember@example.com" + end + + test "creating member linked to user syncs user email to member" do + # Create a user with their own email + {:ok, user} = Accounts.create_user(@valid_user_attrs) + assert to_string(user.email) == "user@example.com" + + # Create a member linked to this user + {:ok, member} = + Membership.create_member(Map.put(@valid_member_attrs, :user, %{id: user.id})) + + # Member should have been created with user's email (user is source of truth) + assert member.email == "user@example.com" + + # Verify the link + {:ok, loaded_member} = Ash.get(Mv.Membership.Member, member.id, load: [:user]) + assert loaded_member.user.id == user.id + end + + test "linking member to existing user syncs user email to member" do + # Create a standalone user + {:ok, user} = Accounts.create_user(@valid_user_attrs) + assert to_string(user.email) == "user@example.com" + + # Create a standalone member + {:ok, member} = Membership.create_member(@valid_member_attrs) + assert member.email == "member@example.com" + + # Link the member to the user + {:ok, linked_member} = Membership.update_member(member, %{user: %{id: user.id}}) + + # Verify the link + {:ok, loaded_member} = Ash.get(Mv.Membership.Member, linked_member.id, load: [:user]) + assert loaded_member.user.id == user.id + + # Verify member email was overridden with user email + assert loaded_member.email == "user@example.com" + end + + test "updating member email when no user linked does not error" do + # Create a standalone member without user link + {:ok, member} = Membership.create_member(@valid_member_attrs) + assert member.email == "member@example.com" + + # Load to verify no user link + {:ok, loaded_member} = Ash.get(Mv.Membership.Member, member.id, load: [:user]) + assert loaded_member.user == nil + + # Update member email - should work fine without error + {:ok, updated_member} = + Membership.update_member(member, %{email: "newemail@example.com"}) + + assert updated_member.email == "newemail@example.com" + end + + test "unlinking member from user does not sync email" do + # Create user + {:ok, user} = Accounts.create_user(@valid_user_attrs) + + # Create member linked to user + {:ok, member} = + Membership.create_member(Map.put(@valid_member_attrs, :user, %{id: user.id})) + + # Verify member email was synced to user email + {:ok, synced_member} = Ash.get(Mv.Membership.Member, member.id) + assert synced_member.email == "user@example.com" + + # Verify link exists + {:ok, loaded_member} = Ash.get(Mv.Membership.Member, member.id, load: [:user]) + assert loaded_member.user != nil + + # Unlink member from user + {:ok, unlinked_member} = Membership.update_member(member, %{user: nil}) + + # Verify unlink + {:ok, loaded_unlinked} = Ash.get(Mv.Membership.Member, unlinked_member.id, load: [:user]) + assert loaded_unlinked.user == nil + + # User email should remain unchanged after unlinking + {:ok, user_after_unlink} = Ash.get(Mv.Accounts.User, user.id) + assert to_string(user_after_unlink.email) == "user@example.com" + end + end +end From 5a0a261cd602a6d72b877c6e82c017936285e349 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 16 Oct 2025 17:51:31 +0200 Subject: [PATCH 004/119] add action changes for email sync --- lib/accounts/user.ex | 22 +++++ lib/membership/member.ex | 16 ++++ .../changes/override_member_email_on_link.ex | 47 ++++++++++ .../user/changes/sync_email_to_member.ex | 55 +++++++++++ lib/mv/email_sync/helpers.ex | 93 +++++++++++++++++++ .../override_email_from_user_on_link.ex | 45 +++++++++ .../member/changes/sync_email_to_user.ex | 53 +++++++++++ 7 files changed, 331 insertions(+) create mode 100644 lib/mv/accounts/user/changes/override_member_email_on_link.ex create mode 100644 lib/mv/accounts/user/changes/sync_email_to_member.ex create mode 100644 lib/mv/email_sync/helpers.ex create mode 100644 lib/mv/membership/member/changes/override_email_from_user_on_link.ex create mode 100644 lib/mv/membership/member/changes/sync_email_to_user.ex diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index 668ddd4..7101e16 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -89,6 +89,9 @@ defmodule Mv.Accounts.User do # cannot be executed atomically. These validations need to query the database and perform # complex checks that are not supported in atomic operations. require_atomic? false + + # Sync email changes to linked member + change Mv.Accounts.User.Changes.SyncEmailToMember end create :create_user do @@ -111,6 +114,9 @@ defmodule Mv.Accounts.User do # If no member provided, that's fine (optional relationship) on_missing: :ignore ) + + # Override member email with user email when linking + change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink end update :update_user do @@ -137,6 +143,11 @@ defmodule Mv.Accounts.User do # If no member provided, remove existing relationship (allows member removal) on_missing: :unrelate ) + + # Sync email changes to linked member + change Mv.Accounts.User.Changes.SyncEmailToMember + # Override member email with user email when linking + change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink end # Admin action for direct password changes in admin panel @@ -185,6 +196,9 @@ defmodule Mv.Accounts.User do |> Ash.Changeset.change_attribute(:email, user_info["preferred_username"]) |> Ash.Changeset.change_attribute(:oidc_id, user_info["sub"] || user_info["id"]) end + + # Override member email with user email when linking (if member relationship exists) + change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink end end @@ -255,6 +269,14 @@ defmodule Mv.Accounts.User do attributes do uuid_primary_key :id + # IMPORTANT: Email Synchronization + # When user and member are linked, emails are automatically synced bidirectionally. + # User.email is the source of truth - when a link is established, member.email + # is overridden to match user.email. Subsequent changes to either email will + # sync to the other resource. + # See: Mv.Accounts.User.Changes.SyncEmailToMember + # Mv.Accounts.User.Changes.OverrideMemberEmailOnLink + # Mv.Membership.Member.Changes.SyncEmailToUser attribute :email, :ci_string do allow_nil? false public? true diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 4cec072..9330922 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -48,6 +48,9 @@ defmodule Mv.Membership.Member do # If no user provided, that's fine (optional relationship) on_missing: :ignore ) + + # Override member email with user email when linking + change Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink end update :update_member do @@ -89,6 +92,11 @@ defmodule Mv.Membership.Member do # If no user provided, remove existing relationship (allows user removal) on_missing: :unrelate ) + + # Override member email with user email when linking + change Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink + # Sync email changes to linked user + change Mv.Membership.Member.Changes.SyncEmailToUser end end @@ -189,6 +197,14 @@ defmodule Mv.Membership.Member do constraints min_length: 1 end + # IMPORTANT: Email Synchronization + # When member and user are linked, emails are automatically synced bidirectionally. + # User.email is the source of truth - when a link is established, member.email + # is overridden to match user.email. Subsequent changes to either email will + # sync to the other resource. + # See: Mv.Membership.Member.Changes.SyncEmailToUser + # Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink + # Mv.Accounts.User.Changes.SyncEmailToMember attribute :email, :string do allow_nil? false constraints min_length: 5, max_length: 254 diff --git a/lib/mv/accounts/user/changes/override_member_email_on_link.ex b/lib/mv/accounts/user/changes/override_member_email_on_link.ex new file mode 100644 index 0000000..7361718 --- /dev/null +++ b/lib/mv/accounts/user/changes/override_member_email_on_link.ex @@ -0,0 +1,47 @@ +defmodule Mv.Accounts.User.Changes.OverrideMemberEmailOnLink do + @moduledoc """ + Overrides member email with user email when linking a user to a member. + + When a user is linked to a member (either during creation or update), + this change ensures that the member's email is updated to match the user's email. + + User.email is the source of truth when a link is established. + + Uses `around_transaction` to guarantee atomicity - both the user + creation/update and member email override happen in the SAME database transaction. + """ + use Ash.Resource.Change + alias Mv.EmailSync.Helpers + + @impl true + def change(changeset, _opts, context) do + # Skip if already syncing to avoid recursion + if Map.get(context, :syncing_email, false) do + changeset + else + # around_transaction receives the changeset (cs) from Ash + # and a callback that executes the actual database operation + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, user} <- Helpers.extract_record(result), + linked_member <- get_linked_member(user) do + Helpers.sync_email_to_linked_record(result, linked_member, user.email) + else + _ -> result + end + end) + end + end + + # Pattern match on nil member_id - no member linked + defp get_linked_member(%{member_id: nil}), do: nil + + # Load linked member by ID + defp get_linked_member(%{member_id: id}) do + case Ash.get(Mv.Membership.Member, id) do + {:ok, member} -> member + {:error, _} -> nil + end + end +end diff --git a/lib/mv/accounts/user/changes/sync_email_to_member.ex b/lib/mv/accounts/user/changes/sync_email_to_member.ex new file mode 100644 index 0000000..553ca91 --- /dev/null +++ b/lib/mv/accounts/user/changes/sync_email_to_member.ex @@ -0,0 +1,55 @@ +defmodule Mv.Accounts.User.Changes.SyncEmailToMember do + @moduledoc """ + Synchronizes user email changes to the linked member. + + When a user's email is updated and the user is linked to a member, + this change automatically updates the member's email to match. + + This ensures bidirectional email synchronization with User.email + as the source of truth. + + Uses `around_transaction` to guarantee atomicity - both the user + and member updates happen in the SAME database transaction. + """ + use Ash.Resource.Change + alias Mv.EmailSync.Helpers + + @impl true + def change(changeset, _opts, context) do + cond do + # Skip if already syncing to avoid recursion + Map.get(context, :syncing_email, false) -> + changeset + + # Only proceed if email is actually changing + not Ash.Changeset.changing_attribute?(changeset, :email) -> + changeset + + # Apply the sync logic + true -> + new_email = Ash.Changeset.get_attribute(changeset, :email) + + # around_transaction receives the changeset (cs) from Ash + # and a callback that executes the actual database operation + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, user} <- Helpers.extract_record(result), + linked_member <- get_linked_member(user) do + Helpers.sync_email_to_linked_record(result, linked_member, new_email) + else + _ -> result + end + end) + end + end + + defp get_linked_member(%{member_id: nil}), do: nil + + defp get_linked_member(%{member_id: member_id}) do + case Ash.get(Mv.Membership.Member, member_id) do + {:ok, member} -> member + {:error, _} -> nil + end + end +end diff --git a/lib/mv/email_sync/helpers.ex b/lib/mv/email_sync/helpers.ex new file mode 100644 index 0000000..7feaf57 --- /dev/null +++ b/lib/mv/email_sync/helpers.ex @@ -0,0 +1,93 @@ +defmodule Mv.EmailSync.Helpers do + @moduledoc """ + Shared helper functions for email synchronization between User and Member. + + Handles the complexity of `around_transaction` callback results and + provides clean abstractions for email updates within transactions. + """ + + require Logger + import Ecto.Changeset + + @doc """ + Extracts the record from an Ash action result. + + Handles both 2-tuple `{:ok, record}` and 4-tuple + `{:ok, record, changeset, notifications}` patterns. + """ + def extract_record({:ok, record, _changeset, _notifications}), do: {:ok, record} + def extract_record({:ok, record}), do: {:ok, record} + def extract_record({:error, _} = error), do: error + + @doc """ + Updates the result with a new record while preserving the original structure. + + If the original result was a 4-tuple, returns a 4-tuple with the updated record. + If it was a 2-tuple, returns a 2-tuple with the updated record. + """ + def update_result_record({:ok, _old_record, changeset, notifications}, new_record) do + {:ok, new_record, changeset, notifications} + end + + def update_result_record({:ok, _old_record}, new_record) do + {:ok, new_record} + end + + @doc """ + Updates an email field directly via Ecto within the current transaction. + + This bypasses Ash's action system to ensure the update happens in the + same database transaction as the parent action. + """ + def update_email_via_ecto(record, new_email) do + record + |> cast(%{email: to_string(new_email)}, [:email]) + |> Mv.Repo.update() + end + + @doc """ + Synchronizes email to a linked record if it exists. + + Returns the original result unchanged, or an error if sync fails. + """ + def sync_email_to_linked_record(result, linked_record, new_email) do + with {:ok, _source} <- extract_record(result), + record when not is_nil(record) <- linked_record, + {:ok, _updated} <- update_email_via_ecto(record, new_email) do + # Successfully synced - return original result unchanged + result + else + nil -> + # No linked record - return original result + result + + {:error, error} -> + # Sync failed - log and propagate error to rollback transaction + Logger.error("Email sync failed: #{inspect(error)}") + {:error, error} + end + end + + @doc """ + Overrides the record's email with the linked email if emails differ. + + Returns updated result with new record, or original result if no update needed. + """ + def override_with_linked_email(result, linked_email) do + with {:ok, record} <- extract_record(result), + true <- record.email != to_string(linked_email), + {:ok, updated_record} <- update_email_via_ecto(record, linked_email) do + # Email was different - return result with updated record + update_result_record(result, updated_record) + else + false -> + # Emails already match - no update needed + result + + {:error, error} -> + # Override failed - log and propagate error + Logger.error("Email override failed: #{inspect(error)}") + {:error, error} + end + end +end diff --git a/lib/mv/membership/member/changes/override_email_from_user_on_link.ex b/lib/mv/membership/member/changes/override_email_from_user_on_link.ex new file mode 100644 index 0000000..b55a696 --- /dev/null +++ b/lib/mv/membership/member/changes/override_email_from_user_on_link.ex @@ -0,0 +1,45 @@ +defmodule Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink do + @moduledoc """ + Overrides member email with user email when linking a member to a user. + + When a member is linked to a user (either during creation or update), + this change ensures that the member's email is updated to match the user's email. + + User.email is the source of truth when a link is established. + + Uses `around_transaction` to guarantee atomicity - both the member + creation/update and email override happen in the SAME database transaction. + """ + use Ash.Resource.Change + alias Mv.EmailSync.Helpers + + @impl true + def change(changeset, _opts, context) do + # Skip if already syncing to avoid recursion + if Map.get(context, :syncing_email, false) do + changeset + else + # around_transaction receives the changeset (cs) from Ash + # and a callback that executes the actual database operation + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, member} <- Helpers.extract_record(result), + {:ok, user} <- load_linked_user(member) do + Helpers.override_with_linked_email(result, user.email) + else + _ -> result + end + end) + end + end + + # Load the linked user, returning error tuple if not linked + defp load_linked_user(member) do + case Ash.load(member, :user) do + {:ok, %{user: user}} when not is_nil(user) -> {:ok, user} + {:ok, _} -> {:error, :no_linked_user} + {:error, _} = error -> error + end + end +end diff --git a/lib/mv/membership/member/changes/sync_email_to_user.ex b/lib/mv/membership/member/changes/sync_email_to_user.ex new file mode 100644 index 0000000..eac41d5 --- /dev/null +++ b/lib/mv/membership/member/changes/sync_email_to_user.ex @@ -0,0 +1,53 @@ +defmodule Mv.Membership.Member.Changes.SyncEmailToUser do + @moduledoc """ + Synchronizes member email changes to the linked user. + + When a member's email is updated and the member is linked to a user, + this change automatically updates the user's email to match. + + This ensures bidirectional email synchronization. + + Uses `around_transaction` to guarantee atomicity - both the member + and user updates happen in the SAME database transaction. + """ + use Ash.Resource.Change + alias Mv.EmailSync.Helpers + + @impl true + def change(changeset, _opts, context) do + cond do + # Skip if already syncing to avoid recursion + Map.get(context, :syncing_email, false) -> + changeset + + # Only proceed if email is actually changing + not Ash.Changeset.changing_attribute?(changeset, :email) -> + changeset + + # Apply the sync logic + true -> + new_email = Ash.Changeset.get_attribute(changeset, :email) + + # around_transaction receives the changeset (cs) from Ash + # and a callback that executes the actual database operation + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, member} <- Helpers.extract_record(result), + linked_user <- get_linked_user(member) do + Helpers.sync_email_to_linked_record(result, linked_user, new_email) + else + _ -> result + end + end) + end + end + + # Load the linked user relationship (returns nil if not linked) + defp get_linked_user(member) do + case Ash.load(member, :user) do + {:ok, %{user: user}} -> user + {:error, _} -> nil + end + end +end From 39afaf3999f66c5353bd9519e56b4ad13e9f74d9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 17 Oct 2025 14:21:23 +0200 Subject: [PATCH 005/119] feat: email uniqueness constraint between user and member --- lib/accounts/user.ex | 19 +- lib/membership/member.ex | 4 + .../email_not_used_by_other_member.ex | 52 +++++ .../email_not_used_by_other_user.ex | 59 +++++ test/accounts/email_uniqueness_test.exs | 201 ++++++++++++++++++ 5 files changed, 329 insertions(+), 6 deletions(-) create mode 100644 lib/mv/accounts/user/validations/email_not_used_by_other_member.ex create mode 100644 lib/mv/membership/member/validations/email_not_used_by_other_user.ex create mode 100644 test/accounts/email_uniqueness_test.exs diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index 7101e16..278e71a 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -66,14 +66,17 @@ defmodule Mv.Accounts.User do end actions do - # Default actions kept for framework/tooling integration: - # - :create -> Used by AshAdmin's generated "Create" UI and by generic - # AshPhoenix helpers that assume a default create action. - # It does NOT manage the :member relationship. For admin - # flows that may link an existing member, use :create_user. + # Default actions for framework/tooling integration: # - :read -> Standard read used across the app and by admin tooling. # - :destroy-> Standard delete used by admin tooling and maintenance tasks. - defaults [:read, :create, :destroy] + # + # NOTE: :create is INTENTIONALLY excluded from defaults! + # Using a default :create would bypass email-synchronization logic. + # Always use one of these explicit create actions instead: + # - :create_user (for manual user creation with optional member link) + # - :register_with_password (for password-based registration) + # - :register_with_rauthy (for OIDC-based registration) + defaults [:read, :destroy] # Primary generic update action: # - Selected by AshAdmin's generated "Edit" UI and generic AshPhoenix @@ -209,6 +212,10 @@ defmodule Mv.Accounts.User do where: [action_is([:register_with_password, :admin_set_password])], message: "must have length of at least 8" + # Email uniqueness check for all actions that change the email attribute + # Validates that user email is not already used by another (unlinked) member + validate Mv.Accounts.User.Validations.EmailNotUsedByOtherMember + # Email validation with EctoCommons.EmailValidator (same as Member) # This ensures consistency between User and Member email validation validate fn changeset, _ -> diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 9330922..a0799fd 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -108,6 +108,10 @@ defmodule Mv.Membership.Member do validate present(:last_name) validate present(:email) + # Email uniqueness check for all actions that change the email attribute + # Validates that member email is not already used by another (unlinked) user + validate Mv.Membership.Member.Validations.EmailNotUsedByOtherUser + # Prevent linking to a user that already has a member # This validation prevents "stealing" users from other members by checking # if the target user is already linked to a different member diff --git a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex new file mode 100644 index 0000000..cf3c624 --- /dev/null +++ b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex @@ -0,0 +1,52 @@ +defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do + @moduledoc """ + Validates that the user's email is not already used by another member + (unless that member is linked to this user). + + This prevents email conflicts when syncing between users and members. + """ + use Ash.Resource.Validation + + @impl true + def validate(changeset, _opts, _context) do + case Ash.Changeset.fetch_change(changeset, :email) do + {:ok, new_email} -> + check_email_not_used_by_other_member(changeset, new_email) + + :error -> + # Email not being changed + :ok + end + end + + defp check_email_not_used_by_other_member(changeset, new_email) do + member_id = Ash.Changeset.get_attribute(changeset, :member_id) + + # Check if any member has this email + # Exclude the member linked to this user (if any) + query = + Mv.Membership.Member + |> Ash.Query.filter(email == ^to_string(new_email)) + |> then(fn q -> + if member_id do + Ash.Query.filter(q, id != ^member_id) + else + q + end + end) + + case Ash.read(query) do + {:ok, []} -> + # No conflicting member found + :ok + + {:ok, members} when is_list(members) and length(members) > 0 -> + # Email is already used by another member + {:error, field: :email, message: "is already used by another member", value: new_email} + + {:error, _} -> + # Error reading members - be safe and allow + :ok + end + end +end diff --git a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex new file mode 100644 index 0000000..f48613b --- /dev/null +++ b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex @@ -0,0 +1,59 @@ +defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do + @moduledoc """ + Validates that the member's email is not already used by another user + (unless that user is linked to this member). + + This prevents email conflicts when syncing between users and members. + """ + use Ash.Resource.Validation + + @impl true + def validate(changeset, _opts, _context) do + case Ash.Changeset.fetch_change(changeset, :email) do + {:ok, new_email} -> + check_email_not_used_by_other_user(changeset, new_email) + + :error -> + # Email not being changed + :ok + end + end + + defp check_email_not_used_by_other_user(changeset, new_email) do + # Load the user relationship to check if this member is linked to a user + member_with_user = + case Ash.load(changeset.data, :user) do + {:ok, loaded} -> loaded + {:error, _} -> changeset.data + end + + linked_user_id = if member_with_user.user, do: member_with_user.user.id, else: nil + + # Check if any user has this email (case-insensitive) + # Exclude the user linked to this member (if any) + query = + Mv.Accounts.User + |> Ash.Query.filter(email == ^new_email) + |> then(fn q -> + if linked_user_id do + Ash.Query.filter(q, id != ^linked_user_id) + else + q + end + end) + + case Ash.read(query) do + {:ok, []} -> + # No conflicting user found + :ok + + {:ok, users} when is_list(users) and length(users) > 0 -> + # Email is already used by another user + {:error, field: :email, message: "is already used by another user", value: new_email} + + {:error, _} -> + # Error reading users - be safe and allow + :ok + end + end +end diff --git a/test/accounts/email_uniqueness_test.exs b/test/accounts/email_uniqueness_test.exs new file mode 100644 index 0000000..8665c48 --- /dev/null +++ b/test/accounts/email_uniqueness_test.exs @@ -0,0 +1,201 @@ +defmodule Mv.Accounts.EmailUniquenessTest do + use Mv.DataCase, async: false + + alias Mv.Accounts + alias Mv.Membership + + describe "Email uniqueness validation" do + test "cannot create member with existing unlinked user email" do + # Create a user with email + {:ok, _user} = + Accounts.create_user(%{ + email: "existing@example.com" + }) + + # Try to create member with same email + result = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "existing@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "cannot create user with existing unlinked member email" do + # Create a member with email + {:ok, _member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "existing@example.com" + }) + + # Try to create user with same email + result = + Accounts.create_user(%{ + email: "existing@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "member email cannot be changed to an existing unlinked user email" do + # Create a user with email + {:ok, user} = + Accounts.create_user(%{ + email: "existing_user@example.com" + }) + + # Create a member with different email + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + }) + + # Try to change member email to existing user email + result = + Membership.update_member(member, %{ + email: "existing_user@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "user email cannot be changed to an existing unlinked member email" do + # Create a member with email + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "existing_member@example.com" + }) + + # Create a user with different email + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + # Try to change user email to existing member email + result = + Accounts.update_user(user, %{ + email: "existing_member@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "member email syncs to linked user email without validation error" do + # Create a user + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + # Create a member linked to this user + # The override change will set member.email = user.email automatically + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "member@example.com", + user: %{id: user.id} + }) + + # Member email should have been overridden to user email + # This happens through our sync mechanism, which should NOT trigger + # the "email already used" validation because it's the same user + {:ok, member_after_link} = Ash.get(Mv.Membership.Member, member.id) + assert member_after_link.email == "user@example.com" + end + + test "user email syncs to linked member without validation error" do + # Create a member + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + }) + + # Create a user linked to this member + # The override change will set member.email = user.email automatically + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com", + member: %{id: member.id} + }) + + # Member email should have been overridden to user email + # This happens through our sync mechanism, which should NOT trigger + # the "email already used" validation because it's the same member + {:ok, member_after_link} = Ash.get(Mv.Membership.Member, member.id) + assert member_after_link.email == "user@example.com" + end + + test "two unlinked users cannot have the same email" do + # Create first user + {:ok, _user1} = + Accounts.create_user(%{ + email: "duplicate@example.com" + }) + + # Try to create second user with same email + result = + Accounts.create_user(%{ + email: "duplicate@example.com" + }) + + assert {:error, %Ash.Error.Invalid{}} = result + end + + test "two unlinked members cannot have the same email (members have unique constraint)" do + # Create first member + {:ok, _member1} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "duplicate@example.com" + }) + + # Try to create second member with same email - should fail + result = + Membership.create_member(%{ + first_name: "Jane", + last_name: "Smith", + email: "duplicate@example.com" + }) + + assert {:error, %Ash.Error.Invalid{}} = result + # Members DO have a unique email constraint at database level + end + end +end From 752272494544d409e8aaadb114bd79470d208793 Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 17 Oct 2025 14:33:25 +0200 Subject: [PATCH 006/119] refactor: email sync changes --- .../changes/override_member_email_on_link.ex | 43 +++++--------- .../user/changes/sync_email_to_member.ex | 57 ++++++------------- lib/mv/email_sync/loader.ex | 40 +++++++++++++ .../override_email_from_user_on_link.ex | 43 +++++--------- .../member/changes/sync_email_to_user.ex | 57 ++++++------------- 5 files changed, 102 insertions(+), 138 deletions(-) create mode 100644 lib/mv/email_sync/loader.ex diff --git a/lib/mv/accounts/user/changes/override_member_email_on_link.ex b/lib/mv/accounts/user/changes/override_member_email_on_link.ex index 7361718..b142a96 100644 --- a/lib/mv/accounts/user/changes/override_member_email_on_link.ex +++ b/lib/mv/accounts/user/changes/override_member_email_on_link.ex @@ -1,47 +1,30 @@ defmodule Mv.Accounts.User.Changes.OverrideMemberEmailOnLink do @moduledoc """ - Overrides member email with user email when linking a user to a member. - - When a user is linked to a member (either during creation or update), - this change ensures that the member's email is updated to match the user's email. - + Overrides member email with user email when linking. User.email is the source of truth when a link is established. - - Uses `around_transaction` to guarantee atomicity - both the user - creation/update and member email override happen in the SAME database transaction. """ use Ash.Resource.Change - alias Mv.EmailSync.Helpers + alias Mv.EmailSync.{Helpers, Loader} @impl true def change(changeset, _opts, context) do - # Skip if already syncing to avoid recursion if Map.get(context, :syncing_email, false) do changeset else - # around_transaction receives the changeset (cs) from Ash - # and a callback that executes the actual database operation - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, user} <- Helpers.extract_record(result), - linked_member <- get_linked_member(user) do - Helpers.sync_email_to_linked_record(result, linked_member, user.email) - else - _ -> result - end - end) + override_email(changeset) end end - # Pattern match on nil member_id - no member linked - defp get_linked_member(%{member_id: nil}), do: nil + defp override_email(changeset) do + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) - # Load linked member by ID - defp get_linked_member(%{member_id: id}) do - case Ash.get(Mv.Membership.Member, id) do - {:ok, member} -> member - {:error, _} -> nil - end + with {:ok, user} <- Helpers.extract_record(result), + linked_member <- Loader.get_linked_member(user) do + Helpers.sync_email_to_linked_record(result, linked_member, user.email) + else + _ -> result + end + end) end end diff --git a/lib/mv/accounts/user/changes/sync_email_to_member.ex b/lib/mv/accounts/user/changes/sync_email_to_member.ex index 553ca91..a007dae 100644 --- a/lib/mv/accounts/user/changes/sync_email_to_member.ex +++ b/lib/mv/accounts/user/changes/sync_email_to_member.ex @@ -1,55 +1,32 @@ defmodule Mv.Accounts.User.Changes.SyncEmailToMember do @moduledoc """ Synchronizes user email changes to the linked member. - - When a user's email is updated and the user is linked to a member, - this change automatically updates the member's email to match. - - This ensures bidirectional email synchronization with User.email - as the source of truth. - - Uses `around_transaction` to guarantee atomicity - both the user - and member updates happen in the SAME database transaction. + Uses `around_transaction` for atomicity - both updates in the same transaction. """ use Ash.Resource.Change - alias Mv.EmailSync.Helpers + alias Mv.EmailSync.{Helpers, Loader} @impl true def change(changeset, _opts, context) do cond do - # Skip if already syncing to avoid recursion - Map.get(context, :syncing_email, false) -> - changeset - - # Only proceed if email is actually changing - not Ash.Changeset.changing_attribute?(changeset, :email) -> - changeset - - # Apply the sync logic - true -> - new_email = Ash.Changeset.get_attribute(changeset, :email) - - # around_transaction receives the changeset (cs) from Ash - # and a callback that executes the actual database operation - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, user} <- Helpers.extract_record(result), - linked_member <- get_linked_member(user) do - Helpers.sync_email_to_linked_record(result, linked_member, new_email) - else - _ -> result - end - end) + Map.get(context, :syncing_email, false) -> changeset + not Ash.Changeset.changing_attribute?(changeset, :email) -> changeset + true -> sync_email(changeset) end end - defp get_linked_member(%{member_id: nil}), do: nil + defp sync_email(changeset) do + new_email = Ash.Changeset.get_attribute(changeset, :email) - defp get_linked_member(%{member_id: member_id}) do - case Ash.get(Mv.Membership.Member, member_id) do - {:ok, member} -> member - {:error, _} -> nil - end + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, user} <- Helpers.extract_record(result), + linked_member <- Loader.get_linked_member(user) do + Helpers.sync_email_to_linked_record(result, linked_member, new_email) + else + _ -> result + end + end) end end diff --git a/lib/mv/email_sync/loader.ex b/lib/mv/email_sync/loader.ex new file mode 100644 index 0000000..ecb1038 --- /dev/null +++ b/lib/mv/email_sync/loader.ex @@ -0,0 +1,40 @@ +defmodule Mv.EmailSync.Loader do + @moduledoc """ + Helper functions for loading linked records in email synchronization. + Centralizes the logic for retrieving related User/Member entities. + """ + + @doc """ + Loads the member linked to a user, returns nil if not linked or on error. + """ + def get_linked_member(%{member_id: nil}), do: nil + + def get_linked_member(%{member_id: id}) do + case Ash.get(Mv.Membership.Member, id) do + {:ok, member} -> member + {:error, _} -> nil + end + end + + @doc """ + Loads the user linked to a member, returns nil if not linked or on error. + """ + def get_linked_user(member) do + case Ash.load(member, :user) do + {:ok, %{user: user}} -> user + {:error, _} -> nil + end + end + + @doc """ + Loads the user linked to a member, returning an error tuple if not linked. + Useful when a link is required for the operation. + """ + def load_linked_user!(member) do + case Ash.load(member, :user) do + {:ok, %{user: user}} when not is_nil(user) -> {:ok, user} + {:ok, _} -> {:error, :no_linked_user} + {:error, _} = error -> error + end + end +end diff --git a/lib/mv/membership/member/changes/override_email_from_user_on_link.ex b/lib/mv/membership/member/changes/override_email_from_user_on_link.ex index b55a696..f8ccd98 100644 --- a/lib/mv/membership/member/changes/override_email_from_user_on_link.ex +++ b/lib/mv/membership/member/changes/override_email_from_user_on_link.ex @@ -1,45 +1,30 @@ defmodule Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink do @moduledoc """ - Overrides member email with user email when linking a member to a user. - - When a member is linked to a user (either during creation or update), - this change ensures that the member's email is updated to match the user's email. - + Overrides member email with user email when linking. User.email is the source of truth when a link is established. - - Uses `around_transaction` to guarantee atomicity - both the member - creation/update and email override happen in the SAME database transaction. """ use Ash.Resource.Change - alias Mv.EmailSync.Helpers + alias Mv.EmailSync.{Helpers, Loader} @impl true def change(changeset, _opts, context) do - # Skip if already syncing to avoid recursion if Map.get(context, :syncing_email, false) do changeset else - # around_transaction receives the changeset (cs) from Ash - # and a callback that executes the actual database operation - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, member} <- Helpers.extract_record(result), - {:ok, user} <- load_linked_user(member) do - Helpers.override_with_linked_email(result, user.email) - else - _ -> result - end - end) + override_email(changeset) end end - # Load the linked user, returning error tuple if not linked - defp load_linked_user(member) do - case Ash.load(member, :user) do - {:ok, %{user: user}} when not is_nil(user) -> {:ok, user} - {:ok, _} -> {:error, :no_linked_user} - {:error, _} = error -> error - end + defp override_email(changeset) do + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, member} <- Helpers.extract_record(result), + {:ok, user} <- Loader.load_linked_user!(member) do + Helpers.override_with_linked_email(result, user.email) + else + _ -> result + end + end) end end diff --git a/lib/mv/membership/member/changes/sync_email_to_user.ex b/lib/mv/membership/member/changes/sync_email_to_user.ex index eac41d5..8363584 100644 --- a/lib/mv/membership/member/changes/sync_email_to_user.ex +++ b/lib/mv/membership/member/changes/sync_email_to_user.ex @@ -1,53 +1,32 @@ defmodule Mv.Membership.Member.Changes.SyncEmailToUser do @moduledoc """ Synchronizes member email changes to the linked user. - - When a member's email is updated and the member is linked to a user, - this change automatically updates the user's email to match. - - This ensures bidirectional email synchronization. - - Uses `around_transaction` to guarantee atomicity - both the member - and user updates happen in the SAME database transaction. + Uses `around_transaction` for atomicity - both updates in the same transaction. """ use Ash.Resource.Change - alias Mv.EmailSync.Helpers + alias Mv.EmailSync.{Helpers, Loader} @impl true def change(changeset, _opts, context) do cond do - # Skip if already syncing to avoid recursion - Map.get(context, :syncing_email, false) -> - changeset - - # Only proceed if email is actually changing - not Ash.Changeset.changing_attribute?(changeset, :email) -> - changeset - - # Apply the sync logic - true -> - new_email = Ash.Changeset.get_attribute(changeset, :email) - - # around_transaction receives the changeset (cs) from Ash - # and a callback that executes the actual database operation - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, member} <- Helpers.extract_record(result), - linked_user <- get_linked_user(member) do - Helpers.sync_email_to_linked_record(result, linked_user, new_email) - else - _ -> result - end - end) + Map.get(context, :syncing_email, false) -> changeset + not Ash.Changeset.changing_attribute?(changeset, :email) -> changeset + true -> sync_email(changeset) end end - # Load the linked user relationship (returns nil if not linked) - defp get_linked_user(member) do - case Ash.load(member, :user) do - {:ok, %{user: user}} -> user - {:error, _} -> nil - end + defp sync_email(changeset) do + new_email = Ash.Changeset.get_attribute(changeset, :email) + + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, member} <- Helpers.extract_record(result), + linked_user <- Loader.get_linked_user(member) do + Helpers.sync_email_to_linked_record(result, linked_user, new_email) + else + _ -> result + end + end) end end From 2693f67d3324ab83cfd28601cc628894f03279c6 Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 17 Oct 2025 14:34:04 +0200 Subject: [PATCH 007/119] refactor: email validations --- .../email_not_used_by_other_member.ex | 32 ++++--------- .../email_not_used_by_other_user.ex | 46 +++++++------------ 2 files changed, 27 insertions(+), 51 deletions(-) diff --git a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex index cf3c624..d3cb776 100644 --- a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex +++ b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex @@ -1,9 +1,7 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do @moduledoc """ - Validates that the user's email is not already used by another member - (unless that member is linked to this user). - - This prevents email conflicts when syncing between users and members. + Validates that the user's email is not already used by another member. + Allows syncing with linked member (excludes member_id from check). """ use Ash.Resource.Validation @@ -11,42 +9,32 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do def validate(changeset, _opts, _context) do case Ash.Changeset.fetch_change(changeset, :email) do {:ok, new_email} -> - check_email_not_used_by_other_member(changeset, new_email) + member_id = Ash.Changeset.get_attribute(changeset, :member_id) + check_email_uniqueness(new_email, member_id) :error -> - # Email not being changed :ok end end - defp check_email_not_used_by_other_member(changeset, new_email) do - member_id = Ash.Changeset.get_attribute(changeset, :member_id) - - # Check if any member has this email - # Exclude the member linked to this user (if any) + defp check_email_uniqueness(new_email, exclude_member_id) do query = Mv.Membership.Member |> Ash.Query.filter(email == ^to_string(new_email)) - |> then(fn q -> - if member_id do - Ash.Query.filter(q, id != ^member_id) - else - q - end - end) + |> maybe_exclude_id(exclude_member_id) case Ash.read(query) do {:ok, []} -> - # No conflicting member found :ok - {:ok, members} when is_list(members) and length(members) > 0 -> - # Email is already used by another member + {:ok, _} -> {:error, field: :email, message: "is already used by another member", value: new_email} {:error, _} -> - # Error reading members - be safe and allow :ok end end + + defp maybe_exclude_id(query, nil), do: query + defp maybe_exclude_id(query, id), do: Ash.Query.filter(query, id != ^id) end diff --git a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex index f48613b..6c544b5 100644 --- a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex +++ b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex @@ -1,9 +1,7 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do @moduledoc """ - Validates that the member's email is not already used by another user - (unless that user is linked to this member). - - This prevents email conflicts when syncing between users and members. + Validates that the member's email is not already used by another user. + Allows syncing with linked user (excludes linked user from check). """ use Ash.Resource.Validation @@ -11,49 +9,39 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do def validate(changeset, _opts, _context) do case Ash.Changeset.fetch_change(changeset, :email) do {:ok, new_email} -> - check_email_not_used_by_other_user(changeset, new_email) + linked_user_id = get_linked_user_id(changeset.data) + check_email_uniqueness(new_email, linked_user_id) :error -> - # Email not being changed :ok end end - defp check_email_not_used_by_other_user(changeset, new_email) do - # Load the user relationship to check if this member is linked to a user - member_with_user = - case Ash.load(changeset.data, :user) do - {:ok, loaded} -> loaded - {:error, _} -> changeset.data - end - - linked_user_id = if member_with_user.user, do: member_with_user.user.id, else: nil - - # Check if any user has this email (case-insensitive) - # Exclude the user linked to this member (if any) + defp check_email_uniqueness(new_email, exclude_user_id) do query = Mv.Accounts.User |> Ash.Query.filter(email == ^new_email) - |> then(fn q -> - if linked_user_id do - Ash.Query.filter(q, id != ^linked_user_id) - else - q - end - end) + |> maybe_exclude_id(exclude_user_id) case Ash.read(query) do {:ok, []} -> - # No conflicting user found :ok - {:ok, users} when is_list(users) and length(users) > 0 -> - # Email is already used by another user + {:ok, _} -> {:error, field: :email, message: "is already used by another user", value: new_email} {:error, _} -> - # Error reading users - be safe and allow :ok end end + + defp maybe_exclude_id(query, nil), do: query + defp maybe_exclude_id(query, id), do: Ash.Query.filter(query, id != ^id) + + defp get_linked_user_id(member_data) do + case Ash.load(member_data, :user) do + {:ok, %{user: %{id: id}}} -> id + _ -> nil + end + end end From 001fca1d16d30f47e41e562b7c71b7e17e978ecb Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 17 Oct 2025 16:01:48 +0200 Subject: [PATCH 008/119] refactor: email sync changes --- lib/accounts/user.ex | 29 +++++---- lib/membership/member.ex | 27 +++++--- .../changes/override_member_email_on_link.ex | 30 --------- .../user/changes/sync_email_to_member.ex | 32 ---------- .../changes/sync_member_email_to_user.ex} | 19 +++--- .../changes/sync_user_email_to_member.ex | 62 +++++++++++++++++++ .../override_email_from_user_on_link.ex | 30 --------- 7 files changed, 108 insertions(+), 121 deletions(-) delete mode 100644 lib/mv/accounts/user/changes/override_member_email_on_link.ex delete mode 100644 lib/mv/accounts/user/changes/sync_email_to_member.ex rename lib/mv/{membership/member/changes/sync_email_to_user.ex => email_sync/changes/sync_member_email_to_user.ex} (56%) create mode 100644 lib/mv/email_sync/changes/sync_user_email_to_member.ex delete mode 100644 lib/mv/membership/member/changes/override_email_from_user_on_link.ex diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index 278e71a..0fc5ab0 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -93,8 +93,11 @@ defmodule Mv.Accounts.User do # complex checks that are not supported in atomic operations. require_atomic? false - # Sync email changes to linked member - change Mv.Accounts.User.Changes.SyncEmailToMember + # Sync email changes to linked member (User → Member) + # Only runs when email is being changed + change Mv.EmailSync.Changes.SyncUserEmailToMember do + where [changing(:email)] + end end create :create_user do @@ -118,8 +121,8 @@ defmodule Mv.Accounts.User do on_missing: :ignore ) - # Override member email with user email when linking - change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink + # Sync user email to member when linking (User → Member) + change Mv.EmailSync.Changes.SyncUserEmailToMember end update :update_user do @@ -147,10 +150,11 @@ defmodule Mv.Accounts.User do on_missing: :unrelate ) - # Sync email changes to linked member - change Mv.Accounts.User.Changes.SyncEmailToMember - # Override member email with user email when linking - change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink + # Sync email changes and handle linking (User → Member) + # Runs when email OR member relationship changes + change Mv.EmailSync.Changes.SyncUserEmailToMember do + where any([changing(:email), changing(:member)]) + end end # Admin action for direct password changes in admin panel @@ -200,8 +204,8 @@ defmodule Mv.Accounts.User do |> Ash.Changeset.change_attribute(:oidc_id, user_info["sub"] || user_info["id"]) end - # Override member email with user email when linking (if member relationship exists) - change Mv.Accounts.User.Changes.OverrideMemberEmailOnLink + # Sync user email to member when linking (User → Member) + change Mv.EmailSync.Changes.SyncUserEmailToMember end end @@ -281,9 +285,8 @@ defmodule Mv.Accounts.User do # User.email is the source of truth - when a link is established, member.email # is overridden to match user.email. Subsequent changes to either email will # sync to the other resource. - # See: Mv.Accounts.User.Changes.SyncEmailToMember - # Mv.Accounts.User.Changes.OverrideMemberEmailOnLink - # Mv.Membership.Member.Changes.SyncEmailToUser + # See: Mv.EmailSync.Changes.SyncUserEmailToMember + # Mv.EmailSync.Changes.SyncMemberEmailToUser attribute :email, :ci_string do allow_nil? false public? true diff --git a/lib/membership/member.ex b/lib/membership/member.ex index a0799fd..56549fc 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -49,8 +49,11 @@ defmodule Mv.Membership.Member do on_missing: :ignore ) - # Override member email with user email when linking - change Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink + # Sync user email to member when linking (User → Member) + # Only runs when user relationship is being changed + change Mv.EmailSync.Changes.SyncUserEmailToMember do + where [changing(:user)] + end end update :update_member do @@ -93,10 +96,17 @@ defmodule Mv.Membership.Member do on_missing: :unrelate ) - # Override member email with user email when linking - change Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink - # Sync email changes to linked user - change Mv.Membership.Member.Changes.SyncEmailToUser + # Sync member email to user when email changes (Member → User) + # Only runs when email is being changed + change Mv.EmailSync.Changes.SyncMemberEmailToUser do + where [changing(:email)] + end + + # Sync user email to member when linking (User → Member) + # Only runs when user relationship is being changed + change Mv.EmailSync.Changes.SyncUserEmailToMember do + where [changing(:user)] + end end end @@ -206,9 +216,8 @@ defmodule Mv.Membership.Member do # User.email is the source of truth - when a link is established, member.email # is overridden to match user.email. Subsequent changes to either email will # sync to the other resource. - # See: Mv.Membership.Member.Changes.SyncEmailToUser - # Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink - # Mv.Accounts.User.Changes.SyncEmailToMember + # See: Mv.EmailSync.Changes.SyncUserEmailToMember + # Mv.EmailSync.Changes.SyncMemberEmailToUser attribute :email, :string do allow_nil? false constraints min_length: 5, max_length: 254 diff --git a/lib/mv/accounts/user/changes/override_member_email_on_link.ex b/lib/mv/accounts/user/changes/override_member_email_on_link.ex deleted file mode 100644 index b142a96..0000000 --- a/lib/mv/accounts/user/changes/override_member_email_on_link.ex +++ /dev/null @@ -1,30 +0,0 @@ -defmodule Mv.Accounts.User.Changes.OverrideMemberEmailOnLink do - @moduledoc """ - Overrides member email with user email when linking. - User.email is the source of truth when a link is established. - """ - use Ash.Resource.Change - alias Mv.EmailSync.{Helpers, Loader} - - @impl true - def change(changeset, _opts, context) do - if Map.get(context, :syncing_email, false) do - changeset - else - override_email(changeset) - end - end - - defp override_email(changeset) do - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, user} <- Helpers.extract_record(result), - linked_member <- Loader.get_linked_member(user) do - Helpers.sync_email_to_linked_record(result, linked_member, user.email) - else - _ -> result - end - end) - end -end diff --git a/lib/mv/accounts/user/changes/sync_email_to_member.ex b/lib/mv/accounts/user/changes/sync_email_to_member.ex deleted file mode 100644 index a007dae..0000000 --- a/lib/mv/accounts/user/changes/sync_email_to_member.ex +++ /dev/null @@ -1,32 +0,0 @@ -defmodule Mv.Accounts.User.Changes.SyncEmailToMember do - @moduledoc """ - Synchronizes user email changes to the linked member. - Uses `around_transaction` for atomicity - both updates in the same transaction. - """ - use Ash.Resource.Change - alias Mv.EmailSync.{Helpers, Loader} - - @impl true - def change(changeset, _opts, context) do - cond do - Map.get(context, :syncing_email, false) -> changeset - not Ash.Changeset.changing_attribute?(changeset, :email) -> changeset - true -> sync_email(changeset) - end - end - - defp sync_email(changeset) do - new_email = Ash.Changeset.get_attribute(changeset, :email) - - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, user} <- Helpers.extract_record(result), - linked_member <- Loader.get_linked_member(user) do - Helpers.sync_email_to_linked_record(result, linked_member, new_email) - else - _ -> result - end - end) - end -end diff --git a/lib/mv/membership/member/changes/sync_email_to_user.ex b/lib/mv/email_sync/changes/sync_member_email_to_user.ex similarity index 56% rename from lib/mv/membership/member/changes/sync_email_to_user.ex rename to lib/mv/email_sync/changes/sync_member_email_to_user.ex index 8363584..c1e5aea 100644 --- a/lib/mv/membership/member/changes/sync_email_to_user.ex +++ b/lib/mv/email_sync/changes/sync_member_email_to_user.ex @@ -1,17 +1,22 @@ -defmodule Mv.Membership.Member.Changes.SyncEmailToUser do +defmodule Mv.EmailSync.Changes.SyncMemberEmailToUser do @moduledoc """ - Synchronizes member email changes to the linked user. - Uses `around_transaction` for atomicity - both updates in the same transaction. + Synchronizes Member.email → User.email + + Trigger conditions are configured in resources via `where` clauses: + - Member resource: Use `where: [changing(:email)]` + + Used by Member resource for bidirectional email sync. """ use Ash.Resource.Change alias Mv.EmailSync.{Helpers, Loader} @impl true def change(changeset, _opts, context) do - cond do - Map.get(context, :syncing_email, false) -> changeset - not Ash.Changeset.changing_attribute?(changeset, :email) -> changeset - true -> sync_email(changeset) + # Only recursion protection needed - trigger logic is in `where` clauses + if Map.get(context, :syncing_email, false) do + changeset + else + sync_email(changeset) end end diff --git a/lib/mv/email_sync/changes/sync_user_email_to_member.ex b/lib/mv/email_sync/changes/sync_user_email_to_member.ex new file mode 100644 index 0000000..be7dd2c --- /dev/null +++ b/lib/mv/email_sync/changes/sync_user_email_to_member.ex @@ -0,0 +1,62 @@ +defmodule Mv.EmailSync.Changes.SyncUserEmailToMember do + @moduledoc """ + Synchronizes User.email → Member.email + User.email is always the source of truth. + + Trigger conditions are configured in resources via `where` clauses: + - User resource: Use `where: [changing(:email)]` or `where: any([changing(:email), changing(:member)])` + - Member resource: Use `where: [changing(:user)]` + + Can be used by both User and Member resources. + """ + use Ash.Resource.Change + alias Mv.EmailSync.{Helpers, Loader} + + @impl true + def change(changeset, _opts, context) do + # Only recursion protection needed - trigger logic is in `where` clauses + if Map.get(context, :syncing_email, false) do + changeset + else + sync_email(changeset) + end + end + + defp sync_email(changeset) do + Ash.Changeset.around_transaction(changeset, fn cs, callback -> + result = callback.(cs) + + with {:ok, record} <- Helpers.extract_record(result), + {:ok, user, member} <- get_user_and_member(record) do + # When called from Member-side, we need to update the member in the result + # When called from User-side, we update the linked member in DB only + case record do + %Mv.Membership.Member{} -> + # Member-side: Override member email in result with user email + Helpers.override_with_linked_email(result, user.email) + + %Mv.Accounts.User{} -> + # User-side: Sync user email to linked member in DB + Helpers.sync_email_to_linked_record(result, member, user.email) + end + else + _ -> result + end + end) + end + + # Retrieves user and member - works for both resource types + defp get_user_and_member(%Mv.Accounts.User{} = user) do + case Loader.get_linked_member(user) do + nil -> {:error, :no_member} + member -> {:ok, user, member} + end + end + + defp get_user_and_member(%Mv.Membership.Member{} = member) do + case Loader.load_linked_user!(member) do + {:ok, user} -> {:ok, user, member} + error -> error + end + end +end diff --git a/lib/mv/membership/member/changes/override_email_from_user_on_link.ex b/lib/mv/membership/member/changes/override_email_from_user_on_link.ex deleted file mode 100644 index f8ccd98..0000000 --- a/lib/mv/membership/member/changes/override_email_from_user_on_link.ex +++ /dev/null @@ -1,30 +0,0 @@ -defmodule Mv.Membership.Member.Changes.OverrideEmailFromUserOnLink do - @moduledoc """ - Overrides member email with user email when linking. - User.email is the source of truth when a link is established. - """ - use Ash.Resource.Change - alias Mv.EmailSync.{Helpers, Loader} - - @impl true - def change(changeset, _opts, context) do - if Map.get(context, :syncing_email, false) do - changeset - else - override_email(changeset) - end - end - - defp override_email(changeset) do - Ash.Changeset.around_transaction(changeset, fn cs, callback -> - result = callback.(cs) - - with {:ok, member} <- Helpers.extract_record(result), - {:ok, user} <- Loader.load_linked_user!(member) do - Helpers.override_with_linked_email(result, user.email) - else - _ -> result - end - end) - end -end From 1495ef45927657d233338bdfbf4eade2c96e6f19 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 20 Oct 2025 14:38:00 +0200 Subject: [PATCH 009/119] fix validation behaviour --- .../email_not_used_by_other_member.ex | 40 +- .../email_not_used_by_other_user.ex | 31 +- test/accounts/email_uniqueness_test.exs | 357 ++++++++++++++++-- 3 files changed, 369 insertions(+), 59 deletions(-) diff --git a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex index d3cb776..d42b2c1 100644 --- a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex +++ b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex @@ -1,26 +1,46 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do @moduledoc """ Validates that the user's email is not already used by another member. - Allows syncing with linked member (excludes member_id from check). + Only validates when: + - User is already linked to a member (member_id != nil) AND email is changing + - User is being linked to a member (member relationship is changing) + + This allows creating users with the same email as unlinked members. """ use Ash.Resource.Validation @impl true def validate(changeset, _opts, _context) do - case Ash.Changeset.fetch_change(changeset, :email) do - {:ok, new_email} -> - member_id = Ash.Changeset.get_attribute(changeset, :member_id) - check_email_uniqueness(new_email, member_id) + email_changing? = Ash.Changeset.changing_attribute?(changeset, :email) + member_changing? = Ash.Changeset.changing_relationship?(changeset, :member) - :error -> - :ok + member_id = Ash.Changeset.get_attribute(changeset, :member_id) + is_linked? = not is_nil(member_id) + + # Only validate if: + # 1. User is linked AND email is changing + # 2. User is being linked/unlinked (member relationship changing) + should_validate? = (is_linked? and email_changing?) or member_changing? + + if should_validate? do + case Ash.Changeset.fetch_change(changeset, :email) do + {:ok, new_email} -> + check_email_uniqueness(new_email, member_id) + + :error -> + # No email change, get current email + current_email = Ash.Changeset.get_attribute(changeset, :email) + check_email_uniqueness(current_email, member_id) + end + else + :ok end end - defp check_email_uniqueness(new_email, exclude_member_id) do + defp check_email_uniqueness(email, exclude_member_id) do query = Mv.Membership.Member - |> Ash.Query.filter(email == ^to_string(new_email)) + |> Ash.Query.filter(email == ^to_string(email)) |> maybe_exclude_id(exclude_member_id) case Ash.read(query) do @@ -28,7 +48,7 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do :ok {:ok, _} -> - {:error, field: :email, message: "is already used by another member", value: new_email} + {:error, field: :email, message: "is already used by another member", value: email} {:error, _} -> :ok diff --git a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex index 6c544b5..54fa243 100644 --- a/lib/mv/membership/member/validations/email_not_used_by_other_user.ex +++ b/lib/mv/membership/member/validations/email_not_used_by_other_user.ex @@ -1,26 +1,37 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do @moduledoc """ Validates that the member's email is not already used by another user. - Allows syncing with linked user (excludes linked user from check). + Only validates when: + - Member is already linked to a user (user != nil) AND email is changing + - Member is being linked to a user (user relationship is changing) + + This allows creating members with the same email as unlinked users. """ use Ash.Resource.Validation @impl true def validate(changeset, _opts, _context) do - case Ash.Changeset.fetch_change(changeset, :email) do - {:ok, new_email} -> - linked_user_id = get_linked_user_id(changeset.data) - check_email_uniqueness(new_email, linked_user_id) + email_changing? = Ash.Changeset.changing_attribute?(changeset, :email) - :error -> - :ok + linked_user_id = get_linked_user_id(changeset.data) + is_linked? = not is_nil(linked_user_id) + + # Only validate if member is already linked AND email is changing + # Do NOT validate when member is being linked (email will be overridden from user) + should_validate? = is_linked? and email_changing? + + if should_validate? do + new_email = Ash.Changeset.get_attribute(changeset, :email) + check_email_uniqueness(new_email, linked_user_id) + else + :ok end end - defp check_email_uniqueness(new_email, exclude_user_id) do + defp check_email_uniqueness(email, exclude_user_id) do query = Mv.Accounts.User - |> Ash.Query.filter(email == ^new_email) + |> Ash.Query.filter(email == ^email) |> maybe_exclude_id(exclude_user_id) case Ash.read(query) do @@ -28,7 +39,7 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do :ok {:ok, _} -> - {:error, field: :email, message: "is already used by another user", value: new_email} + {:error, field: :email, message: "is already used by another user", value: email} {:error, _} -> :ok diff --git a/test/accounts/email_uniqueness_test.exs b/test/accounts/email_uniqueness_test.exs index 8665c48..a16ebdd 100644 --- a/test/accounts/email_uniqueness_test.exs +++ b/test/accounts/email_uniqueness_test.exs @@ -4,32 +4,26 @@ defmodule Mv.Accounts.EmailUniquenessTest do alias Mv.Accounts alias Mv.Membership - describe "Email uniqueness validation" do - test "cannot create member with existing unlinked user email" do + describe "Email uniqueness validation - Creation" do + test "CAN create member with existing unlinked user email" do # Create a user with email {:ok, _user} = Accounts.create_user(%{ email: "existing@example.com" }) - # Try to create member with same email - result = + # Create member with same email - should succeed + {:ok, member} = Membership.create_member(%{ first_name: "John", last_name: "Doe", email: "existing@example.com" }) - assert {:error, %Ash.Error.Invalid{} = error} = result - - assert error.errors - |> Enum.any?(fn e -> - e.field == :email and - (String.contains?(e.message, "already") or String.contains?(e.message, "used")) - end) + assert to_string(member.email) == "existing@example.com" end - test "cannot create user with existing unlinked member email" do + test "CAN create user with existing unlinked member email" do # Create a member with email {:ok, _member} = Membership.create_member(%{ @@ -38,29 +32,25 @@ defmodule Mv.Accounts.EmailUniquenessTest do email: "existing@example.com" }) - # Try to create user with same email - result = + # Create user with same email - should succeed + {:ok, user} = Accounts.create_user(%{ email: "existing@example.com" }) - assert {:error, %Ash.Error.Invalid{} = error} = result - - assert error.errors - |> Enum.any?(fn e -> - e.field == :email and - (String.contains?(e.message, "already") or String.contains?(e.message, "used")) - end) + assert to_string(user.email) == "existing@example.com" end + end - test "member email cannot be changed to an existing unlinked user email" do + describe "Email uniqueness validation - Updating unlinked entities" do + test "unlinked member email CAN be changed to an existing unlinked user email" do # Create a user with email - {:ok, user} = + {:ok, _user} = Accounts.create_user(%{ email: "existing_user@example.com" }) - # Create a member with different email + # Create an unlinked member with different email {:ok, member} = Membership.create_member(%{ first_name: "John", @@ -68,42 +58,68 @@ defmodule Mv.Accounts.EmailUniquenessTest do email: "member@example.com" }) - # Try to change member email to existing user email - result = + # Change member email to existing user email - should succeed (member is unlinked) + {:ok, updated_member} = Membership.update_member(member, %{ email: "existing_user@example.com" }) - assert {:error, %Ash.Error.Invalid{} = error} = result - - assert error.errors - |> Enum.any?(fn e -> - e.field == :email and - (String.contains?(e.message, "already") or String.contains?(e.message, "used")) - end) + assert to_string(updated_member.email) == "existing_user@example.com" end - test "user email cannot be changed to an existing unlinked member email" do + test "unlinked user email CAN be changed to an existing unlinked member email" do # Create a member with email - {:ok, member} = + {:ok, _member} = Membership.create_member(%{ first_name: "John", last_name: "Doe", email: "existing_member@example.com" }) - # Create a user with different email + # Create an unlinked user with different email {:ok, user} = Accounts.create_user(%{ email: "user@example.com" }) - # Try to change user email to existing member email - result = + # Change user email to existing member email - should succeed (user is unlinked) + {:ok, updated_user} = Accounts.update_user(user, %{ email: "existing_member@example.com" }) + assert to_string(updated_user.email) == "existing_member@example.com" + end + + test "unlinked member email CANNOT be changed to an existing linked user email" do + # Create a user and link it to a member - this makes the user "linked" + {:ok, user} = + Accounts.create_user(%{ + email: "linked_user@example.com" + }) + + {:ok, _member_a} = + Membership.create_member(%{ + first_name: "Member", + last_name: "A", + email: "temp@example.com", + user: %{id: user.id} + }) + + # Create an unlinked member with different email + {:ok, member_b} = + Membership.create_member(%{ + first_name: "Member", + last_name: "B", + email: "member_b@example.com" + }) + + # Try to change unlinked member's email to linked user's email - should fail + result = + Membership.update_member(member_b, %{ + email: "linked_user@example.com" + }) + assert {:error, %Ash.Error.Invalid{} = error} = result assert error.errors @@ -113,6 +129,269 @@ defmodule Mv.Accounts.EmailUniquenessTest do end) end + test "unlinked user email CANNOT be changed to an existing linked member email" do + # Create a user and link it to a member - this makes the member "linked" + {:ok, user_a} = + Accounts.create_user(%{ + email: "user_a@example.com" + }) + + {:ok, _member_a} = + Membership.create_member(%{ + first_name: "Member", + last_name: "A", + email: "temp@example.com", + user: %{id: user_a.id} + }) + + # Reload user to get updated member_id and linked member email + {:ok, user_a_reloaded} = Ash.get(Mv.Accounts.User, user_a.id) + {:ok, user_a_with_member} = Ash.load(user_a_reloaded, :member) + linked_member_email = to_string(user_a_with_member.member.email) + + # Create an unlinked user with different email + {:ok, user_b} = + Accounts.create_user(%{ + email: "user_b@example.com" + }) + + # Try to change unlinked user's email to linked member's email - should fail + result = + Accounts.update_user(user_b, %{ + email: linked_member_email + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + end + + describe "Email uniqueness validation - Creating with linked emails" do + test "CANNOT create member with existing linked user email" do + # Create a user and link it to a member + {:ok, user} = + Accounts.create_user(%{ + email: "linked@example.com" + }) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "First", + last_name: "Member", + email: "temp@example.com", + user: %{id: user.id} + }) + + # Try to create a new member with the linked user's email - should fail + result = + Membership.create_member(%{ + first_name: "Second", + last_name: "Member", + email: "linked@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "CANNOT create user with existing linked member email" do + # Create a user and link it to a member + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Member", + last_name: "One", + email: "temp@example.com", + user: %{id: user.id} + }) + + # Reload user to get the linked member's email + {:ok, user_reloaded} = Ash.get(Mv.Accounts.User, user.id) + {:ok, user_with_member} = Ash.load(user_reloaded, :member) + linked_member_email = to_string(user_with_member.member.email) + + # Try to create a new user with the linked member's email - should fail + result = + Accounts.create_user(%{ + email: linked_member_email + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + end + + describe "Email uniqueness validation - Updating linked entities" do + test "linked member email CANNOT be changed to an existing user email" do + # Create a user with email + {:ok, _other_user} = + Accounts.create_user(%{ + email: "other_user@example.com" + }) + + # Create a user and link it to a member + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "temp@example.com", + user: %{id: user.id} + }) + + # Try to change linked member's email to other user's email - should fail + result = + Membership.update_member(member, %{ + email: "other_user@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "linked user email CANNOT be changed to an existing member email" do + # Create a member with email + {:ok, _other_member} = + Membership.create_member(%{ + first_name: "Jane", + last_name: "Doe", + email: "other_member@example.com" + }) + + # Create a user and link it to a member + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "temp@example.com", + user: %{id: user.id} + }) + + # Reload user to get updated member_id + {:ok, user_reloaded} = Ash.get(Mv.Accounts.User, user.id) + + # Try to change linked user's email to other member's email - should fail + result = + Accounts.update_user(user_reloaded, %{ + email: "other_member@example.com" + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + end + + describe "Email uniqueness validation - Linking" do + test "CANNOT link user to member if user email is already used by another unlinked member" do + # Create a member with email + {:ok, _other_member} = + Membership.create_member(%{ + first_name: "Jane", + last_name: "Doe", + email: "duplicate@example.com" + }) + + # Create a user with same email + {:ok, user} = + Accounts.create_user(%{ + email: "duplicate@example.com" + }) + + # Create a member to link with the user + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Smith", + email: "john@example.com" + }) + + # Try to link user to member - should fail because user.email is already used by other_member + result = + Accounts.update_user(user, %{ + member: %{id: member.id} + }) + + assert {:error, %Ash.Error.Invalid{} = error} = result + + assert error.errors + |> Enum.any?(fn e -> + e.field == :email and + (String.contains?(e.message, "already") or String.contains?(e.message, "used")) + end) + end + + test "CAN link member to user even if member email is used by another user (member email gets overridden)" do + # Create a user with email + {:ok, _other_user} = + Accounts.create_user(%{ + email: "duplicate@example.com" + }) + + # Create a member with same email + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "duplicate@example.com" + }) + + # Create a user to link with the member + {:ok, user} = + Accounts.create_user(%{ + email: "user@example.com" + }) + + # Link member to user - should succeed because member.email will be overridden + {:ok, updated_member} = + Membership.update_member(member, %{ + user: %{id: user.id} + }) + + # Member email should now be the same as user email + {:ok, member_reloaded} = Ash.get(Mv.Membership.Member, updated_member.id) + assert to_string(member_reloaded.email) == "user@example.com" + end + end + + describe "Email syncing" do test "member email syncs to linked user email without validation error" do # Create a user {:ok, user} = @@ -148,7 +427,7 @@ defmodule Mv.Accounts.EmailUniquenessTest do # Create a user linked to this member # The override change will set member.email = user.email automatically - {:ok, user} = + {:ok, _user} = Accounts.create_user(%{ email: "user@example.com", member: %{id: member.id} From 37fcc26b22396b95f18fccc9abfc82fddb3531ea Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 20 Oct 2025 14:53:38 +0200 Subject: [PATCH 010/119] add seed test --- test/seeds_test.exs | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 test/seeds_test.exs diff --git a/test/seeds_test.exs b/test/seeds_test.exs new file mode 100644 index 0000000..5c589ae --- /dev/null +++ b/test/seeds_test.exs @@ -0,0 +1,46 @@ +defmodule Mv.SeedsTest do + use Mv.DataCase, async: false + + describe "Seeds script" do + test "runs successfully without errors" do + # Run the seeds script - should not raise any errors + assert Code.eval_file("priv/repo/seeds.exs") + + # Basic smoke test: ensure some data was created + {:ok, users} = Ash.read(Mv.Accounts.User) + {:ok, members} = Ash.read(Mv.Membership.Member) + {:ok, property_types} = Ash.read(Mv.Membership.PropertyType) + + assert length(users) > 0, "Seeds should create at least one user" + assert length(members) > 0, "Seeds should create at least one member" + assert length(property_types) > 0, "Seeds should create at least one property type" + end + + test "can be run multiple times (idempotent)" do + # Run seeds first time + assert Code.eval_file("priv/repo/seeds.exs") + + # Count records + {:ok, users_count_1} = Ash.read(Mv.Accounts.User) + {:ok, members_count_1} = Ash.read(Mv.Membership.Member) + {:ok, property_types_count_1} = Ash.read(Mv.Membership.PropertyType) + + # Run seeds second time - should not raise errors + assert Code.eval_file("priv/repo/seeds.exs") + + # Count records again - should be the same (upsert, not duplicate) + {:ok, users_count_2} = Ash.read(Mv.Accounts.User) + {:ok, members_count_2} = Ash.read(Mv.Membership.Member) + {:ok, property_types_count_2} = Ash.read(Mv.Membership.PropertyType) + + assert length(users_count_1) == length(users_count_2), + "Users count should remain same after re-running seeds" + + assert length(members_count_1) == length(members_count_2), + "Members count should remain same after re-running seeds" + + assert length(property_types_count_1) == length(property_types_count_2), + "PropertyTypes count should remain same after re-running seeds" + end + end +end From 899039b3ee720e8712be9f00d8ba1bd013b83d14 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 23 Oct 2025 13:13:12 +0200 Subject: [PATCH 011/119] add docs --- docs/email-sync.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 docs/email-sync.md diff --git a/docs/email-sync.md b/docs/email-sync.md new file mode 100644 index 0000000..c191ff4 --- /dev/null +++ b/docs/email-sync.md @@ -0,0 +1,49 @@ +## Core Rules + +1. **User.email is source of truth** - Always overrides member email when linking +2. **DB constraints** - Prevent duplicates within same table (users.email, members.email) +3. **Custom validations** - Prevent cross-table conflicts only for linked entities +4. **Sync is bidirectional**: User ↔ Member (but User always wins on link) + +--- + +## Decision Tree + +``` +Action: Create/Update/Link Entity with Email X +│ +├─ Does Email X violate DB constraint (same table)? +│ └─ YES → ❌ FAIL (two users or two members with same email) +│ +├─ Is Entity currently linked? (or being linked?) +│ │ +│ ├─ NO (unlinked entity) +│ │ └─ ✅ SUCCESS (no custom validation) +│ │ +│ └─ YES (linked or linking) +│ │ +│ ├─ Action: Update Linked User Email +│ │ ├─ Email used by other member? → ❌ FAIL (validation) +│ │ └─ Email unique? → ✅ SUCCESS + sync to member +│ │ +│ ├─ Action: Update Linked Member Email +│ │ ├─ Email used by other user? → ❌ FAIL (validation) +│ │ └─ Email unique? → ✅ SUCCESS + sync to user +│ │ +│ ├─ Action: Link User to Member (both directions) +│ │ ├─ User email used by other member? → ❌ FAIL (validation) +│ │ └─ Otherwise → ✅ SUCCESS + override member email + +``` + +## Sync Triggers + +| Action | Sync Direction | When | +|--------|---------------|------| +| Update linked user email | User → Member | Email changed | +| Update linked member email | Member → User | Email changed | +| Link user to member | User → Member | Always (override) | +| Link member to user | User → Member | Always (override) | +| Unlink | None | Emails stay as-is | + + From d9e48a37d2a190e062fe87583fe8ff715132d1d8 Mon Sep 17 00:00:00 2001 From: carla Date: Fri, 26 Sep 2025 11:10:14 +0200 Subject: [PATCH 012/119] feat: sort header for members list --- .../live/components/sort_header_component.ex | 64 +++++++ lib/mv_web/live/member_live/index.ex | 173 ++++++++++++++---- lib/mv_web/live/member_live/index.html.heex | 142 ++++++++++++-- 3 files changed, 327 insertions(+), 52 deletions(-) create mode 100644 lib/mv_web/live/components/sort_header_component.ex diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex new file mode 100644 index 0000000..147001e --- /dev/null +++ b/lib/mv_web/live/components/sort_header_component.ex @@ -0,0 +1,64 @@ +defmodule MvWeb.Components.SortHeaderComponent do + @moduledoc """ + Sort Header that can be used as column header and sorts a table: + Props: + - field: atom() # Ash‑Field for sorting + - label: string() # Column Heading (can be aan heex templyte) + - sort_field: atom() | nil # current sort-field from parent liveview + - sort_order: :asc | :desc | nil # current sorting order + """ + use MvWeb, :live_component + + @impl true + def update(assigns, socket) do + {:ok, assign(socket, assigns)} + end + + @impl true + def render(assigns) do + ~H""" + + """ + end + + @impl true + def handle_event("sort", %{"field" => field_str}, socket) do + send(self(), {:sort, field_str}) + {:noreply, socket} + end + + # ------------------------------------------------- + # Hilfsfunktionen für ARIA‑Attribute & Icon‑SVG + # ------------------------------------------------- + defp aria_sort(field, sort_field, dir) when field == sort_field do + case dir do + :asc -> "ascending" + :desc -> "descending" + end + end + + defp aria_sort(_, _, _), do: "none" +end diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 47a36ef..066b5e3 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -5,18 +5,18 @@ defmodule MvWeb.MemberLive.Index do import MvWeb.TableComponents @impl true - def mount(_params, _session, socket) do - members = Ash.read!(Mv.Membership.Member) - sorted = Enum.sort_by(members, & &1.first_name) - - {:ok, - socket - |> assign(:page_title, gettext("Members")) + def mount(params, _session, socket) do + socket = + socket + |> assign(:page_title, gettext("Members")) |> assign(:query, "") - |> assign(:sort_field, :first_name) - |> assign(:sort_order, :asc) - |> assign(:members, sorted) - |> assign(:selected_members, [])} + |> assign_new(:sort_field, fn -> :first_name end) + |> assign_new(:sort_order, fn -> :asc end) + |> assign(:selected_members, []) + + # We call handle params to use the query from the URL + {:noreply, socket} = handle_params(params, nil, socket) + {:ok, socket} end # ----------------------------------------------------------------- @@ -45,6 +45,11 @@ defmodule MvWeb.MemberLive.Index do # Handle Events # ----------------------------------------------------------------- + # ----------------------------------------------------------------- + # Handle Events + # ----------------------------------------------------------------- + + # Delete a member @impl true def handle_event("delete", %{"id" => id}, socket) do member = Ash.get!(Mv.Membership.Member, id) @@ -67,32 +72,7 @@ defmodule MvWeb.MemberLive.Index do {:noreply, assign(socket, :selected_members, selected)} end - # Sorts the list of members according to a field, when you click on the column header - @impl true - def handle_event("sort", %{"field" => field_str}, socket) do - members = socket.assigns.members - field = String.to_existing_atom(field_str) - - new_order = - if socket.assigns.sort_field == field do - toggle_order(socket.assigns.sort_order) - else - :asc - end - - sorted_members = - members - |> Enum.sort_by(&Map.get(&1, field), sort_fun(new_order)) - - {:noreply, - socket - |> assign(:sort_field, field) - |> assign(:sort_order, new_order) - |> assign(:members, sorted_members)} - end - - # Selects all members in the list of members - + # Selects all members in the list of members @impl true def handle_event("select_all", _params, socket) do members = socket.assigns.members @@ -109,8 +89,123 @@ defmodule MvWeb.MemberLive.Index do {:noreply, assign(socket, :selected_members, selected)} end + # ----------------------------------------------------------------- + # Handle Infos from Child Components + # ----------------------------------------------------------------- + + # Sorts the list of members according to a field, when you click on the column header + @impl true + def handle_info({:sort, field_str}, socket) do + field = String.to_existing_atom(field_str) + + {new_order, new_field} = + if socket.assigns.sort_field == field do + {toggle_order(socket.assigns.sort_order), field} + else + {:asc, field} + end + + active_id = :"sort_#{new_field}" + + # Update the SortHeader to + send_update(MvWeb.Components.SortHeaderComponent, + id: active_id, + sort_field: new_field, + sort_order: new_order + ) + + # Build the URL with queries + query_params = %{ + "sort_field" => Atom.to_string(new_field), + "sort_order" => Atom.to_string(new_order) + } + + # "/members" is the path you defined in router.ex + new_path = "/members?" <> URI.encode_query(query_params) + + # Push the new URL + {:noreply, + push_patch(socket, + to: new_path, + # replace true + replace: true + )} + end + + # ----------------------------------------------------------------- + # Handle Params from the URL + # ----------------------------------------------------------------- + @impl true + def handle_params(params, _url, socket) do + socket = + socket + |> maybe_update_sort(params) + |> load_members() + + {:noreply, socket} + end + + # ------------------------------------------------------------- + # FUNCTIONS + # ------------------------------------------------------------- + # Load members eg based on a query for sorting + defp load_members(socket) 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 + ]) + |> maybe_sort(socket.assigns.sort_field, socket.assigns.sort_order) + + members = Ash.read!(query) + assign(socket, :members, members) + end + + defp maybe_update_sort(socket, %{"sort_field" => sf, "sort_order" => so}) do + field = + try do + String.to_existing_atom(sf) + rescue + ArgumentError -> socket.assigns.sort_field + end + + order = if so in ["asc", "desc"], do: String.to_atom(so), else: socket.assigns.sort_order + + IO.inspect(order) + + socket + |> assign(:sort_field, field) + |> assign(:sort_order, order) + end + + # ------------------------------------------------------------- + # Helper Functions + # ------------------------------------------------------------- + + # Functions to toggle sorting order defp toggle_order(:asc), do: :desc defp toggle_order(:desc), do: :asc - defp sort_fun(:asc), do: &<=/2 - defp sort_fun(:desc), do: &>=/2 + defp toggle_order(nil), do: :asc + + # Function to turn a string into an atom only if it already exists + defp maybe_atom(nil), do: nil + defp maybe_atom(atom) when is_atom(atom), do: atom + defp maybe_atom(str) when is_binary(str), do: String.to_existing_atom(str) + + # Function to sort the column if needed + defp maybe_sort(query, nil, _), do: query + defp maybe_sort(query, field, :asc), do: Ash.Query.sort(query, [{field, :asc}]) + defp maybe_sort(query, field, :desc), do: Ash.Query.sort(query, [{field, :desc}]) + # no changes + defp maybe_update_sort(socket, _), do: 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 410728a..cb2ccd8 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -52,23 +52,139 @@ <:col :let={member} label={ - sort_button(%{ - field: :first_name, - label: gettext("Name"), - sort_field: @sort_field, - sort_order: @sort_order - }) + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_first_name} + field={:first_name} + label={gettext("First name")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ } > {member.first_name} {member.last_name} - <:col :let={member} label={gettext("Email")}>{member.email} - <:col :let={member} label={gettext("Street")}>{member.street} - <:col :let={member} label={gettext("House Number")}>{member.house_number} - <:col :let={member} label={gettext("Postal Code")}>{member.postal_code} - <:col :let={member} label={gettext("City")}>{member.city} - <:col :let={member} label={gettext("Phone Number")}>{member.phone_number} - <:col :let={member} label={gettext("Join Date")}>{member.join_date} + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_email} + field={:email} + label={gettext("Email")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.email} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_street} + field={:street} + label={gettext("Street")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.street} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_house_number} + field={:house_number} + label={gettext("House Number")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.house_number} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_postal_code} + field={:postal_code} + label={gettext("Postal Code")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.postal_code} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_city} + field={:city} + label={gettext("City")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.city} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_phone_number} + field={:phone_number} + label={gettext("Phone Number")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.phone_number} + + <:col + :let={member} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_join_date} + field={:join_date} + label={gettext("Join Date")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.join_date} + <:action :let={member}>
From c3502a326e183af333f9abf276870741260956ba Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:36 +0200 Subject: [PATCH 013/119] docs: formatting, docs and accessibility fix --- .../live/components/sort_header_component.ex | 25 ++++++------- lib/mv_web/live/member_live/index.ex | 36 ++++++++----------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex index 147001e..e69357e 100644 --- a/lib/mv_web/live/components/sort_header_component.ex +++ b/lib/mv_web/live/components/sort_header_component.ex @@ -14,32 +14,29 @@ defmodule MvWeb.Components.SortHeaderComponent do {:ok, assign(socket, assigns)} end + # Check if we can add the aria-sort label directly to the daisyUI header + # aria-sort={aria_sort(@field, @sort_field, @sort_order)} @impl true def render(assigns) do ~H""" """ end @@ -55,10 +52,10 @@ defmodule MvWeb.Components.SortHeaderComponent do # ------------------------------------------------- defp aria_sort(field, sort_field, dir) when field == sort_field do case dir do - :asc -> "ascending" - :desc -> "descending" + :asc -> gettext("ascending") + :desc -> gettext("descending") end end - defp aria_sort(_, _, _), do: "none" + defp aria_sort(_, _, _), do: gettext("Click to sort") end diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 066b5e3..52b16ae 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -171,6 +171,21 @@ defmodule MvWeb.MemberLive.Index do assign(socket, :members, members) end + # ------------------------------------------------------------- + # Helper Functions + # ------------------------------------------------------------- + + # Functions to toggle sorting order + defp toggle_order(:asc), do: :desc + defp toggle_order(:desc), do: :asc + defp toggle_order(nil), do: :asc + + # Function to sort the column if needed + defp maybe_sort(query, nil, _), do: query + defp maybe_sort(query, field, :asc), do: Ash.Query.sort(query, [{field, :asc}]) + defp maybe_sort(query, field, :desc), do: Ash.Query.sort(query, [{field, :desc}]) + + # Function to maybe update the sort defp maybe_update_sort(socket, %{"sort_field" => sf, "sort_order" => so}) do field = try do @@ -181,31 +196,10 @@ defmodule MvWeb.MemberLive.Index do order = if so in ["asc", "desc"], do: String.to_atom(so), else: socket.assigns.sort_order - IO.inspect(order) - socket |> assign(:sort_field, field) |> assign(:sort_order, order) end - # ------------------------------------------------------------- - # Helper Functions - # ------------------------------------------------------------- - - # Functions to toggle sorting order - defp toggle_order(:asc), do: :desc - defp toggle_order(:desc), do: :asc - defp toggle_order(nil), do: :asc - - # Function to turn a string into an atom only if it already exists - defp maybe_atom(nil), do: nil - defp maybe_atom(atom) when is_atom(atom), do: atom - defp maybe_atom(str) when is_binary(str), do: String.to_existing_atom(str) - - # Function to sort the column if needed - defp maybe_sort(query, nil, _), do: query - defp maybe_sort(query, field, :asc), do: Ash.Query.sort(query, [{field, :asc}]) - defp maybe_sort(query, field, :desc), do: Ash.Query.sort(query, [{field, :desc}]) - # no changes defp maybe_update_sort(socket, _), do: socket end From 3cfae95b1e9596333986265d934c973efd01a233 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:52 +0200 Subject: [PATCH 014/119] test: added tests --- .../components/sort_header_component_test.exs | 12 ++++++ test/mv_web/member_live/index_test.exs | 37 ++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 test/mv_web/components/sort_header_component_test.exs diff --git a/test/mv_web/components/sort_header_component_test.exs b/test/mv_web/components/sort_header_component_test.exs new file mode 100644 index 0000000..9b1c006 --- /dev/null +++ b/test/mv_web/components/sort_header_component_test.exs @@ -0,0 +1,12 @@ +defmodule MvWeb.Components.SortHeaderComponentTest do + use MvWeb.ConnCase, async: true + use Phoenix.Component + import Phoenix.LiveViewTest + + test "renders sort header with correct attributes", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + assert view |> element("[data-testid='first_name']") + end +end diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index 240e15e..f697d6e 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -56,7 +56,6 @@ defmodule MvWeb.MemberLive.IndexTest do test "shows translated flash message after creating a member in English", %{conn: conn} do conn = conn_with_oidc_user(conn) - conn = Plug.Test.init_test_session(conn, locale: "en") {:ok, form_view, _html} = live(conn, "/members/new") form_data = %{ @@ -75,6 +74,42 @@ defmodule MvWeb.MemberLive.IndexTest do assert has_element?(index_view, "#flash-group", "Member create successfully") end + describe "sorting interaction" do + test "clicking a column header toggles sort order and updates the URL", %{conn: conn} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # The component data test ids are built as "" + # First click – should sort ASC + view + |> element("[data-testid='email']") + |> render_click() + + # The LiveView pushes a patch with the new query params + assert_patch(view, "/members?sort_field=email&sort_order=asc") + + # Second click – toggles to DESC + view + |> element("[data-testid='email']") + |> render_click() + + assert_patch(view, "/members?sort_field=email&sort_order=desc") + end + end + + describe "URL param handling" do + test "handle_params reads sort query and applies it", %{conn: conn} do + conn = conn_with_oidc_user(conn) + url = "/members?sort_field=email&sort_order=desc" + + conn = get(conn, url) + + # The LiveView must have parsed the params and stored them as atoms. + assert conn.assigns.sort_field == :email + assert conn.assigns.sort_order == :desc + end + end + test "handle_info(:search_changed) updates assigns with search results", %{conn: conn} do conn = conn_with_oidc_user(conn) {:ok, view, _html} = live(conn, "/members") From 017ca8b32c63e2da4a38162615a81607893fbc37 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:23:33 +0200 Subject: [PATCH 015/119] chore: updated translation --- priv/gettext/de/LC_MESSAGES/auth.po | 3 + priv/gettext/de/LC_MESSAGES/default.po | 58 ++++++++------ priv/gettext/default.pot | 51 +++++++----- priv/gettext/en/LC_MESSAGES/auth.po | 3 + priv/gettext/en/LC_MESSAGES/default.po | 105 ++++++++----------------- 5 files changed, 101 insertions(+), 119 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po index f7eef3e..967755e 100644 --- a/priv/gettext/de/LC_MESSAGES/auth.po +++ b/priv/gettext/de/LC_MESSAGES/auth.po @@ -61,3 +61,6 @@ msgstr "Anmelden..." msgid "Your password has successfully been reset" msgstr "Das Passwort wurde erfolgreich zurückgesetzt" + +#~ msgid "Sign in with Rauthy" +#~ msgstr "Anmelden mit der Vereinscloud" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index bd86f61..c8c219a 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:84 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:65 #, 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:25 -#: lib/mv_web/live/member_live/index.html.heex:69 -#: lib/mv_web/live/member_live/show.ex:37 +#: lib/mv_web/live/member_live/index.html.heex:138 +#: lib/mv_web/live/member_live/show.ex:36 #, elixir-autogen, elixir-format msgid "City" msgstr "Stadt" -#: lib/mv_web/live/member_live/index.html.heex:86 +#: lib/mv_web/live/member_live/index.html.heex:195 #: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "Löschen" -#: lib/mv_web/live/member_live/index.html.heex:78 +#: lib/mv_web/live/member_live/index.html.heex:187 #: lib/mv_web/live/user_live/form.ex:109 #: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format @@ -54,8 +54,8 @@ msgid "Edit Member" msgstr "Mitglied bearbeiten" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:65 -#: lib/mv_web/live/member_live/show.ex:28 +#: lib/mv_web/live/member_live/index.html.heex:70 +#: lib/mv_web/live/member_live/show.ex:27 #: lib/mv_web/live/user_live/form.ex:14 #: lib/mv_web/live/user_live/index.html.heex:44 #: lib/mv_web/live/user_live/show.ex:25 @@ -70,8 +70,8 @@ msgid "First Name" msgstr "Vorname" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:71 -#: lib/mv_web/live/member_live/show.ex:34 +#: lib/mv_web/live/member_live/index.html.heex:172 +#: lib/mv_web/live/member_live/show.ex:33 #, elixir-autogen, elixir-format msgid "Join Date" msgstr "Beitrittsdatum" @@ -87,7 +87,7 @@ msgstr "Nachname" msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:75 +#: lib/mv_web/live/member_live/index.html.heex:184 #: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" @@ -127,8 +127,8 @@ msgid "Exit Date" msgstr "Austrittsdatum" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:67 -#: lib/mv_web/live/member_live/show.ex:39 +#: lib/mv_web/live/member_live/index.html.heex:104 +#: lib/mv_web/live/member_live/show.ex:38 #, elixir-autogen, elixir-format msgid "House Number" msgstr "Hausnummer" @@ -146,15 +146,15 @@ msgid "Paid" msgstr "Bezahlt" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:70 -#: lib/mv_web/live/member_live/show.ex:33 +#: lib/mv_web/live/member_live/index.html.heex:155 +#: lib/mv_web/live/member_live/show.ex:32 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "Telefonnummer" #: lib/mv_web/live/member_live/form.ex:28 -#: lib/mv_web/live/member_live/index.html.heex:68 -#: lib/mv_web/live/member_live/show.ex:40 +#: lib/mv_web/live/member_live/index.html.heex:121 +#: lib/mv_web/live/member_live/show.ex:39 #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "Postleitzahl" @@ -173,8 +173,8 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:66 -#: lib/mv_web/live/member_live/show.ex:38 +#: lib/mv_web/live/member_live/index.html.heex:87 +#: lib/mv_web/live/member_live/show.ex:37 #, elixir-autogen, elixir-format msgid "Street" msgstr "Straße" @@ -317,14 +317,13 @@ msgstr "Benutzer*innen auflisten" msgid "Member" msgstr "Mitglied" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:14 +#: lib/mv_web/components/layouts/navbar.ex:14 +#: lib/mv_web/live/member_live/index.ex:8 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "Mitglieder" -#: lib/mv_web/live/member_live/index.html.heex:57 #: lib/mv_web/live/property_type_live/form.ex:16 #, elixir-autogen, elixir-format msgid "Name" @@ -469,11 +468,13 @@ msgid "Value type" msgstr "Wertetyp" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:55 #, elixir-autogen, elixir-format msgid "ascending" msgstr "aufsteigend" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:56 #, elixir-autogen, elixir-format msgid "descending" msgstr "absteigend" @@ -600,10 +601,15 @@ msgstr "Dunklen Modus umschalten" #: lib/mv_web/live/components/search_bar_component.ex:15 #: lib/mv_web/live/member_live/index.html.heex:15 #, elixir-autogen, elixir-format -msgid "Search..." -msgstr "" +msgid "Click to sort" +msgstr "Klicke um zu sortieren" -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/live/member_live/index.html.heex:53 #, elixir-autogen, elixir-format, fuzzy -msgid "Users" -msgstr "Benutzer*innen" +msgid "First name" +msgstr "Vorname" + +#~ #: lib/mv_web/auth_overrides.ex:30 +#~ #, elixir-autogen, elixir-format +#~ msgid "or" +#~ msgstr "oder" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 93c5d95..4c5438a 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:84 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:65 #, 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:25 -#: lib/mv_web/live/member_live/index.html.heex:69 -#: lib/mv_web/live/member_live/show.ex:37 +#: lib/mv_web/live/member_live/index.html.heex:138 +#: lib/mv_web/live/member_live/show.ex:36 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:86 +#: lib/mv_web/live/member_live/index.html.heex:195 #: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:78 +#: lib/mv_web/live/member_live/index.html.heex:187 #: lib/mv_web/live/user_live/form.ex:109 #: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format @@ -55,8 +55,8 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:65 -#: lib/mv_web/live/member_live/show.ex:28 +#: lib/mv_web/live/member_live/index.html.heex:70 +#: lib/mv_web/live/member_live/show.ex:27 #: lib/mv_web/live/user_live/form.ex:14 #: lib/mv_web/live/user_live/index.html.heex:44 #: lib/mv_web/live/user_live/show.ex:25 @@ -71,8 +71,8 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:71 -#: lib/mv_web/live/member_live/show.ex:34 +#: lib/mv_web/live/member_live/index.html.heex:172 +#: lib/mv_web/live/member_live/show.ex:33 #, elixir-autogen, elixir-format msgid "Join Date" msgstr "" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:75 +#: lib/mv_web/live/member_live/index.html.heex:184 #: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" @@ -128,8 +128,8 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:67 -#: lib/mv_web/live/member_live/show.ex:39 +#: lib/mv_web/live/member_live/index.html.heex:104 +#: lib/mv_web/live/member_live/show.ex:38 #, elixir-autogen, elixir-format msgid "House Number" msgstr "" @@ -147,15 +147,15 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:70 -#: lib/mv_web/live/member_live/show.ex:33 +#: lib/mv_web/live/member_live/index.html.heex:155 +#: lib/mv_web/live/member_live/show.ex:32 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:28 -#: lib/mv_web/live/member_live/index.html.heex:68 -#: lib/mv_web/live/member_live/show.ex:40 +#: lib/mv_web/live/member_live/index.html.heex:121 +#: lib/mv_web/live/member_live/show.ex:39 #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "" @@ -174,8 +174,8 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:66 -#: lib/mv_web/live/member_live/show.ex:38 +#: lib/mv_web/live/member_live/index.html.heex:87 +#: lib/mv_web/live/member_live/show.ex:37 #, elixir-autogen, elixir-format msgid "Street" msgstr "" @@ -318,14 +318,13 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:14 +#: lib/mv_web/components/layouts/navbar.ex:14 +#: lib/mv_web/live/member_live/index.ex:8 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:57 #: lib/mv_web/live/property_type_live/form.ex:16 #, elixir-autogen, elixir-format msgid "Name" @@ -470,11 +469,13 @@ msgid "Value type" msgstr "" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:55 #, elixir-autogen, elixir-format msgid "ascending" msgstr "" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:56 #, elixir-autogen, elixir-format msgid "descending" msgstr "" @@ -607,4 +608,12 @@ msgstr "" #: lib/mv_web/components/layouts/navbar.ex:20 #, elixir-autogen, elixir-format msgid "Users" +#: lib/mv_web/live/components/sort_header_component.ex:60 +#, elixir-autogen, elixir-format +msgid "Click to sort" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:53 +#, elixir-autogen, elixir-format +msgid "First name" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/auth.po b/priv/gettext/en/LC_MESSAGES/auth.po index 21bb4a4..59ce742 100644 --- a/priv/gettext/en/LC_MESSAGES/auth.po +++ b/priv/gettext/en/LC_MESSAGES/auth.po @@ -58,3 +58,6 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" + +#~ msgid "Sign in with Rauthy" +#~ msgstr "Sign in with Vereinscloud" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index ac30f5d..451ba84 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:84 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:65 #, 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:25 -#: lib/mv_web/live/member_live/index.html.heex:69 -#: lib/mv_web/live/member_live/show.ex:37 +#: lib/mv_web/live/member_live/index.html.heex:138 +#: lib/mv_web/live/member_live/show.ex:36 #, elixir-autogen, elixir-format msgid "City" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:86 +#: lib/mv_web/live/member_live/index.html.heex:195 #: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:78 +#: lib/mv_web/live/member_live/index.html.heex:187 #: lib/mv_web/live/user_live/form.ex:109 #: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format @@ -55,8 +55,8 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:65 -#: lib/mv_web/live/member_live/show.ex:28 +#: lib/mv_web/live/member_live/index.html.heex:70 +#: lib/mv_web/live/member_live/show.ex:27 #: lib/mv_web/live/user_live/form.ex:14 #: lib/mv_web/live/user_live/index.html.heex:44 #: lib/mv_web/live/user_live/show.ex:25 @@ -71,8 +71,8 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:71 -#: lib/mv_web/live/member_live/show.ex:34 +#: lib/mv_web/live/member_live/index.html.heex:172 +#: lib/mv_web/live/member_live/show.ex:33 #, elixir-autogen, elixir-format msgid "Join Date" msgstr "" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:75 +#: lib/mv_web/live/member_live/index.html.heex:184 #: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" @@ -128,8 +128,8 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:67 -#: lib/mv_web/live/member_live/show.ex:39 +#: lib/mv_web/live/member_live/index.html.heex:104 +#: lib/mv_web/live/member_live/show.ex:38 #, elixir-autogen, elixir-format msgid "House Number" msgstr "" @@ -147,15 +147,15 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:70 -#: lib/mv_web/live/member_live/show.ex:33 +#: lib/mv_web/live/member_live/index.html.heex:155 +#: lib/mv_web/live/member_live/show.ex:32 #, elixir-autogen, elixir-format msgid "Phone Number" msgstr "" #: lib/mv_web/live/member_live/form.ex:28 -#: lib/mv_web/live/member_live/index.html.heex:68 -#: lib/mv_web/live/member_live/show.ex:40 +#: lib/mv_web/live/member_live/index.html.heex:121 +#: lib/mv_web/live/member_live/show.ex:39 #, elixir-autogen, elixir-format msgid "Postal Code" msgstr "" @@ -174,8 +174,8 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:66 -#: lib/mv_web/live/member_live/show.ex:38 +#: lib/mv_web/live/member_live/index.html.heex:87 +#: lib/mv_web/live/member_live/show.ex:37 #, elixir-autogen, elixir-format msgid "Street" msgstr "" @@ -318,14 +318,13 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:14 +#: lib/mv_web/components/layouts/navbar.ex:14 +#: lib/mv_web/live/member_live/index.ex:8 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:57 #: lib/mv_web/live/property_type_live/form.ex:16 #, elixir-autogen, elixir-format msgid "Name" @@ -470,11 +469,13 @@ msgid "Value type" msgstr "" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:55 #, elixir-autogen, elixir-format msgid "ascending" msgstr "" #: lib/mv_web/components/table_components.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:56 #, elixir-autogen, elixir-format msgid "descending" msgstr "" @@ -554,57 +555,17 @@ msgstr "Set Password" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "User will be created without a password. Check 'Set Password' to add one." -#: lib/mv_web/live/user_live/show.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 +#, elixir-autogen, elixir-format +msgid "Click to sort" +msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:53 #, elixir-autogen, elixir-format, fuzzy -msgid "Linked Member" +msgid "First name" msgstr "" -#: lib/mv_web/live/member_live/show.ex:41 -#, elixir-autogen, elixir-format -msgid "Linked User" -msgstr "" - -#: lib/mv_web/live/user_live/show.ex:40 -#, elixir-autogen, elixir-format -msgid "No member linked" -msgstr "" - -#: lib/mv_web/live/member_live/show.ex:51 -#, elixir-autogen, elixir-format -msgid "No user linked" -msgstr "" - -#: lib/mv_web/live/member_live/show.ex:14 -#: lib/mv_web/live/member_live/show.ex:16 -#, elixir-autogen, elixir-format -msgid "Back to members list" -msgstr "" - -#: lib/mv_web/live/user_live/show.ex:13 -#: lib/mv_web/live/user_live/show.ex:15 -#, elixir-autogen, elixir-format -msgid "Back to users list" -msgstr "" - -#: lib/mv_web/components/layouts/navbar.ex:27 -#: lib/mv_web/components/layouts/navbar.ex:33 -#, elixir-autogen, elixir-format, fuzzy -msgid "Select language" -msgstr "" - -#: lib/mv_web/components/layouts/navbar.ex:40 -#: lib/mv_web/components/layouts/navbar.ex:60 -#, elixir-autogen, elixir-format -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 -#, elixir-autogen, elixir-format -msgid "Search..." -msgstr "" - -#: lib/mv_web/components/layouts/navbar.ex:20 -#, elixir-autogen, elixir-format, fuzzy -msgid "Users" -msgstr "" +#~ #: lib/mv_web/auth_overrides.ex:30 +#~ #, elixir-autogen, elixir-format +#~ msgid "or" +#~ msgstr "" From 9d98ec2494feb16ecf8dd6f259bb812cd2da8a25 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:46:03 +0200 Subject: [PATCH 016/119] formatting --- lib/mv_web/live/member_live/index.ex | 47 +++++++++++----------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 52b16ae..7a0de39 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -2,14 +2,13 @@ defmodule MvWeb.MemberLive.Index do use MvWeb, :live_view import Ash.Expr import Ash.Query - import MvWeb.TableComponents @impl true def mount(params, _session, socket) do socket = socket |> assign(:page_title, gettext("Members")) - |> assign(:query, "") + |> assign(:query, "") |> assign_new(:sort_field, fn -> :first_name end) |> assign_new(:sort_order, fn -> :asc end) |> assign(:selected_members, []) @@ -19,32 +18,6 @@ defmodule MvWeb.MemberLive.Index do {:ok, socket} end - # ----------------------------------------------------------------- - # Receive messages from any toolbar component - # ----------------------------------------------------------------- - - # Function to handle search - @impl true - def handle_info({:search_changed, q}, socket) do - members = - if String.trim(q) == "" do - Ash.read!(Mv.Membership.Member) - else - Mv.Membership.Member - |> filter(expr(fragment("search_vector @@ plainto_tsquery('simple', ?)", ^q))) - |> Ash.read!() - end - - {:noreply, - socket - |> assign(:query, q) - |> assign(:members, members)} - end - - # ----------------------------------------------------------------- - # Handle Events - # ----------------------------------------------------------------- - # ----------------------------------------------------------------- # Handle Events # ----------------------------------------------------------------- @@ -132,6 +105,24 @@ defmodule MvWeb.MemberLive.Index do )} end + # Function to handle search + @impl true + def handle_info({:search_changed, q}, socket) do + members = + if String.trim(q) == "" do + Ash.read!(Mv.Membership.Member) + else + Mv.Membership.Member + |> filter(expr(fragment("search_vector @@ plainto_tsquery('simple', ?)", ^q))) + |> Ash.read!() + end + + {:noreply, + socket + |> assign(:query, q) + |> assign(:members, members)} + end + # ----------------------------------------------------------------- # Handle Params from the URL # ----------------------------------------------------------------- From 85e1f370f674f1134102b21618f00842f8a15bfd Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 23 Oct 2025 15:43:08 +0200 Subject: [PATCH 017/119] fix: keep search term while sorting --- .../live/components/sort_header_component.ex | 48 ++++++----- lib/mv_web/live/member_live/index.ex | 84 ++++++++++++++----- 2 files changed, 89 insertions(+), 43 deletions(-) diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex index e69357e..3439d91 100644 --- a/lib/mv_web/live/components/sort_header_component.ex +++ b/lib/mv_web/live/components/sort_header_component.ex @@ -2,9 +2,9 @@ defmodule MvWeb.Components.SortHeaderComponent do @moduledoc """ Sort Header that can be used as column header and sorts a table: Props: - - field: atom() # Ash‑Field for sorting - - label: string() # Column Heading (can be aan heex templyte) - - sort_field: atom() | nil # current sort-field from parent liveview + - field: atom() # Ash Field for sorting + - label: string() # Column Heading (can be an heex template) + - sort_field: atom() | nil # current sort field from parent liveview - sort_order: :asc | :desc | nil # current sorting order """ use MvWeb, :live_component @@ -19,25 +19,27 @@ defmodule MvWeb.Components.SortHeaderComponent do @impl true def render(assigns) do ~H""" - +
+ +
""" end @@ -48,7 +50,7 @@ defmodule MvWeb.Components.SortHeaderComponent do end # ------------------------------------------------- - # Hilfsfunktionen für ARIA‑Attribute & Icon‑SVG + # Hilfsfunktionen für ARIA Attribute & Icon SVG # ------------------------------------------------- defp aria_sort(field, sort_field, dir) when field == sort_field do case dir do diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 7a0de39..4a05e29 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -4,7 +4,7 @@ defmodule MvWeb.MemberLive.Index do import Ash.Query @impl true - def mount(params, _session, socket) do + def mount(_params, _session, socket) do socket = socket |> assign(:page_title, gettext("Members")) @@ -14,7 +14,6 @@ defmodule MvWeb.MemberLive.Index do |> assign(:selected_members, []) # We call handle params to use the query from the URL - {:noreply, socket} = handle_params(params, nil, socket) {:ok, socket} end @@ -70,6 +69,7 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_info({:sort, field_str}, socket) do field = String.to_existing_atom(field_str) + old_field = socket.assigns.sort_field {new_order, new_field} = if socket.assigns.sort_field == field do @@ -79,28 +79,38 @@ defmodule MvWeb.MemberLive.Index do end active_id = :"sort_#{new_field}" + old_id = :"sort_#{old_field}" - # Update the SortHeader to + # Update the new SortHeader send_update(MvWeb.Components.SortHeaderComponent, id: active_id, sort_field: new_field, sort_order: new_order ) + # Reset the current SortHeader + send_update(MvWeb.Components.SortHeaderComponent, + id: old_id, + sort_field: new_field, + sort_order: new_order + ) + + existing_search_query = socket.assigns.query + # Build the URL with queries query_params = %{ + "query" => existing_search_query, "sort_field" => Atom.to_string(new_field), "sort_order" => Atom.to_string(new_order) } - # "/members" is the path you defined in router.ex - new_path = "/members?" <> URI.encode_query(query_params) + # Set the new path with params + new_path = ~p"/members?#{query_params}" # Push the new URL {:noreply, push_patch(socket, to: new_path, - # replace true replace: true )} end @@ -108,19 +118,27 @@ defmodule MvWeb.MemberLive.Index do # Function to handle search @impl true def handle_info({:search_changed, q}, socket) do - members = - if String.trim(q) == "" do - Ash.read!(Mv.Membership.Member) - else - Mv.Membership.Member - |> filter(expr(fragment("search_vector @@ plainto_tsquery('simple', ?)", ^q))) - |> Ash.read!() - end + socket = load_members(socket, q) + existing_field_query = socket.assigns.sort_field + existing_sort_query = socket.assigns.sort_order + + # Build the URL with queries + query_params = %{ + "query" => q, + "sort_field" => existing_field_query, + "sort_order" => existing_sort_query + } + + # Set the new path with params + new_path = ~p"/members?#{query_params}" + + # Push the new URL {:noreply, - socket - |> assign(:query, q) - |> assign(:members, members)} + push_patch(socket, + to: new_path, + replace: true + )} end # ----------------------------------------------------------------- @@ -130,8 +148,9 @@ defmodule MvWeb.MemberLive.Index do def handle_params(params, _url, socket) do socket = socket + |> maybe_update_search(params) |> maybe_update_sort(params) - |> load_members() + |> load_members(params["query"]) {:noreply, socket} end @@ -140,7 +159,7 @@ defmodule MvWeb.MemberLive.Index do # FUNCTIONS # ------------------------------------------------------------- # Load members eg based on a query for sorting - defp load_members(socket) do + defp load_members(socket, search_query) do query = Mv.Membership.Member |> Ash.Query.new() @@ -156,7 +175,12 @@ defmodule MvWeb.MemberLive.Index do :phone_number, :join_date ]) - |> maybe_sort(socket.assigns.sort_field, socket.assigns.sort_order) + + # Apply the search filter first + query = apply_search_filter(query, search_query) + + # Apply sorting based on current socket state + query = maybe_sort(query, socket.assigns.sort_field, socket.assigns.sort_order) members = Ash.read!(query) assign(socket, :members, members) @@ -166,6 +190,16 @@ defmodule MvWeb.MemberLive.Index do # Helper Functions # ------------------------------------------------------------- + # Function to apply search query + defp apply_search_filter(query, search_query) do + if search_query && String.trim(search_query) != "" do + query + |> filter(expr(fragment("search_vector @@ plainto_tsquery('simple', ?)", ^search_query))) + else + query + end + end + # Functions to toggle sorting order defp toggle_order(:asc), do: :desc defp toggle_order(:desc), do: :asc @@ -193,4 +227,14 @@ defmodule MvWeb.MemberLive.Index do end defp maybe_update_sort(socket, _), do: socket + + # Function to update search parameters + defp maybe_update_search(socket, %{"query" => query}) when query != "" do + assign(socket, :query, query) + end + + defp maybe_update_search(socket, _params) do + # Keep the previous search query if no new one is provided + socket + end end From eb42b9fe0adc10b3f1ba936624ae30cc06d816e8 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 23 Oct 2025 15:44:08 +0200 Subject: [PATCH 018/119] fix: keep search term on refresh and enter --- lib/mv_web/live/components/search_bar_component.ex | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/mv_web/live/components/search_bar_component.ex b/lib/mv_web/live/components/search_bar_component.ex index 3eb5246..c45a1e5 100644 --- a/lib/mv_web/live/components/search_bar_component.ex +++ b/lib/mv_web/live/components/search_bar_component.ex @@ -8,10 +8,10 @@ defmodule MvWeb.Components.SearchBarComponent do use MvWeb, :live_component @impl true - def update(_assigns, socket) do + def update(%{query: query}, socket) do socket = socket - |> assign_new(:query, fn -> "" end) + |> assign_new(:query, fn -> query || "" end) |> assign_new(:placeholder, fn -> gettext("Search...") end) {:ok, socket} @@ -20,7 +20,7 @@ defmodule MvWeb.Components.SearchBarComponent do @impl true def render(assigns) do ~H""" -
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index c7f0048..f6acdca 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -290,7 +290,7 @@ msgstr "ID" msgid "Immutable" msgstr "Unveränderlich" -#: lib/mv_web/components/layouts/navbar.ex:93 +#: lib/mv_web/components/layouts/navbar.ex:94 #, elixir-autogen, elixir-format msgid "Logout" msgstr "Abmelden" @@ -350,7 +350,7 @@ msgstr "OIDC ID" msgid "Password Authentication" msgstr "Passwort-Authentifizierung" -#: lib/mv_web/components/layouts/navbar.ex:88 +#: lib/mv_web/components/layouts/navbar.ex:89 #, elixir-autogen, elixir-format msgid "Profil" msgstr "Profil" @@ -370,7 +370,7 @@ msgstr "Alle Mitglieder auswählen" msgid "Select member" msgstr "Mitglied auswählen" -#: lib/mv_web/components/layouts/navbar.ex:91 +#: lib/mv_web/components/layouts/navbar.ex:92 #, elixir-autogen, elixir-format msgid "Settings" msgstr "Einstellungen" @@ -535,14 +535,14 @@ msgstr "Zurück zur Mitgliederliste" msgid "Back to users list" msgstr "Zurück zur Benutzer*innen-Liste" -#: lib/mv_web/components/layouts/navbar.ex:26 -#: lib/mv_web/components/layouts/navbar.ex:32 +#: lib/mv_web/components/layouts/navbar.ex:27 +#: lib/mv_web/components/layouts/navbar.ex:33 #, elixir-autogen, elixir-format msgid "Select language" msgstr "Sprache auswählen" -#: lib/mv_web/components/layouts/navbar.ex:39 -#: lib/mv_web/components/layouts/navbar.ex:59 +#: lib/mv_web/components/layouts/navbar.ex:40 +#: lib/mv_web/components/layouts/navbar.ex:60 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "Dunklen Modus umschalten" @@ -553,7 +553,7 @@ msgstr "Dunklen Modus umschalten" msgid "Search..." msgstr "Suchen..." -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:21 #, elixir-autogen, elixir-format msgid "Users" msgstr "Benutzer*innen" @@ -650,3 +650,8 @@ msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenba #, elixir-autogen, elixir-format msgid "Use this form to manage custom_field_value records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten." + +#: lib/mv_web/components/layouts/navbar.ex:20 +#, elixir-autogen, elixir-format +msgid "Custom Fields" +msgstr "Benutzerdefinierte Felder" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 684515b..d150a60 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -291,7 +291,7 @@ msgstr "" msgid "Immutable" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:93 +#: lib/mv_web/components/layouts/navbar.ex:94 #, elixir-autogen, elixir-format msgid "Logout" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid "Password Authentication" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:88 +#: lib/mv_web/components/layouts/navbar.ex:89 #, elixir-autogen, elixir-format msgid "Profil" msgstr "" @@ -371,7 +371,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:91 +#: lib/mv_web/components/layouts/navbar.ex:92 #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -536,14 +536,14 @@ msgstr "" msgid "Back to users list" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:26 -#: lib/mv_web/components/layouts/navbar.ex:32 +#: lib/mv_web/components/layouts/navbar.ex:27 +#: lib/mv_web/components/layouts/navbar.ex:33 #, elixir-autogen, elixir-format msgid "Select language" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:39 -#: lib/mv_web/components/layouts/navbar.ex:59 +#: lib/mv_web/components/layouts/navbar.ex:40 +#: lib/mv_web/components/layouts/navbar.ex:60 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:21 #, elixir-autogen, elixir-format msgid "Users" msgstr "" @@ -651,3 +651,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Use this form to manage custom_field_value records in your database." msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex:20 +#, elixir-autogen, elixir-format +msgid "Custom Fields" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 01b3e95..df56e75 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -291,7 +291,7 @@ msgstr "" msgid "Immutable" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:93 +#: lib/mv_web/components/layouts/navbar.ex:94 #, elixir-autogen, elixir-format msgid "Logout" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid "Password Authentication" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:88 +#: lib/mv_web/components/layouts/navbar.ex:89 #, elixir-autogen, elixir-format msgid "Profil" msgstr "" @@ -371,7 +371,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:91 +#: lib/mv_web/components/layouts/navbar.ex:92 #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -536,14 +536,14 @@ msgstr "" msgid "Back to users list" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:26 -#: lib/mv_web/components/layouts/navbar.ex:32 +#: lib/mv_web/components/layouts/navbar.ex:27 +#: lib/mv_web/components/layouts/navbar.ex:33 #, elixir-autogen, elixir-format, fuzzy msgid "Select language" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:39 -#: lib/mv_web/components/layouts/navbar.ex:59 +#: lib/mv_web/components/layouts/navbar.ex:40 +#: lib/mv_web/components/layouts/navbar.ex:60 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:21 #, elixir-autogen, elixir-format, fuzzy msgid "Users" msgstr "" @@ -651,3 +651,8 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "Use this form to manage custom_field_value records in your database." msgstr "" + +#: lib/mv_web/components/layouts/navbar.ex:20 +#, elixir-autogen, elixir-format, fuzzy +msgid "Custom Fields" +msgstr "" From bc75a5853a5a0fa78133713a89549058b9544bcc Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 13:48:05 +0100 Subject: [PATCH 065/119] fix: correction of some english translation --- lib/mv_web/live/custom_field_value_live/form.ex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 10 +++++----- priv/gettext/default.pot | 10 +++++----- priv/gettext/en/LC_MESSAGES/default.po | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/mv_web/live/custom_field_value_live/form.ex b/lib/mv_web/live/custom_field_value_live/form.ex index 7df4c69..4a7b02d 100644 --- a/lib/mv_web/live/custom_field_value_live/form.ex +++ b/lib/mv_web/live/custom_field_value_live/form.ex @@ -39,7 +39,7 @@ defmodule MvWeb.CustomFieldValueLive.Form do <.header> {@page_title} <:subtitle> - {gettext("Use this form to manage custom_field_value records in your database.")} + {gettext("Use this form to manage Custom Field Value records in your database.")} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index f6acdca..32822bf 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -646,12 +646,12 @@ msgstr "Benutzerdefinierten Feldwert speichern" msgid "Use this form to manage custom_field records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." -#: lib/mv_web/live/custom_field_value_live/form.ex:42 -#, elixir-autogen, elixir-format -msgid "Use this form to manage custom_field_value records in your database." -msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten." - #: lib/mv_web/components/layouts/navbar.ex:20 #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" + +#: lib/mv_web/live/custom_field_value_live/form.ex:42 +#, elixir-autogen, elixir-format, fuzzy +msgid "Use this form to manage Custom Field Value records in your database." +msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten." diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index d150a60..1dca601 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -647,12 +647,12 @@ msgstr "" msgid "Use this form to manage custom_field records in your database." msgstr "" -#: lib/mv_web/live/custom_field_value_live/form.ex:42 -#, elixir-autogen, elixir-format -msgid "Use this form to manage custom_field_value records in your database." -msgstr "" - #: lib/mv_web/components/layouts/navbar.ex:20 #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "" + +#: lib/mv_web/live/custom_field_value_live/form.ex:42 +#, elixir-autogen, elixir-format +msgid "Use this form to manage Custom Field Value records in your database." +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index df56e75..e4e1d29 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -647,12 +647,12 @@ msgstr "" msgid "Use this form to manage custom_field records in your database." msgstr "" -#: lib/mv_web/live/custom_field_value_live/form.ex:42 -#, elixir-autogen, elixir-format, fuzzy -msgid "Use this form to manage custom_field_value records in your database." -msgstr "" - #: lib/mv_web/components/layouts/navbar.ex:20 #, elixir-autogen, elixir-format, fuzzy msgid "Custom Fields" msgstr "" + +#: lib/mv_web/live/custom_field_value_live/form.ex:42 +#, elixir-autogen, elixir-format, fuzzy +msgid "Use this form to manage Custom Field Value records in your database." +msgstr "" From edf8b2b79e643b6d3af95c7c76cc602069d1f48a Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 13 Nov 2025 19:17:18 +0100 Subject: [PATCH 066/119] feat: add custom field slug --- docs/database_schema.dbml | 23 +- lib/membership/custom_field.ex | 19 +- .../custom_field/changes/generate_slug.ex | 118 ++++++ lib/mv_web/live/custom_field_live/form.ex | 17 + lib/mv_web/live/custom_field_live/index.ex | 3 +- lib/mv_web/live/custom_field_live/show.ex | 6 +- mix.exs | 3 +- ...251113180429_add_slug_to_custom_fields.exs | 47 +++ .../repo/custom_fields/20251113180429.json | 132 ++++++ test/membership/custom_field_slug_test.exs | 397 ++++++++++++++++++ 10 files changed, 756 insertions(+), 9 deletions(-) create mode 100644 lib/membership/custom_field/changes/generate_slug.ex create mode 100644 priv/repo/migrations/20251113180429_add_slug_to_custom_fields.exs create mode 100644 priv/resource_snapshots/repo/custom_fields/20251113180429.json create mode 100644 test/membership/custom_field_slug_test.exs diff --git a/docs/database_schema.dbml b/docs/database_schema.dbml index 431e064..33c0647 100644 --- a/docs/database_schema.dbml +++ b/docs/database_schema.dbml @@ -6,7 +6,7 @@ // - https://dbdocs.io // - VS Code Extensions: "DBML Language" or "dbdiagram.io" // -// Version: 1.1 +// Version: 1.2 // Last Updated: 2025-11-13 Project mila_membership_management { @@ -236,6 +236,7 @@ Table custom_field_values { Table custom_fields { id uuid [pk, not null, default: `gen_random_uuid()`, note: 'Primary identifier'] name text [not null, unique, note: 'CustomFieldValue name/identifier (e.g., "membership_number")'] + slug text [not null, unique, note: 'URL-friendly, immutable identifier (e.g., "membership-number"). Auto-generated from name.'] value_type text [not null, note: 'Data type: string | integer | boolean | date | email'] description text [null, note: 'Human-readable description'] immutable boolean [not null, default: false, note: 'If true, value cannot be changed after creation'] @@ -243,6 +244,7 @@ Table custom_fields { indexes { name [unique, name: 'custom_fields_unique_name_index'] + slug [unique, name: 'custom_fields_unique_slug_index'] } Note: ''' @@ -252,21 +254,32 @@ Table custom_fields { **Attributes:** - `name`: Unique identifier for the custom field + - `slug`: URL-friendly, human-readable identifier (auto-generated, immutable) - `value_type`: Enforces data type consistency - `description`: Documentation for users/admins - `immutable`: Prevents changes after initial creation (e.g., membership numbers) - `required`: Enforces that all members must have this custom field + **Slug Generation:** + - Automatically generated from `name` on creation + - Immutable after creation (does not change when name is updated) + - Lowercase, spaces replaced with hyphens, special characters removed + - UTF-8 support (ä → a, ß → ss, etc.) + - Used for human-readable identifiers (CSV export/import, API, etc.) + - Examples: "Mobile Phone" → "mobile-phone", "Café Müller" → "cafe-muller" + **Constraints:** - `value_type` must be one of: string, integer, boolean, date, email - `name` must be unique across all custom fields + - `slug` must be unique across all custom fields + - `slug` cannot be empty (validated on creation) - Cannot be deleted if custom_field_values reference it (ON DELETE RESTRICT) **Examples:** - - Membership Number (string, immutable, required) - - Emergency Contact (string, mutable, optional) - - Certified Trainer (boolean, mutable, optional) - - Certification Date (date, immutable, optional) + - Membership Number (string, immutable, required) → slug: "membership-number" + - Emergency Contact (string, mutable, optional) → slug: "emergency-contact" + - Certified Trainer (boolean, mutable, optional) → slug: "certified-trainer" + - Certification Date (date, immutable, optional) → slug: "certification-date" ''' } diff --git a/lib/membership/custom_field.ex b/lib/membership/custom_field.ex index 90bbcaa..4c84c20 100644 --- a/lib/membership/custom_field.ex +++ b/lib/membership/custom_field.ex @@ -9,6 +9,7 @@ defmodule Mv.Membership.CustomField do ## Attributes - `name` - Unique identifier for the custom field (e.g., "phone_mobile", "birthday") + - `slug` - URL-friendly, immutable identifier automatically generated from name (e.g., "phone-mobile") - `value_type` - Data type constraint (`:string`, `:integer`, `:boolean`, `:date`, `:email`) - `description` - Optional human-readable description - `immutable` - If true, custom field values cannot be changed after creation @@ -54,8 +55,14 @@ defmodule Mv.Membership.CustomField do end actions do - defaults [:create, :read, :update, :destroy] + defaults [:read, :update, :destroy] default_accept [:name, :value_type, :description, :immutable, :required] + + create :create do + accept [:name, :value_type, :description, :immutable, :required] + change Mv.Membership.CustomField.Changes.GenerateSlug + validate string_length(:slug, min: 1) + end end attributes do @@ -69,6 +76,15 @@ defmodule Mv.Membership.CustomField do trim?: true ] + attribute :slug, :string, + allow_nil?: false, + public?: true, + writable?: false, + constraints: [ + max_length: 100, + trim?: true + ] + attribute :value_type, :atom, constraints: [one_of: [:string, :integer, :boolean, :date, :email]], allow_nil?: false, @@ -97,5 +113,6 @@ defmodule Mv.Membership.CustomField do identities do identity :unique_name, [:name] + identity :unique_slug, [:slug] end end diff --git a/lib/membership/custom_field/changes/generate_slug.ex b/lib/membership/custom_field/changes/generate_slug.ex new file mode 100644 index 0000000..061d7e7 --- /dev/null +++ b/lib/membership/custom_field/changes/generate_slug.ex @@ -0,0 +1,118 @@ +defmodule Mv.Membership.CustomField.Changes.GenerateSlug do + @moduledoc """ + Ash Change that automatically generates a URL-friendly slug from the `name` attribute. + + ## Behavior + + - **On Create**: Generates a slug from the name attribute using slugify + - **On Update**: Slug remains unchanged (immutable after creation) + - **Slug Generation**: Uses the `slugify` library to convert name to slug + - Converts to lowercase + - Replaces spaces with hyphens + - Removes special characters + - Handles UTF-8 characters (e.g., ä → a, ß → ss) + - Trims leading/trailing hyphens + - Truncates to max 100 characters + + ## Examples + + # Create with automatic slug generation + CustomField.create!(%{name: "Mobile Phone"}) + # => %CustomField{name: "Mobile Phone", slug: "mobile-phone"} + + # German umlauts are converted + CustomField.create!(%{name: "Café Müller"}) + # => %CustomField{name: "Café Müller", slug: "cafe-muller"} + + # Slug is immutable on update + custom_field = CustomField.create!(%{name: "Original"}) + CustomField.update!(custom_field, %{name: "New Name"}) + # => %CustomField{name: "New Name", slug: "original"} # slug unchanged! + + ## Implementation Note + + This change only runs on `:create` actions. The slug is immutable by design, + as changing slugs would break external references (e.g., CSV imports/exports). + """ + use Ash.Resource.Change + + @doc """ + Generates a slug from the changeset's `name` attribute. + + Only runs on create actions. Returns the changeset unchanged if: + - The action is not :create + - The name is not being changed + - The name is nil or empty + + ## Parameters + + - `changeset` - The Ash changeset + + ## Returns + + The changeset with the `:slug` attribute set to the generated slug. + """ + def change(changeset, _opts, _context) do + # Only generate slug on create, not on update (immutability) + if changeset.action_type == :create do + case Ash.Changeset.get_attribute(changeset, :name) do + nil -> + changeset + + name when is_binary(name) -> + slug = generate_slug(name) + Ash.Changeset.force_change_attribute(changeset, :slug, slug) + end + else + # On update, don't touch the slug (immutable) + changeset + end + end + + @doc """ + Generates a URL-friendly slug from a given string. + + Uses the `slugify` library to create a clean, lowercase slug with: + - Spaces replaced by hyphens + - Special characters removed + - UTF-8 characters transliterated (ä → a, ß → ss, etc.) + - Multiple consecutive hyphens reduced to single hyphen + - Leading/trailing hyphens removed + - Maximum length of 100 characters + + ## Examples + + iex> generate_slug("Mobile Phone") + "mobile-phone" + + iex> generate_slug("Café Müller") + "cafe-muller" + + iex> generate_slug("TEST NAME") + "test-name" + + iex> generate_slug("E-Mail & Address!") + "e-mail-address" + + iex> generate_slug("Multiple Spaces") + "multiple-spaces" + + iex> generate_slug("-Test-") + "test" + + iex> generate_slug("Straße") + "strasse" + + """ + def generate_slug(name) when is_binary(name) do + slug = Slug.slugify(name) + + case slug do + nil -> "" + "" -> "" + slug when is_binary(slug) -> String.slice(slug, 0, 100) + end + end + + def generate_slug(_), do: "" +end diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex index b1d3f86..176edc8 100644 --- a/lib/mv_web/live/custom_field_live/form.ex +++ b/lib/mv_web/live/custom_field_live/form.ex @@ -19,6 +19,9 @@ defmodule MvWeb.CustomFieldLive.Form do - immutable - If true, values cannot be changed after creation (default: false) - required - If true, all members must have this custom field (default: false) + **Read-only (Edit mode only):** + - slug - Auto-generated URL-friendly identifier (immutable) + ## Value Type Selection - `:string` - Text data (unlimited length) - `:integer` - Numeric data @@ -48,6 +51,20 @@ defmodule MvWeb.CustomFieldLive.Form do <.form for={@form} id="custom_field-form" phx-change="validate" phx-submit="save"> <.input field={@form[:name]} type="text" label={gettext("Name")} /> + + <%!-- Show slug in edit mode (read-only) --%> +
+ +
+ {@custom_field.slug} +
+

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

+
+ <.input field={@form[:value_type]} type="select" diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex index 2870611..bbd8603 100644 --- a/lib/mv_web/live/custom_field_live/index.ex +++ b/lib/mv_web/live/custom_field_live/index.ex @@ -11,6 +11,7 @@ defmodule MvWeb.CustomFieldLive.Index do - Delete custom fields (if no custom field values use them) ## Displayed Information + - Slug: URL-friendly identifier (auto-generated from name) - Name: Unique identifier for the custom field - Value type: Data type constraint (string, integer, boolean, date, email) - Description: Human-readable explanation @@ -43,7 +44,7 @@ defmodule MvWeb.CustomFieldLive.Index do rows={@streams.custom_fields} row_click={fn {_id, custom_field} -> JS.navigate(~p"/custom_fields/#{custom_field}") end} > - <:col :let={{_id, custom_field}} label="Id">{custom_field.id} + <:col :let={{_id, custom_field}} label="Slug">{custom_field.slug} <:col :let={{_id, custom_field}} label="Name">{custom_field.name} diff --git a/lib/mv_web/live/custom_field_live/show.ex b/lib/mv_web/live/custom_field_live/show.ex index 783cb4e..2b2ba65 100644 --- a/lib/mv_web/live/custom_field_live/show.ex +++ b/lib/mv_web/live/custom_field_live/show.ex @@ -9,6 +9,8 @@ defmodule MvWeb.CustomFieldLive.Show do - Return to custom field list ## Displayed Information + - ID: Internal UUID identifier + - Slug: URL-friendly identifier (auto-generated, immutable) - Name: Unique identifier - Value type: Data type constraint - Description: Optional explanation @@ -29,7 +31,7 @@ defmodule MvWeb.CustomFieldLive.Show do ~H""" <.header> - Custom field {@custom_field.id} + Custom field {@custom_field.slug} <:subtitle>This is a custom_field record from your database. <:actions> @@ -48,6 +50,8 @@ defmodule MvWeb.CustomFieldLive.Show do <.list> <:item title="Id">{@custom_field.id} + <:item title="Slug">{@custom_field.slug} + <:item title="Name">{@custom_field.name} <:item title="Description">{@custom_field.description} diff --git a/mix.exs b/mix.exs index b215d59..c6e4fb5 100644 --- a/mix.exs +++ b/mix.exs @@ -75,7 +75,8 @@ defmodule Mv.MixProject do {:mix_audit, "~> 2.1", only: [:dev, :test], runtime: false}, {:sobelow, "~> 0.14", only: [:dev, :test], runtime: false}, {:credo, "~> 1.7", only: [:dev, :test], runtime: false}, - {:ecto_commons, "~> 0.3"} + {:ecto_commons, "~> 0.3"}, + {:slugify, "~> 1.3"} ] end diff --git a/priv/repo/migrations/20251113180429_add_slug_to_custom_fields.exs b/priv/repo/migrations/20251113180429_add_slug_to_custom_fields.exs new file mode 100644 index 0000000..bebf799 --- /dev/null +++ b/priv/repo/migrations/20251113180429_add_slug_to_custom_fields.exs @@ -0,0 +1,47 @@ +defmodule Mv.Repo.Migrations.AddSlugToCustomFields 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 + # Step 1: Add slug column as nullable first + alter table(:custom_fields) do + add :slug, :text, null: true + end + + # Step 2: Generate slugs for existing custom fields + execute(""" + UPDATE custom_fields + SET slug = lower( + regexp_replace( + regexp_replace( + regexp_replace(name, '[^a-zA-Z0-9\\s-]', '', 'g'), + '\\s+', '-', 'g' + ), + '-+', '-', 'g' + ) + ) + WHERE slug IS NULL + """) + + # Step 3: Make slug NOT NULL + alter table(:custom_fields) do + modify :slug, :text, null: false + end + + # Step 4: Create unique index + create unique_index(:custom_fields, [:slug], name: "custom_fields_unique_slug_index") + end + + def down do + drop_if_exists unique_index(:custom_fields, [:slug], name: "custom_fields_unique_slug_index") + + alter table(:custom_fields) do + remove :slug + end + end +end diff --git a/priv/resource_snapshots/repo/custom_fields/20251113180429.json b/priv/resource_snapshots/repo/custom_fields/20251113180429.json new file mode 100644 index 0000000..5a89de9 --- /dev/null +++ b/priv/resource_snapshots/repo/custom_fields/20251113180429.json @@ -0,0 +1,132 @@ +{ + "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" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "DB1D3D9F2F76F518CAEEA2CC855996CCD87FC4C8FDD3A37345CEF2980674D8F3", + "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/test/membership/custom_field_slug_test.exs b/test/membership/custom_field_slug_test.exs new file mode 100644 index 0000000..ae6c42e --- /dev/null +++ b/test/membership/custom_field_slug_test.exs @@ -0,0 +1,397 @@ +defmodule Mv.Membership.CustomFieldSlugTest do + @moduledoc """ + Tests for automatic slug generation on CustomField resource. + + This test suite verifies: + 1. Slugs are automatically generated from the name attribute + 2. Slugs are unique (cannot have duplicates) + 3. Slugs are immutable (don't change when name changes) + 4. Slugs handle various edge cases (unicode, special chars, etc.) + 5. Slugs can be used for lookups + """ + use Mv.DataCase, async: true + + alias Mv.Membership.CustomField + + describe "automatic slug generation on create" do + test "generates slug from name with simple ASCII text" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Mobile Phone", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "mobile-phone" + end + + test "generates slug from name with German umlauts" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Café Müller", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "cafe-muller" + end + + test "generates slug with lowercase conversion" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "TEST NAME", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "test-name" + end + + test "generates slug by removing special characters" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "E-Mail & Address!", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "e-mail-address" + end + + test "generates slug by replacing multiple spaces with single hyphen" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Multiple Spaces", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "multiple-spaces" + end + + test "trims leading and trailing hyphens" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "-Test-", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "test" + end + + test "handles unicode characters properly (ß becomes ss)" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Straße", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "strasse" + end + end + + describe "slug uniqueness" do + test "prevents creating custom field with duplicate slug" do + # Create first custom field + {:ok, _custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string + }) + |> Ash.create() + + # Attempt to create second custom field with same slug (different case in name) + assert {:error, %Ash.Error.Invalid{} = error} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test", + value_type: :integer + }) + |> Ash.create() + + assert Exception.message(error) =~ "has already been taken" + end + + test "allows custom fields with different slugs" do + {:ok, custom_field1} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test One", + value_type: :string + }) + |> Ash.create() + + {:ok, custom_field2} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test Two", + value_type: :string + }) + |> Ash.create() + + assert custom_field1.slug == "test-one" + assert custom_field2.slug == "test-two" + assert custom_field1.slug != custom_field2.slug + end + + test "prevents duplicate slugs when names differ only in special characters" do + {:ok, custom_field1} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test!!!", + value_type: :string + }) + |> Ash.create() + + assert custom_field1.slug == "test" + + # Second custom field with name that generates the same slug should fail + assert {:error, %Ash.Error.Invalid{} = error} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test???", + value_type: :string + }) + |> Ash.create() + + # Should fail with uniqueness constraint error + assert Exception.message(error) =~ "has already been taken" + end + end + + describe "slug immutability" do + test "slug cannot be manually set on create" do + # Attempting to set slug manually should fail because slug is not writable + result = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string, + slug: "custom-slug" + }) + |> Ash.create() + + # Should fail because slug is not an accepted input + assert {:error, %Ash.Error.Invalid{}} = result + assert Exception.message(elem(result, 1)) =~ "No such input" + end + + test "slug does not change when name is updated" do + # Create custom field + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Original Name", + value_type: :string + }) + |> Ash.create() + + original_slug = custom_field.slug + assert original_slug == "original-name" + + # Update the name + {:ok, updated_custom_field} = + custom_field + |> Ash.Changeset.for_update(:update, %{ + name: "New Different Name" + }) + |> Ash.update() + + # Slug should remain unchanged + assert updated_custom_field.slug == original_slug + assert updated_custom_field.slug == "original-name" + assert updated_custom_field.name == "New Different Name" + end + + test "slug cannot be manually updated" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string + }) + |> Ash.create() + + original_slug = custom_field.slug + assert original_slug == "test" + + # Attempt to manually update slug should fail because slug is not writable + result = + custom_field + |> Ash.Changeset.for_update(:update, %{ + slug: "new-slug" + }) + |> Ash.update() + + # Should fail because slug is not an accepted input + assert {:error, %Ash.Error.Invalid{}} = result + assert Exception.message(elem(result, 1)) =~ "No such input" + + # Reload to verify slug hasn't changed + reloaded = Ash.get!(CustomField, custom_field.id) + assert reloaded.slug == "test" + end + end + + describe "slug edge cases" do + test "handles very long names by truncating slug" do + # Create a name at the maximum length (100 chars) + long_name = String.duplicate("abcdefghij", 10) + # 100 characters exactly + + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: long_name, + value_type: :string + }) + |> Ash.create() + + # Slug should be truncated to maximum 100 characters + assert String.length(custom_field.slug) <= 100 + # Should be the full slugified version since name is exactly 100 chars + assert custom_field.slug == long_name + end + + test "rejects name with only special characters" do + # When name contains only special characters, slug would be empty + # This should fail validation + assert {:error, %Ash.Error.Invalid{} = error} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "!!!", + value_type: :string + }) + |> Ash.create() + + # Should fail because slug would be empty + error_message = Exception.message(error) + assert error_message =~ "Slug cannot be empty" or error_message =~ "is required" + end + + test "handles mixed special characters and text" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test@#$%Name", + value_type: :string + }) + |> Ash.create() + + # slugify keeps the hyphen between words + assert custom_field.slug == "test-name" + end + + test "handles numbers in name" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Field 123 Test", + value_type: :string + }) + |> Ash.create() + + assert custom_field.slug == "field-123-test" + end + + test "handles consecutive hyphens in name" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test---Name", + value_type: :string + }) + |> Ash.create() + + # Should reduce multiple hyphens to single hyphen + assert custom_field.slug == "test-name" + end + + test "handles name with dots and underscores" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test.field_name", + value_type: :string + }) + |> Ash.create() + + # Dots and underscores should be handled (either kept or converted) + assert custom_field.slug =~ ~r/^[a-z0-9-]+$/ + end + end + + describe "slug in queries and responses" do + test "slug is included in struct after create" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string + }) + |> Ash.create() + + # Slug should be present in the struct + assert Map.has_key?(custom_field, :slug) + assert custom_field.slug != nil + end + + test "can load custom field and slug is present" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string + }) + |> Ash.create() + + # Load it back + loaded_custom_field = Ash.get!(CustomField, custom_field.id) + + assert loaded_custom_field.slug == "test" + end + + test "slug is returned in list queries" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test", + value_type: :string + }) + |> Ash.create() + + custom_fields = Ash.read!(CustomField) + + found = Enum.find(custom_fields, &(&1.id == custom_field.id)) + assert found.slug == "test" + end + end + + describe "slug-based lookup (future feature)" do + @tag :skip + test "can find custom field by slug" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "Test Field", + value_type: :string + }) + |> Ash.create() + + # This test is for future implementation + # We might add a custom action like :by_slug + found = Ash.get!(CustomField, custom_field.slug, load: [:slug]) + assert found.id == custom_field.id + end + end +end From c246ca59dbe79eddb785c53512a48d356e224f8a Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 14:13:56 +0100 Subject: [PATCH 067/119] feat: hide slug from user --- lib/mv_web/live/custom_field_live/form.ex | 16 ---------------- lib/mv_web/live/custom_field_live/index.ex | 3 --- lib/mv_web/live/custom_field_live/show.ex | 7 ++++++- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex index 176edc8..ab8f104 100644 --- a/lib/mv_web/live/custom_field_live/form.ex +++ b/lib/mv_web/live/custom_field_live/form.ex @@ -19,9 +19,6 @@ defmodule MvWeb.CustomFieldLive.Form do - immutable - If true, values cannot be changed after creation (default: false) - required - If true, all members must have this custom field (default: false) - **Read-only (Edit mode only):** - - slug - Auto-generated URL-friendly identifier (immutable) - ## Value Type Selection - `:string` - Text data (unlimited length) - `:integer` - Numeric data @@ -52,19 +49,6 @@ defmodule MvWeb.CustomFieldLive.Form do <.form for={@form} id="custom_field-form" phx-change="validate" phx-submit="save"> <.input field={@form[:name]} type="text" label={gettext("Name")} /> - <%!-- Show slug in edit mode (read-only) --%> -
- -
- {@custom_field.slug} -
-

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

-
- <.input field={@form[:value_type]} type="select" diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex index bbd8603..65a3ab3 100644 --- a/lib/mv_web/live/custom_field_live/index.ex +++ b/lib/mv_web/live/custom_field_live/index.ex @@ -11,7 +11,6 @@ defmodule MvWeb.CustomFieldLive.Index do - Delete custom fields (if no custom field values use them) ## Displayed Information - - Slug: URL-friendly identifier (auto-generated from name) - Name: Unique identifier for the custom field - Value type: Data type constraint (string, integer, boolean, date, email) - Description: Human-readable explanation @@ -44,8 +43,6 @@ defmodule MvWeb.CustomFieldLive.Index do rows={@streams.custom_fields} row_click={fn {_id, custom_field} -> JS.navigate(~p"/custom_fields/#{custom_field}") end} > - <:col :let={{_id, custom_field}} label="Slug">{custom_field.slug} - <:col :let={{_id, custom_field}} label="Name">{custom_field.name} <:col :let={{_id, custom_field}} label="Description">{custom_field.description} diff --git a/lib/mv_web/live/custom_field_live/show.ex b/lib/mv_web/live/custom_field_live/show.ex index 2b2ba65..239b844 100644 --- a/lib/mv_web/live/custom_field_live/show.ex +++ b/lib/mv_web/live/custom_field_live/show.ex @@ -50,7 +50,12 @@ defmodule MvWeb.CustomFieldLive.Show do <.list> <:item title="Id">{@custom_field.id} - <:item title="Slug">{@custom_field.slug} + <:item title="Slug"> + {@custom_field.slug} +

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

+ <:item title="Name">{@custom_field.name} From efb3e1cc37b7a43ffde8827ef588a8ebd6495b79 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 14:16:34 +0100 Subject: [PATCH 068/119] feat: add translation --- priv/gettext/de/LC_MESSAGES/default.po | 25 +++++++++++++++---------- priv/gettext/default.pot | 25 +++++++++++++++---------- priv/gettext/en/LC_MESSAGES/default.po | 25 +++++++++++++++---------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 32822bf..527a279 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -158,7 +158,7 @@ msgstr "Postleitzahl" msgid "Save Member" msgstr "Mitglied speichern" -#: lib/mv_web/live/custom_field_live/form.ex:63 +#: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:124 @@ -203,14 +203,14 @@ msgstr "Dies ist ein Mitglied aus deiner Datenbank." msgid "Yes" msgstr "Ja" -#: lib/mv_web/live/custom_field_live/form.ex:107 +#: lib/mv_web/live/custom_field_live/form.ex:108 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "erstellt" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:109 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -252,7 +252,7 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt" msgid "Your password has successfully been reset" msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" -#: lib/mv_web/live/custom_field_live/form.ex:66 +#: lib/mv_web/live/custom_field_live/form.ex:67 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -265,7 +265,7 @@ msgstr "Abbrechen" msgid "Choose a member" msgstr "Mitglied auswählen" -#: lib/mv_web/live/custom_field_live/form.ex:59 +#: lib/mv_web/live/custom_field_live/form.ex:60 #, elixir-autogen, elixir-format msgid "Description" msgstr "Beschreibung" @@ -285,7 +285,7 @@ msgstr "Aktiviert" msgid "ID" msgstr "ID" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "Unveränderlich" @@ -355,7 +355,7 @@ msgstr "Passwort-Authentifizierung" msgid "Profil" msgstr "Profil" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Required" msgstr "Erforderlich" @@ -411,7 +411,7 @@ msgstr "Benutzer*in" msgid "Value" msgstr "Wert" -#: lib/mv_web/live/custom_field_live/form.ex:54 +#: lib/mv_web/live/custom_field_live/form.ex:55 #, elixir-autogen, elixir-format msgid "Value type" msgstr "Wertetyp" @@ -616,7 +616,7 @@ msgstr "Benutzerdefinierte Feldwerte" msgid "Custom field" msgstr "Benutzerdefiniertes Feld" -#: lib/mv_web/live/custom_field_live/form.ex:114 +#: lib/mv_web/live/custom_field_live/form.ex:115 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "Benutzerdefiniertes Feld erfolgreich %{action}" @@ -631,7 +631,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}" msgid "Please select a custom field first" msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:65 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "Benutzerdefiniertes Feld speichern" @@ -655,3 +655,8 @@ msgstr "Benutzerdefinierte Felder" #, elixir-autogen, elixir-format, fuzzy msgid "Use this form to manage Custom Field Value records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten." + +#: lib/mv_web/live/custom_field_live/show.ex:56 +#, elixir-autogen, elixir-format +msgid "Auto-generated identifier (immutable)" +msgstr "Automatisch generierter Identifier" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 1dca601..6035e4a 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -159,7 +159,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:63 +#: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:124 @@ -204,14 +204,14 @@ msgstr "" msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:107 +#: lib/mv_web/live/custom_field_live/form.ex:108 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:109 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -253,7 +253,7 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:66 +#: lib/mv_web/live/custom_field_live/form.ex:67 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -266,7 +266,7 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:59 +#: lib/mv_web/live/custom_field_live/form.ex:60 #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "ID" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -356,7 +356,7 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Required" msgstr "" @@ -412,7 +412,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:54 +#: lib/mv_web/live/custom_field_live/form.ex:55 #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -617,7 +617,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:114 +#: lib/mv_web/live/custom_field_live/form.ex:115 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -632,7 +632,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:65 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -656,3 +656,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Use this form to manage Custom Field Value records in your database." msgstr "" + +#: lib/mv_web/live/custom_field_live/show.ex:56 +#, elixir-autogen, elixir-format +msgid "Auto-generated identifier (immutable)" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index e4e1d29..cbc0a5d 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -159,7 +159,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:63 +#: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:124 @@ -204,14 +204,14 @@ msgstr "" msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:107 +#: lib/mv_web/live/custom_field_live/form.ex:108 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:109 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -253,7 +253,7 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:66 +#: lib/mv_web/live/custom_field_live/form.ex:67 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -266,7 +266,7 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:59 +#: lib/mv_web/live/custom_field_live/form.ex:60 #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "ID" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -356,7 +356,7 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Required" msgstr "" @@ -412,7 +412,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:54 +#: lib/mv_web/live/custom_field_live/form.ex:55 #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -617,7 +617,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:114 +#: lib/mv_web/live/custom_field_live/form.ex:115 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -632,7 +632,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:65 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -656,3 +656,8 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "Use this form to manage Custom Field Value records in your database." msgstr "" + +#: lib/mv_web/live/custom_field_live/show.ex:56 +#, elixir-autogen, elixir-format +msgid "Auto-generated identifier (immutable)" +msgstr "" From 2af23f4042bace0e1f65465684380402176f6a1b Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 13 Nov 2025 20:03:58 +0100 Subject: [PATCH 069/119] feat: custom field deletion --- lib/membership/custom_field.ex | 29 +- lib/membership/custom_field_value.ex | 10 +- lib/membership/membership.ex | 3 +- lib/mv_web/live/custom_field_live/index.ex | 134 ++++++++- priv/gettext/de/LC_MESSAGES/default.po | 40 ++- priv/gettext/default.pot | 33 +++ priv/gettext/en/LC_MESSAGES/default.po | 38 +++ ...538_change_custom_field_delete_cascade.exs | 38 +++ .../custom_field_values/20251113183538.json | 124 +++++++++ .../membership/custom_field_deletion_test.exs | 254 ++++++++++++++++++ .../live/custom_field_live/deletion_test.exs | 251 +++++++++++++++++ 11 files changed, 938 insertions(+), 16 deletions(-) create mode 100644 priv/repo/migrations/20251113183538_change_custom_field_delete_cascade.exs create mode 100644 priv/resource_snapshots/repo/custom_field_values/20251113183538.json create mode 100644 test/membership/custom_field_deletion_test.exs create mode 100644 test/mv_web/live/custom_field_live/deletion_test.exs diff --git a/lib/membership/custom_field.ex b/lib/membership/custom_field.ex index 4c84c20..e1cf397 100644 --- a/lib/membership/custom_field.ex +++ b/lib/membership/custom_field.ex @@ -28,7 +28,10 @@ defmodule Mv.Membership.CustomField do ## Constraints - Name must be unique across all custom fields - Name maximum length: 100 characters - - Cannot delete a custom field that has existing custom field values (RESTRICT) + - Deleting a custom field will cascade delete all associated custom field values + + ## Calculations + - `assigned_members_count` - Returns the number of distinct members with values for this custom field ## Examples # Create a new custom field @@ -55,7 +58,7 @@ defmodule Mv.Membership.CustomField do end actions do - defaults [:read, :update, :destroy] + defaults [:read, :update] default_accept [:name, :value_type, :description, :immutable, :required] create :create do @@ -63,6 +66,17 @@ defmodule Mv.Membership.CustomField do change Mv.Membership.CustomField.Changes.GenerateSlug validate string_length(:slug, min: 1) end + + destroy :destroy_with_values do + primary? true + end + + read :prepare_deletion do + argument :id, :uuid, allow_nil?: false + + filter expr(id == ^arg(:id)) + prepare build(load: [:assigned_members_count]) + end end attributes do @@ -111,6 +125,17 @@ defmodule Mv.Membership.CustomField do has_many :custom_field_values, Mv.Membership.CustomFieldValue end + calculations do + calculate :assigned_members_count, + :integer, + expr( + fragment( + "(SELECT COUNT(DISTINCT member_id) FROM custom_field_values WHERE custom_field_id = ?)", + id + ) + ) + end + identities do identity :unique_name, [:name] identity :unique_slug, [:slug] diff --git a/lib/membership/custom_field_value.ex b/lib/membership/custom_field_value.ex index 2d6c025..232ba99 100644 --- a/lib/membership/custom_field_value.ex +++ b/lib/membership/custom_field_value.ex @@ -25,11 +25,12 @@ defmodule Mv.Membership.CustomFieldValue do ## Relationships - `belongs_to :member` - The member this custom field value belongs to (CASCADE delete) - - `belongs_to :custom_field` - The custom field definition + - `belongs_to :custom_field` - The custom field definition (CASCADE delete) ## Constraints - Each member can have only one custom field value per custom field (unique composite index) - Custom field values are deleted when the associated member is deleted (CASCADE) + - Custom field values are deleted when the associated custom field is deleted (CASCADE) - String values maximum length: 10,000 characters - Email values maximum length: 254 characters (RFC 5321) @@ -46,12 +47,19 @@ defmodule Mv.Membership.CustomFieldValue do references do reference :member, on_delete: :delete + reference :custom_field, on_delete: :delete end end actions do defaults [:create, :read, :update, :destroy] default_accept [:value, :member_id, :custom_field_id] + + read :by_custom_field_id do + argument :custom_field_id, :uuid, allow_nil?: false + + filter expr(custom_field_id == ^arg(:custom_field_id)) + end end attributes do diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index f51c2b9..7891d2e 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -42,7 +42,8 @@ defmodule Mv.Membership do define :create_custom_field, action: :create define :list_custom_fields, action: :read define :update_custom_field, action: :update - define :destroy_custom_field, action: :destroy + define :destroy_custom_field, action: :destroy_with_values + define :prepare_custom_field_deletion, action: :prepare_deletion, args: [:id] end end end diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex index 65a3ab3..7c38f13 100644 --- a/lib/mv_web/live/custom_field_live/index.ex +++ b/lib/mv_web/live/custom_field_live/index.ex @@ -8,7 +8,7 @@ defmodule MvWeb.CustomFieldLive.Index do - Show immutable and required flags - Create new custom fields - Edit existing custom fields - - Delete custom fields (if no custom field values use them) + - Delete custom fields with confirmation (cascades to all custom field values) ## Displayed Information - Name: Unique identifier for the custom field @@ -18,10 +18,14 @@ defmodule MvWeb.CustomFieldLive.Index do - Required: Whether all members must have this custom field (future feature) ## Events - - `delete` - Remove a custom field (only if no custom field values exist) + - `prepare_delete` - Opens deletion confirmation modal with member count + - `confirm_delete` - Executes deletion after slug verification + - `cancel_delete` - Cancels deletion and closes modal + - `update_slug_confirmation` - Updates slug input state ## Security Custom field management is restricted to admin users. + Deletion requires entering the custom field's slug to prevent accidental deletions. """ use MvWeb, :live_view @@ -55,15 +59,75 @@ defmodule MvWeb.CustomFieldLive.Index do <.link navigate={~p"/custom_fields/#{custom_field}/edit"}>Edit - <:action :let={{id, custom_field}}> - <.link - phx-click={JS.push("delete", value: %{id: custom_field.id}) |> hide("##{id}")} - data-confirm="Are you sure?" - > + <:action :let={{_id, custom_field}}> + <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id})}> Delete + + <%!-- Delete Confirmation Modal --%> + +
+

{gettext("Delete Custom Field")}

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

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

+

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

+
+
+ +
+ +
+ {@custom_field_to_delete.slug} +
+
+ +
+
+
+ +
+ + +
+
+ """ end @@ -73,14 +137,62 @@ defmodule MvWeb.CustomFieldLive.Index do {:ok, socket |> assign(:page_title, "Listing Custom fields") + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "") |> stream(:custom_fields, Ash.read!(Mv.Membership.CustomField))} end @impl true - def handle_event("delete", %{"id" => id}, socket) do - custom_field = Ash.get!(Mv.Membership.CustomField, id) - Ash.destroy!(custom_field) + def handle_event("prepare_delete", %{"id" => id}, socket) do + custom_field = Ash.get!(Mv.Membership.CustomField, id, load: [:assigned_members_count]) - {:noreply, stream_delete(socket, :custom_fields, custom_field)} + {:noreply, + socket + |> assign(:custom_field_to_delete, custom_field) + |> assign(:show_delete_modal, true) + |> assign(:slug_confirmation, "")} + end + + @impl true + def handle_event("update_slug_confirmation", %{"slug" => slug}, socket) do + {:noreply, assign(socket, :slug_confirmation, slug)} + end + + @impl true + def handle_event("confirm_delete", _params, socket) do + custom_field = socket.assigns.custom_field_to_delete + + if socket.assigns.slug_confirmation == custom_field.slug do + # Delete the custom field (CASCADE will handle custom field values) + case Ash.destroy(custom_field) do + :ok -> + {:noreply, + socket + |> put_flash(:info, "Custom field deleted successfully") + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "") + |> stream_delete(:custom_fields, custom_field)} + + {:error, error} -> + {:noreply, + socket + |> put_flash(:error, "Failed to delete custom field: #{inspect(error)}")} + end + else + {:noreply, + socket + |> put_flash(:error, "Slug does not match. Deletion cancelled.")} + end + end + + @impl true + def handle_event("cancel_delete", _params, socket) do + {:noreply, + socket + |> assign(:show_delete_modal, false) + |> assign(:custom_field_to_delete, nil) + |> assign(:slug_confirmation, "")} end end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 527a279..befd411 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -253,6 +253,7 @@ msgid "Your password has successfully been reset" msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" #: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/index.ex:119 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -659,4 +660,41 @@ msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Date #: lib/mv_web/live/custom_field_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Auto-generated identifier (immutable)" -msgstr "Automatisch generierter Identifier" +msgstr "Automatisch generierter Bezeichner (unveränderlich)" + +#: lib/mv_web/live/custom_field_live/index.ex:79 +#, elixir-autogen, elixir-format +msgid "%{count} member has a value assigned for this custom field." +msgid_plural "%{count} members have values assigned for this custom field." +msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen." +msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen." + +#: lib/mv_web/live/custom_field_live/index.ex:87 +#, elixir-autogen, elixir-format +msgid "All custom field values will be permanently deleted when you delete this custom field." +msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht." + +#: lib/mv_web/live/custom_field_live/index.ex:72 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field" +msgstr "Benutzerdefiniertes Feld löschen" + +#: lib/mv_web/live/custom_field_live/index.ex:126 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field and All Values" +msgstr "Benutzerdefiniertes Feld und alle Werte löschen" + +#: lib/mv_web/live/custom_field_live/index.ex:109 +#, elixir-autogen, elixir-format +msgid "Enter slug to confirm" +msgstr "Slug zur Bestätigung eingeben" + +#: 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/custom_field_live/form.ex:58 +#~ #, elixir-autogen, elixir-format +#~ msgid "Slug" +#~ msgstr "Slug" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 6035e4a..2cbcca4 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -254,6 +254,7 @@ msgid "Your password has successfully been reset" msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/index.ex:119 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -661,3 +662,35 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Auto-generated identifier (immutable)" msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:79 +#, elixir-autogen, elixir-format +msgid "%{count} member has a value assigned for this custom field." +msgid_plural "%{count} members have values assigned for this custom field." +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/custom_field_live/index.ex:87 +#, elixir-autogen, elixir-format +msgid "All custom field values will be permanently deleted when you delete this custom field." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:72 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:126 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field and All Values" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:109 +#, elixir-autogen, elixir-format +msgid "Enter slug to confirm" +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 "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index cbc0a5d..b25ced1 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -254,6 +254,7 @@ msgid "Your password has successfully been reset" msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/index.ex:119 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -661,3 +662,40 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Auto-generated identifier (immutable)" msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:79 +#, elixir-autogen, elixir-format +msgid "%{count} member has a value assigned for this custom field." +msgid_plural "%{count} members have values assigned for this custom field." +msgstr[0] "" +msgstr[1] "" + +#: lib/mv_web/live/custom_field_live/index.ex:87 +#, elixir-autogen, elixir-format +msgid "All custom field values will be permanently deleted when you delete this custom field." +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:72 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:126 +#, elixir-autogen, elixir-format +msgid "Delete Custom Field and All Values" +msgstr "" + +#: lib/mv_web/live/custom_field_live/index.ex:109 +#, elixir-autogen, elixir-format +msgid "Enter slug to confirm" +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/custom_field_live/form.ex:58 +#~ #, elixir-autogen, elixir-format +#~ msgid "Slug" +#~ msgstr "" diff --git a/priv/repo/migrations/20251113183538_change_custom_field_delete_cascade.exs b/priv/repo/migrations/20251113183538_change_custom_field_delete_cascade.exs new file mode 100644 index 0000000..32b8037 --- /dev/null +++ b/priv/repo/migrations/20251113183538_change_custom_field_delete_cascade.exs @@ -0,0 +1,38 @@ +defmodule Mv.Repo.Migrations.ChangeCustomFieldDeleteCascade 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 + drop constraint(:custom_field_values, "custom_field_values_custom_field_id_fkey") + + alter table(:custom_field_values) do + modify :custom_field_id, + references(:custom_fields, + column: :id, + name: "custom_field_values_custom_field_id_fkey", + type: :uuid, + prefix: "public", + on_delete: :delete_all + ) + end + end + + def down do + drop constraint(:custom_field_values, "custom_field_values_custom_field_id_fkey") + + alter table(:custom_field_values) do + modify :custom_field_id, + references(:custom_fields, + column: :id, + name: "custom_field_values_custom_field_id_fkey", + type: :uuid, + prefix: "public" + ) + end + end +end diff --git a/priv/resource_snapshots/repo/custom_field_values/20251113183538.json b/priv/resource_snapshots/repo/custom_field_values/20251113183538.json new file mode 100644 index 0000000..fc27f19 --- /dev/null +++ b/priv/resource_snapshots/repo/custom_field_values/20251113183538.json @@ -0,0 +1,124 @@ +{ + "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?": true, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": null, + "scale": null, + "size": null, + "source": "value", + "type": "map" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "custom_field_values_member_id_fkey", + "on_delete": "delete", + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "members" + }, + "scale": null, + "size": null, + "source": "member_id", + "type": "uuid" + }, + { + "allow_nil?": true, + "default": "nil", + "generated?": false, + "precision": null, + "primary_key?": false, + "references": { + "deferrable": false, + "destination_attribute": "id", + "destination_attribute_default": null, + "destination_attribute_generated": null, + "index?": false, + "match_type": null, + "match_with": null, + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "name": "custom_field_values_custom_field_id_fkey", + "on_delete": "delete", + "on_update": null, + "primary_key?": true, + "schema": "public", + "table": "custom_fields" + }, + "scale": null, + "size": null, + "source": "custom_field_id", + "type": "uuid" + } + ], + "base_filter": null, + "check_constraints": [], + "custom_indexes": [], + "custom_statements": [], + "has_create_action": true, + "hash": "BDEC02A7F12B14AB65FBA1A4BD834D291E3BEC61D065473D51BBE453486512ED", + "identities": [ + { + "all_tenants?": false, + "base_filter": null, + "index_name": "custom_field_values_unique_custom_field_per_member_index", + "keys": [ + { + "type": "atom", + "value": "member_id" + }, + { + "type": "atom", + "value": "custom_field_id" + } + ], + "name": "unique_custom_field_per_member", + "nils_distinct?": true, + "where": null + } + ], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "custom_field_values" +} \ No newline at end of file diff --git a/test/membership/custom_field_deletion_test.exs b/test/membership/custom_field_deletion_test.exs new file mode 100644 index 0000000..50623b6 --- /dev/null +++ b/test/membership/custom_field_deletion_test.exs @@ -0,0 +1,254 @@ +defmodule Mv.Membership.CustomFieldDeletionTest do + @moduledoc """ + Tests for CustomField deletion with CASCADE behavior. + + Tests cover: + - Deletion of custom fields without assigned values + - Deletion of custom fields with assigned values (CASCADE) + - assigned_members_count calculation + - prepare_deletion action with count loading + - CASCADE deletion only affects specific custom field values + """ + use Mv.DataCase, async: true + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + describe "assigned_members_count calculation" do + test "returns 0 for custom field without any values" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field", + value_type: :string + }) + |> Ash.create() + + custom_field_with_count = Ash.load!(custom_field, :assigned_members_count) + assert custom_field_with_count.assigned_members_count == 0 + end + + test "returns correct count for custom field with one member" do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, _custom_field_value} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + + custom_field_with_count = Ash.load!(custom_field, :assigned_members_count) + assert custom_field_with_count.assigned_members_count == 1 + end + + test "returns correct count for custom field with multiple members" do + {:ok, member1} = create_member() + {:ok, member2} = create_member() + {:ok, member3} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + # Create custom field value for each member + for member <- [member1, member2, member3] do + {:ok, _} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + end + + custom_field_with_count = Ash.load!(custom_field, :assigned_members_count) + assert custom_field_with_count.assigned_members_count == 3 + end + + test "counts distinct members (not multiple values per member)" do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + # Create custom field value for member + {:ok, _} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + + custom_field_with_count = Ash.load!(custom_field, :assigned_members_count) + + # Should still be 1, not 2, even if we tried to create multiple (which would fail due to uniqueness) + assert custom_field_with_count.assigned_members_count == 1 + end + end + + describe "prepare_deletion action" do + test "loads assigned_members_count for deletion preparation" do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, _} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + + # Use prepare_deletion action + [prepared_custom_field] = + CustomField + |> Ash.Query.for_read(:prepare_deletion, %{id: custom_field.id}) + |> Ash.read!() + + assert prepared_custom_field.assigned_members_count == 1 + assert prepared_custom_field.id == custom_field.id + end + + test "returns empty list for non-existent custom field" do + non_existent_id = Ash.UUID.generate() + + result = + CustomField + |> Ash.Query.for_read(:prepare_deletion, %{id: non_existent_id}) + |> Ash.read!() + + assert result == [] + end + end + + describe "destroy_with_values action" do + test "deletes custom field without any values" do + {:ok, custom_field} = create_custom_field("test_field", :string) + + assert :ok = Ash.destroy(custom_field) + + # Verify custom field is deleted + assert {:error, _} = Ash.get(CustomField, custom_field.id) + end + + test "deletes custom field and cascades to all its values" do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, custom_field_value} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + + # Delete custom field + assert :ok = Ash.destroy(custom_field) + + # Verify custom field is deleted + assert {:error, _} = Ash.get(CustomField, custom_field.id) + + # Verify custom field value is also deleted (CASCADE) + assert {:error, _} = Ash.get(CustomFieldValue, custom_field_value.id) + + # Verify member still exists + assert {:ok, _} = Ash.get(Member, member.id) + end + + test "deletes only values of the specific custom field" do + {:ok, member} = create_member() + {:ok, custom_field1} = create_custom_field("field1", :string) + {:ok, custom_field2} = create_custom_field("field2", :string) + + # Create value for custom_field1 + {:ok, value1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field1.id, + value: %{"_union_type" => "string", "_union_value" => "value1"} + }) + |> Ash.create() + + # Create value for custom_field2 + {:ok, value2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field2.id, + value: %{"_union_type" => "string", "_union_value" => "value2"} + }) + |> Ash.create() + + # Delete custom_field1 + assert :ok = Ash.destroy(custom_field1) + + # Verify custom_field1 and value1 are deleted + assert {:error, _} = Ash.get(CustomField, custom_field1.id) + assert {:error, _} = Ash.get(CustomFieldValue, value1.id) + + # Verify custom_field2 and value2 still exist + assert {:ok, _} = Ash.get(CustomField, custom_field2.id) + assert {:ok, _} = Ash.get(CustomFieldValue, value2.id) + end + + test "deletes custom field with values from multiple members" do + {:ok, member1} = create_member() + {:ok, member2} = create_member() + {:ok, member3} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + # Create value for each member + values = + for member <- [member1, member2, member3] do + {:ok, value} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => "test"} + }) + |> Ash.create() + + value + end + + # Delete custom field + assert :ok = Ash.destroy(custom_field) + + # Verify all values are deleted + for value <- values do + assert {:error, _} = Ash.get(CustomFieldValue, value.id) + end + + # Verify all members still exist + for member <- [member1, member2, member3] do + assert {:ok, _} = Ash.get(Member, member.id) + end + end + end + + # Helper functions + defp create_member do + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Test", + last_name: "User#{System.unique_integer([:positive])}", + email: "test#{System.unique_integer([:positive])}@example.com" + }) + |> Ash.create() + end + + defp create_custom_field(name, value_type) do + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "#{name}_#{System.unique_integer([:positive])}", + value_type: value_type + }) + |> Ash.create() + end +end diff --git a/test/mv_web/live/custom_field_live/deletion_test.exs b/test/mv_web/live/custom_field_live/deletion_test.exs new file mode 100644 index 0000000..f0317e0 --- /dev/null +++ b/test/mv_web/live/custom_field_live/deletion_test.exs @@ -0,0 +1,251 @@ +defmodule MvWeb.CustomFieldLive.DeletionTest do + @moduledoc """ + Tests for CustomFieldLive.Index deletion modal and slug confirmation. + + Tests cover: + - Opening deletion confirmation modal + - Displaying correct member count + - Slug confirmation input + - Successful deletion with correct slug + - Failed deletion with incorrect slug + - Canceling deletion + - Button states (enabled/disabled based on slug match) + """ + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + setup do + # Create admin user for testing + {:ok, user} = + Mv.Accounts.User + |> Ash.Changeset.for_create(:register_with_password, %{ + email: "admin#{System.unique_integer([:positive])}@mv.local", + password: "testpassword123" + }) + |> Ash.create() + + conn = log_in_user(build_conn(), user) + %{conn: conn, user: user} + end + + describe "delete button and modal" do + test "opens modal with correct member count when delete is clicked", %{conn: conn} do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + # Create custom field value + create_custom_field_value(member, custom_field, "test") + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + # Click delete button + view + |> element("a", "Delete") + |> render_click() + + # Modal should be visible + assert has_element?(view, "#delete-custom-field-modal") + + # Should show correct member count (1 member) + assert render(view) =~ "1 member has a value assigned for this custom field" + + # Should show the slug + assert render(view) =~ custom_field.slug + end + + test "shows correct plural form for multiple members", %{conn: conn} do + {:ok, member1} = create_member() + {:ok, member2} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + + # Create values for both members + create_custom_field_value(member1, custom_field, "test1") + create_custom_field_value(member2, custom_field, "test2") + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Should show plural form + assert render(view) =~ "2 members have values assigned for this custom field" + end + + test "shows 0 members for custom field without values", %{conn: conn} do + {:ok, _custom_field} = create_custom_field("test_field", :string) + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Should show 0 members + assert render(view) =~ "0 members have values assigned for this custom field" + end + end + + describe "slug confirmation input" do + test "updates confirmation state when typing", %{conn: conn} do + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Type in slug input + view + |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug}) + + # Confirm button should be enabled now (no disabled attribute) + html = render(view) + refute html =~ ~r/disabled(?:=""|(?!\w))/ + end + + test "delete button is disabled when slug doesn't match", %{conn: conn} do + {:ok, _custom_field} = create_custom_field("test_field", :string) + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Type wrong slug + view + |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"}) + + # Button should be disabled + html = render(view) + assert html =~ ~r/disabled(?:=""|(?!\w))/ + end + end + + describe "confirm deletion" do + test "successfully deletes custom field with correct slug", %{conn: conn} do + {:ok, member} = create_member() + {:ok, custom_field} = create_custom_field("test_field", :string) + {:ok, custom_field_value} = create_custom_field_value(member, custom_field, "test") + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + # Open modal + view + |> element("a", "Delete") + |> render_click() + + # Enter correct slug + view + |> render_change("update_slug_confirmation", %{"slug" => custom_field.slug}) + + # Click confirm + view + |> element("button", "Delete Custom Field and All Values") + |> render_click() + + # Should show success message + assert render(view) =~ "Custom field deleted successfully" + + # Custom field should be gone from database + assert {:error, _} = Ash.get(CustomField, custom_field.id) + + # Custom field value should also be gone (CASCADE) + assert {:error, _} = Ash.get(CustomFieldValue, custom_field_value.id) + + # Member should still exist + assert {:ok, _} = Ash.get(Member, member.id) + end + + test "shows error when slug doesn't match", %{conn: conn} do + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Enter wrong slug + view + |> render_change("update_slug_confirmation", %{"slug" => "wrong-slug"}) + + # Try to confirm (button should be disabled, but test the handler anyway) + view + |> render_click("confirm_delete", %{}) + + # Should show error message + assert render(view) =~ "Slug does not match" + + # Custom field should still exist + assert {:ok, _} = Ash.get(CustomField, custom_field.id) + end + end + + describe "cancel deletion" do + test "closes modal without deleting", %{conn: conn} do + {:ok, custom_field} = create_custom_field("test_field", :string) + + {:ok, view, _html} = live(conn, ~p"/custom_fields") + + view + |> element("a", "Delete") + |> render_click() + + # Modal should be visible + assert has_element?(view, "#delete-custom-field-modal") + + # Click cancel + view + |> element("button", "Cancel") + |> render_click() + + # Modal should be gone + refute has_element?(view, "#delete-custom-field-modal") + + # Custom field should still exist + assert {:ok, _} = Ash.get(CustomField, custom_field.id) + end + end + + # Helper functions + defp create_member do + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Test", + last_name: "User#{System.unique_integer([:positive])}", + email: "test#{System.unique_integer([:positive])}@example.com" + }) + |> Ash.create() + end + + defp create_custom_field(name, value_type) do + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "#{name}_#{System.unique_integer([:positive])}", + value_type: value_type + }) + |> Ash.create() + end + + defp create_custom_field_value(member, custom_field, value) do + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: custom_field.id, + value: %{"_union_type" => "string", "_union_value" => value} + }) + |> Ash.create() + end + + defp log_in_user(conn, user) do + conn + |> Phoenix.ConnTest.init_test_session(%{}) + |> AshAuthentication.Plug.Helpers.store_in_session(user) + end +end From a32789b90c850ac49bf23ace753e1b87fc6fd5fb Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 14:36:24 +0100 Subject: [PATCH 070/119] feat: autofocus on dialog --- lib/mv_web/live/custom_field_live/index.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex index 7c38f13..b2e6282 100644 --- a/lib/mv_web/live/custom_field_live/index.ex +++ b/lib/mv_web/live/custom_field_live/index.ex @@ -108,6 +108,7 @@ defmodule MvWeb.CustomFieldLive.Index do value={@slug_confirmation} placeholder={gettext("Enter slug to confirm")} autocomplete="off" + phx-mounted={JS.focus()} class="input input-bordered w-full" /> From 8ba15eb16be0017e30a245ebae6fff2be4a2a578 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 14:46:45 +0100 Subject: [PATCH 071/119] refactor: change wording to hide technical details --- lib/mv_web/live/custom_field_live/index.ex | 4 ++-- priv/gettext/de/LC_MESSAGES/default.po | 20 ++++++++++---------- priv/gettext/default.pot | 8 ++++---- priv/gettext/en/LC_MESSAGES/default.po | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/mv_web/live/custom_field_live/index.ex b/lib/mv_web/live/custom_field_live/index.ex index b2e6282..f711323 100644 --- a/lib/mv_web/live/custom_field_live/index.ex +++ b/lib/mv_web/live/custom_field_live/index.ex @@ -94,7 +94,7 @@ defmodule MvWeb.CustomFieldLive.Index do
@@ -106,7 +106,7 @@ defmodule MvWeb.CustomFieldLive.Index do name="slug" type="text" value={@slug_confirmation} - placeholder={gettext("Enter slug to confirm")} + placeholder={gettext("Enter the text above to confirm")} autocomplete="off" phx-mounted={JS.focus()} class="input input-bordered w-full" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index befd411..842ab40 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -253,7 +253,7 @@ msgid "Your password has successfully been reset" msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" #: lib/mv_web/live/custom_field_live/form.ex:67 -#: lib/mv_web/live/custom_field_live/index.ex:119 +#: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -679,22 +679,22 @@ msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerd msgid "Delete Custom Field" msgstr "Benutzerdefiniertes Feld löschen" -#: lib/mv_web/live/custom_field_live/index.ex:126 +#: lib/mv_web/live/custom_field_live/index.ex:127 #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "Benutzerdefiniertes Feld und alle Werte löschen" #: lib/mv_web/live/custom_field_live/index.ex:109 #, elixir-autogen, elixir-format -msgid "Enter slug to confirm" -msgstr "Slug zur Bestätigung eingeben" +msgid "Enter the text above to confirm" +msgstr "Obigen Text zur Bestätigung eingeben" #: 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:" +#, elixir-autogen, elixir-format, fuzzy +msgid "To confirm deletion, please enter this text:" +msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:" -#~ #: lib/mv_web/live/custom_field_live/form.ex:58 +#~ #: lib/mv_web/live/custom_field_live/index.ex:97 #~ #, elixir-autogen, elixir-format -#~ msgid "Slug" -#~ msgstr "Slug" +#~ 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:" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 2cbcca4..5942951 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -254,7 +254,7 @@ msgid "Your password has successfully been reset" msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:67 -#: lib/mv_web/live/custom_field_live/index.ex:119 +#: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -680,17 +680,17 @@ msgstr "" msgid "Delete Custom Field" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex:126 +#: lib/mv_web/live/custom_field_live/index.ex:127 #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:109 #, elixir-autogen, elixir-format -msgid "Enter slug to confirm" +msgid "Enter the text above to confirm" 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:" +msgid "To confirm deletion, please enter this text:" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index b25ced1..32a2d76 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -254,7 +254,7 @@ msgid "Your password has successfully been reset" msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:67 -#: lib/mv_web/live/custom_field_live/index.ex:119 +#: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 #: lib/mv_web/live/user_live/form.ex:127 @@ -680,22 +680,22 @@ msgstr "" msgid "Delete Custom Field" msgstr "" -#: lib/mv_web/live/custom_field_live/index.ex:126 +#: lib/mv_web/live/custom_field_live/index.ex:127 #, elixir-autogen, elixir-format msgid "Delete Custom Field and All Values" msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:109 #, elixir-autogen, elixir-format -msgid "Enter slug to confirm" +msgid "Enter the text above to confirm" 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:" +#, elixir-autogen, elixir-format, fuzzy +msgid "To confirm deletion, please enter this text:" msgstr "" -#~ #: lib/mv_web/live/custom_field_live/form.ex:58 +#~ #: lib/mv_web/live/custom_field_live/index.ex:97 #~ #, elixir-autogen, elixir-format -#~ msgid "Slug" +#~ msgid "To confirm deletion, please enter the custom field slug:" #~ msgstr "" From 173f522da5eb9587efa7b4db85d53d37f03fc8ba Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:51:44 +0100 Subject: [PATCH 072/119] test: add tests for user-member linking and fuzzy search (#168) --- .../user_member_linking_email_test.exs | 169 +++++++++++++ test/accounts/user_member_linking_test.exs | 130 ++++++++++ .../member_available_for_linking_test.exs | 222 ++++++++++++++++++ .../member_fuzzy_search_linking_test.exs | 158 +++++++++++++ 4 files changed, 679 insertions(+) create mode 100644 test/accounts/user_member_linking_email_test.exs create mode 100644 test/accounts/user_member_linking_test.exs create mode 100644 test/membership/member_available_for_linking_test.exs create mode 100644 test/membership/member_fuzzy_search_linking_test.exs diff --git a/test/accounts/user_member_linking_email_test.exs b/test/accounts/user_member_linking_email_test.exs new file mode 100644 index 0000000..d7c2817 --- /dev/null +++ b/test/accounts/user_member_linking_email_test.exs @@ -0,0 +1,169 @@ +defmodule Mv.Accounts.UserMemberLinkingEmailTest do + @moduledoc """ + Tests email validation during user-member linking. + Implements rules from docs/email-sync.md. + Tests for Issue #168, specifically Problem #4: Email validation bug. + """ + + use Mv.DataCase, async: false + + alias Mv.Accounts + alias Mv.Membership + + describe "link with same email" do + test "succeeds when user.email == member.email" do + # Create member with specific email + {:ok, member} = + Membership.create_member(%{ + first_name: "Alice", + last_name: "Johnson", + email: "alice@example.com" + }) + + # Create user with same email and link to member + result = + Accounts.create_user(%{ + email: "alice@example.com", + member: %{id: member.id} + }) + + # Should succeed without errors + assert {:ok, user} = result + assert to_string(user.email) == "alice@example.com" + + # Reload to verify link + user = Ash.load!(user, [:member], domain: Mv.Accounts) + assert user.member.id == member.id + assert user.member.email == "alice@example.com" + end + + test "no validation error triggered when updating linked pair with same email" do + # Create member + {:ok, member} = + Membership.create_member(%{ + first_name: "Bob", + last_name: "Smith", + email: "bob@example.com" + }) + + # Create user and link + {:ok, user} = + Accounts.create_user(%{ + email: "bob@example.com", + member: %{id: member.id} + }) + + # Update user (should not trigger email validation error) + result = Accounts.update_user(user, %{email: "bob@example.com"}) + + assert {:ok, updated_user} = result + assert to_string(updated_user.email) == "bob@example.com" + end + end + + describe "link with different emails" do + test "fails if member.email is used by a DIFFERENT linked user" do + # Create first user and link to a different member + {:ok, other_member} = + Membership.create_member(%{ + first_name: "Other", + last_name: "Member", + email: "other@example.com" + }) + + {:ok, _user1} = + Accounts.create_user(%{ + email: "user1@example.com", + member: %{id: other_member.id} + }) + + # Reload to ensure email sync happened + _other_member = Ash.reload!(other_member) + + # Create a NEW member with different email + {:ok, member} = + Membership.create_member(%{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }) + + # Try to create user2 with email that matches the linked other_member + result = + Accounts.create_user(%{ + email: "user1@example.com", + member: %{id: member.id} + }) + + # Should fail because user1@example.com is already used by other_member (which is linked to user1) + assert {:error, _error} = result + end + + test "succeeds for unique emails" do + # Create member + {:ok, member} = + Membership.create_member(%{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }) + + # Create user with different but unique email + result = + Accounts.create_user(%{ + email: "user@example.com", + member: %{id: member.id} + }) + + # Should succeed + assert {:ok, user} = result + + # Email sync should update member's email to match user's + user = Ash.load!(user, [:member], domain: Mv.Accounts) + assert user.member.email == "user@example.com" + end + end + + describe "edge cases" do + test "unlinking and relinking with same email works (Problem #4)" do + # This is the exact scenario from Problem #4: + # 1. Link user and member (both have same email) + # 2. Unlink them (member keeps the email) + # 3. Try to relink (validation should NOT fail) + + # Create member + {:ok, member} = + Membership.create_member(%{ + first_name: "Emma", + last_name: "Davis", + email: "emma@example.com" + }) + + # Create user and link + {:ok, user} = + Accounts.create_user(%{ + email: "emma@example.com", + member: %{id: member.id} + }) + + # Verify they are linked + user = Ash.load!(user, [:member], domain: Mv.Accounts) + assert user.member.id == member.id + assert user.member.email == "emma@example.com" + + # Unlink + {:ok, unlinked_user} = Accounts.update_user(user, %{member: nil}) + assert is_nil(unlinked_user.member_id) + + # Member still has the email after unlink + member = Ash.reload!(member) + assert member.email == "emma@example.com" + + # Relink (should work - this is Problem #4) + result = Accounts.update_user(unlinked_user, %{member: %{id: member.id}}) + + assert {:ok, relinked_user} = result + assert relinked_user.member_id == member.id + end + end +end diff --git a/test/accounts/user_member_linking_test.exs b/test/accounts/user_member_linking_test.exs new file mode 100644 index 0000000..1111436 --- /dev/null +++ b/test/accounts/user_member_linking_test.exs @@ -0,0 +1,130 @@ +defmodule Mv.Accounts.UserMemberLinkingTest do + @moduledoc """ + Integration tests for User-Member linking functionality. + + Tests the complete workflow of linking and unlinking members to users, + including email synchronization and validation rules. + """ + use Mv.DataCase, async: false + alias Mv.Accounts + alias Mv.Membership + + describe "User-Member Linking with Email Sync" do + test "link user to member with different email syncs member email" do + # Create user with one email + {:ok, user} = Accounts.create_user(%{email: "user@example.com"}) + + # Create member with different email + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "member@example.com" + }) + + # Link user to member + {:ok, updated_user} = Accounts.update_user(user, %{member: %{id: member.id}}) + + # Verify link exists + user_with_member = Ash.get!(Mv.Accounts.User, updated_user.id, load: [:member]) + assert user_with_member.member.id == member.id + + # Verify member email was synced to match user email + synced_member = Ash.get!(Mv.Membership.Member, member.id) + assert synced_member.email == "user@example.com" + end + + test "unlink member from user sets member to nil" do + # Create and link user and member + {:ok, user} = Accounts.create_user(%{email: "user@example.com"}) + + {:ok, member} = + Membership.create_member(%{ + first_name: "Jane", + last_name: "Smith", + email: "jane@example.com" + }) + + {:ok, linked_user} = Accounts.update_user(user, %{member: %{id: member.id}}) + + # Verify link exists + user_with_member = Ash.get!(Mv.Accounts.User, linked_user.id, load: [:member]) + assert user_with_member.member.id == member.id + + # Unlink by setting member to nil + {:ok, unlinked_user} = Accounts.update_user(linked_user, %{member: nil}) + + # Verify link is removed + user_without_member = Ash.get!(Mv.Accounts.User, unlinked_user.id, load: [:member]) + assert is_nil(user_without_member.member) + + # Verify member still exists independently + member_still_exists = Ash.get!(Mv.Membership.Member, member.id) + assert member_still_exists.id == member.id + end + + test "cannot link member already linked to another user" do + # Create first user and link to member + {:ok, user1} = Accounts.create_user(%{email: "user1@example.com"}) + + {:ok, member} = + Membership.create_member(%{ + first_name: "Bob", + last_name: "Wilson", + email: "bob@example.com" + }) + + {:ok, _linked_user1} = Accounts.update_user(user1, %{member: %{id: member.id}}) + + # Create second user and try to link to same member + {:ok, user2} = Accounts.create_user(%{email: "user2@example.com"}) + + # Should fail because member is already linked + assert {:error, %Ash.Error.Invalid{}} = + Accounts.update_user(user2, %{member: %{id: member.id}}) + end + + test "cannot change member link directly, must unlink first" do + # Create user and link to first member + {:ok, user} = Accounts.create_user(%{email: "user@example.com"}) + + {:ok, member1} = + Membership.create_member(%{ + first_name: "Alice", + last_name: "Johnson", + email: "alice@example.com" + }) + + {:ok, linked_user} = Accounts.update_user(user, %{member: %{id: member1.id}}) + + # Create second member + {:ok, member2} = + Membership.create_member(%{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }) + + # Try to directly change member link (should fail) + assert {:error, %Ash.Error.Invalid{errors: errors}} = + Accounts.update_user(linked_user, %{member: %{id: member2.id}}) + + # Verify error message mentions "Remove existing member first" + error_messages = Enum.map(errors, & &1.message) + assert Enum.any?(error_messages, &String.contains?(&1, "Remove existing member first")) + + # Two-step process: first unlink, then link new member + {:ok, unlinked_user} = Accounts.update_user(linked_user, %{member: nil}) + + # After unlinking, member1 still has the user's email + # Change member1's email to avoid conflict when relinking to member2 + {:ok, _} = Membership.update_member(member1, %{email: "alice_changed@example.com"}) + + {:ok, relinked_user} = Accounts.update_user(unlinked_user, %{member: %{id: member2.id}}) + + # Verify new link is established + user_with_new_member = Ash.get!(Mv.Accounts.User, relinked_user.id, load: [:member]) + assert user_with_new_member.member.id == member2.id + end + end +end diff --git a/test/membership/member_available_for_linking_test.exs b/test/membership/member_available_for_linking_test.exs new file mode 100644 index 0000000..af293e1 --- /dev/null +++ b/test/membership/member_available_for_linking_test.exs @@ -0,0 +1,222 @@ +defmodule Mv.Membership.MemberAvailableForLinkingTest do + @moduledoc """ + Tests for the Member.available_for_linking action. + + This action returns members that can be linked to a user account: + - Only members without existing user links (user_id == nil) + - Limited to 10 results + - Special email-match logic: if user_email matches member email, only return that member + - Optional search query filtering by name and email + """ + use Mv.DataCase, async: false + alias Mv.Membership + + describe "available_for_linking/2" do + setup do + # Create 5 unlinked members with distinct names + {:ok, member1} = + Membership.create_member(%{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + + {:ok, member2} = + Membership.create_member(%{ + first_name: "Bob", + last_name: "Williams", + email: "bob@example.com" + }) + + {:ok, member3} = + Membership.create_member(%{ + first_name: "Charlie", + last_name: "Davis", + email: "charlie@example.com" + }) + + {:ok, member4} = + Membership.create_member(%{ + first_name: "Diana", + last_name: "Martinez", + email: "diana@example.com" + }) + + {:ok, member5} = + Membership.create_member(%{ + first_name: "Emma", + last_name: "Taylor", + email: "emma@example.com" + }) + + unlinked_members = [member1, member2, member3, member4, member5] + + # Create 2 linked members (with users) + {:ok, user1} = Mv.Accounts.create_user(%{email: "user1@example.com"}) + + {:ok, linked_member1} = + Membership.create_member(%{ + first_name: "Linked", + last_name: "Member1", + email: "linked1@example.com", + user: %{id: user1.id} + }) + + {:ok, user2} = Mv.Accounts.create_user(%{email: "user2@example.com"}) + + {:ok, linked_member2} = + Membership.create_member(%{ + first_name: "Linked", + last_name: "Member2", + email: "linked2@example.com", + user: %{id: user2.id} + }) + + %{ + unlinked_members: unlinked_members, + linked_members: [linked_member1, linked_member2] + } + end + + test "returns only unlinked members and limits to 10", %{ + unlinked_members: unlinked_members, + linked_members: _linked_members + } do + # Call the action without any arguments + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{}) + |> Ash.read!() + + # Should return only the 5 unlinked members, not the 2 linked ones + assert length(members) == 5 + + returned_ids = Enum.map(members, & &1.id) |> MapSet.new() + expected_ids = Enum.map(unlinked_members, & &1.id) |> MapSet.new() + + assert MapSet.equal?(returned_ids, expected_ids) + + # Verify none of the returned members have a user_id + Enum.each(members, fn member -> + member_with_user = Ash.get!(Mv.Membership.Member, member.id, load: [:user]) + assert is_nil(member_with_user.user) + end) + end + + test "limits results to 10 members even when more exist" do + # Create 15 additional unlinked members (total 20 unlinked) + for i <- 6..20 do + Membership.create_member(%{ + first_name: "Extra#{i}", + last_name: "Member#{i}", + email: "extra#{i}@example.com" + }) + end + + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{}) + |> Ash.read!() + + # Should be limited to 10 + assert length(members) == 10 + end + + test "email match: returns only member with matching email when exists", %{ + unlinked_members: unlinked_members + } do + # Get one of the unlinked members' email + target_member = List.first(unlinked_members) + user_email = target_member.email + + raw_members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{user_email: user_email}) + |> Ash.read!() + + # Apply email match filtering (sorted results come from query) + # When user_email matches, only that member should be returned + members = Mv.Membership.Member.filter_by_email_match(raw_members, user_email) + + # Should return only the member with matching email + assert length(members) == 1 + assert List.first(members).id == target_member.id + assert List.first(members).email == user_email + end + + test "email match: returns all unlinked members when no email match" do + # Use an email that doesn't match any member + non_matching_email = "nonexistent@example.com" + + raw_members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{user_email: non_matching_email}) + |> Ash.read!() + + # Apply email match filtering + members = Mv.Membership.Member.filter_by_email_match(raw_members, non_matching_email) + + # Should return all 5 unlinked members since no match + assert length(members) == 5 + end + + test "search query: filters by first_name, last_name, and email", %{ + unlinked_members: _unlinked_members + } do + # Search by first name + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{search_query: "Alice"}) + |> Ash.read!() + + assert length(members) == 1 + assert List.first(members).first_name == "Alice" + + # Search by last name + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{search_query: "Williams"}) + |> Ash.read!() + + assert length(members) == 1 + assert List.first(members).last_name == "Williams" + + # Search by email + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{search_query: "charlie@"}) + |> Ash.read!() + + assert length(members) == 1 + assert List.first(members).email == "charlie@example.com" + + # Search returns empty when no matches + members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{search_query: "NonExistent"}) + |> Ash.read!() + + assert Enum.empty?(members) + end + + test "search query takes precedence over email match", %{unlinked_members: unlinked_members} do + target_member = List.first(unlinked_members) + + # Pass both email match and search query that would match different members + raw_members = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: target_member.email, + search_query: "Bob" + }) + |> Ash.read!() + + # Search query takes precedence, should match "Bob" in the first name + # user_email is used for POST-filtering only, not in the query + assert length(raw_members) == 1 + # Should find the member with "Bob" first name, not target_member (Alice) + assert List.first(raw_members).first_name == "Bob" + refute List.first(raw_members).id == target_member.id + end + end +end diff --git a/test/membership/member_fuzzy_search_linking_test.exs b/test/membership/member_fuzzy_search_linking_test.exs new file mode 100644 index 0000000..4cbd8d9 --- /dev/null +++ b/test/membership/member_fuzzy_search_linking_test.exs @@ -0,0 +1,158 @@ +defmodule Mv.Membership.MemberFuzzySearchLinkingTest do + @moduledoc """ + Tests fuzzy search in Member.available_for_linking action. + Verifies PostgreSQL trigram matching for member search. + """ + + use Mv.DataCase, async: false + + alias Mv.Accounts + alias Mv.Membership + + describe "available_for_linking with fuzzy search" do + test "finds member despite typo" do + # Create member with specific name + {:ok, member} = + Membership.create_member(%{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan@example.com" + }) + + # Search with typo + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: nil, + search_query: "Jonatan" + }) + + {:ok, members} = Ash.read(query, domain: Mv.Membership) + + # Should find Jonathan despite typo + assert length(members) == 1 + assert hd(members).id == member.id + end + + test "finds member with partial match" do + # Create member + {:ok, member} = + Membership.create_member(%{ + first_name: "Alexander", + last_name: "Williams", + email: "alex@example.com" + }) + + # Search with partial + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: nil, + search_query: "Alex" + }) + + {:ok, members} = Ash.read(query, domain: Mv.Membership) + + # Should find Alexander + assert length(members) == 1 + assert hd(members).id == member.id + end + + test "email match overrides fuzzy search" do + # Create two members + {:ok, member1} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "john@example.com" + }) + + {:ok, _member2} = + Membership.create_member(%{ + first_name: "Jane", + last_name: "Smith", + email: "jane@example.com" + }) + + # Search with user_email that matches member1, but search_query that would match member2 + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: "john@example.com", + search_query: "Jane" + }) + + {:ok, members} = Ash.read(query, domain: Mv.Membership) + + # Apply email filter + filtered_members = Mv.Membership.Member.filter_by_email_match(members, "john@example.com") + + # Should only return member1 (email match takes precedence) + assert length(filtered_members) == 1 + assert hd(filtered_members).id == member1.id + end + + test "limits to 10 results" do + # Create 15 members with similar names + for i <- 1..15 do + Membership.create_member(%{ + first_name: "Test#{i}", + last_name: "Member", + email: "test#{i}@example.com" + }) + end + + # Search for "Test" + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: nil, + search_query: "Test" + }) + + {:ok, members} = Ash.read(query, domain: Mv.Membership) + + # Should return max 10 members + assert length(members) == 10 + end + + test "excludes linked members" do + # Create member and link to user + {:ok, member1} = + Membership.create_member(%{ + first_name: "Linked", + last_name: "Member", + email: "linked@example.com" + }) + + {:ok, _user} = + Accounts.create_user(%{ + email: "user@example.com", + member: %{id: member1.id} + }) + + # Create unlinked member + {:ok, member2} = + Membership.create_member(%{ + first_name: "Unlinked", + last_name: "Member", + email: "unlinked@example.com" + }) + + # Search for "Member" + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: nil, + search_query: "Member" + }) + + {:ok, members} = Ash.read(query, domain: Mv.Membership) + + # Should only return unlinked member + member_ids = Enum.map(members, & &1.id) + refute member1.id in member_ids + assert member2.id in member_ids + end + end +end From 39b285a714bc23a672a9ad7112750bbce3aec3a9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:52:12 +0100 Subject: [PATCH 073/119] feat: add member fuzzy search for linking (#168) --- lib/membership/member.ex | 77 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index eeb12c9..8464388 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -152,7 +152,8 @@ defmodule Mv.Membership.Member do prepare fn query, _ctx -> q = Ash.Query.get_argument(query, :query) || "" - # 0.2 as similarity threshold (recommended) - lower value can lead to more results but also to more unspecific results + # 0.2 as similarity threshold (recommended) + # Lower value can lead to more results but also to more unspecific results threshold = Ash.Query.get_argument(query, :similarity_threshold) || 0.2 if is_binary(q) and String.trim(q) != "" do @@ -187,8 +188,82 @@ defmodule Mv.Membership.Member do end end end + + # Action to find members available for linking to a user account + # Returns only unlinked members (user_id == nil), limited to 10 results + # + # Special behavior for email matching: + # - When user_email AND search_query are both provided: filter by email (email takes precedence) + # - When only user_email provided: return all unlinked members (caller should use filter_by_email_match helper) + # - When only search_query provided: filter by search terms + read :available_for_linking do + argument :user_email, :string, allow_nil?: true + argument :search_query, :string, allow_nil?: true + + prepare fn query, _ctx -> + user_email = Ash.Query.get_argument(query, :user_email) + search_query = Ash.Query.get_argument(query, :search_query) + + # Start with base filter: only unlinked members + base_query = Ash.Query.filter(query, is_nil(user)) + + # Determine filtering strategy + # Priority: search_query (if present) > no filters + # user_email is used for POST-filtering via filter_by_email_match helper + if not is_nil(search_query) and String.trim(search_query) != "" do + # Search query present: Use fuzzy search (regardless of user_email) + trimmed = String.trim(search_query) + + # Use same fuzzy search as :search action (PostgreSQL Trigram + FTS) + base_query + |> Ash.Query.filter( + expr( + # Full-text search + # Trigram similarity for names + # Exact substring match for email + fragment("search_vector @@ websearch_to_tsquery('simple', ?)", ^trimmed) or + fragment("search_vector @@ plainto_tsquery('simple', ?)", ^trimmed) or + fragment("? % first_name", ^trimmed) or + fragment("? % last_name", ^trimmed) or + fragment("word_similarity(?, first_name) > 0.2", ^trimmed) or + fragment("word_similarity(?, last_name) > 0.2", ^trimmed) or + fragment("similarity(first_name, ?) > 0.2", ^trimmed) or + fragment("similarity(last_name, ?) > 0.2", ^trimmed) or + contains(email, ^trimmed) + ) + ) + |> Ash.Query.limit(10) + else + # No search query: return all unlinked members + # Caller should use filter_by_email_match helper for email match logic + base_query + |> Ash.Query.limit(10) + end + end + end end + # Public helper function to apply email match logic after query execution + # This should be called after using :available_for_linking with user_email argument + # + # If a member with matching email exists, returns only that member + # Otherwise returns all members (no filtering) + def filter_by_email_match(members, user_email) + when is_list(members) and is_binary(user_email) do + # Check if any member matches the email + email_match = Enum.find(members, &(&1.email == user_email)) + + if email_match do + # Return only the email-matched member + [email_match] + else + # No email match, return all members + members + end + end + + def filter_by_email_match(members, _user_email), do: members + validations do # Required fields are covered by allow_nil? false From 52a62bd67985ba76bd8db2f246a890c88bdbd395 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:52:30 +0100 Subject: [PATCH 074/119] fix: extract member_id from relationship changes during validation (#168) --- .../email_not_used_by_other_member.ex | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex index 9cea265..af68f96 100644 --- a/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex +++ b/lib/mv/accounts/user/validations/email_not_used_by_other_member.ex @@ -41,18 +41,37 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do if should_validate? do case Ash.Changeset.fetch_change(changeset, :email) do {:ok, new_email} -> - check_email_uniqueness(new_email, member_id) + # Extract member_id from relationship changes for new links + member_id_to_exclude = get_member_id_from_changeset(changeset) + check_email_uniqueness(new_email, member_id_to_exclude) :error -> # No email change, get current email current_email = Ash.Changeset.get_attribute(changeset, :email) - check_email_uniqueness(current_email, member_id) + # Extract member_id from relationship changes for new links + member_id_to_exclude = get_member_id_from_changeset(changeset) + check_email_uniqueness(current_email, member_id_to_exclude) end else :ok end end + # Extract member_id from changeset, checking relationship changes first + # This is crucial for new links where member_id is in manage_relationship changes + defp get_member_id_from_changeset(changeset) do + # Try to get from relationships (for new links via manage_relationship) + case Map.get(changeset.relationships, :member) do + [{[%{id: id}], _opts}] when not is_nil(id) -> + # Found in relationships - this is a new link + id + + _ -> + # Fall back to attribute (for existing links) + Ash.Changeset.get_attribute(changeset, :member_id) + end + end + defp check_email_uniqueness(email, exclude_member_id) do query = Mv.Membership.Member From af193840e2fe47b2e067780ca578f6f27156c62e Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:55:50 +0100 Subject: [PATCH 075/119] feat: add user-member linking UI with autocomplete (#168) --- assets/js/app.js | 10 + lib/mv_web/live/user_live/form.ex | 260 +++++++++++++++++++++- lib/mv_web/live/user_live/index.ex | 2 +- lib/mv_web/live/user_live/index.html.heex | 7 + 4 files changed, 271 insertions(+), 8 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index d5e278a..9b95296 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -23,11 +23,21 @@ import {LiveSocket} from "phoenix_live_view" import topbar from "../vendor/topbar" let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content") + let liveSocket = new LiveSocket("/live", Socket, { longPollFallbackMs: 2500, params: {_csrf_token: csrfToken} }) +// Listen for custom events from LiveView +window.addEventListener("phx:set-input-value", (e) => { + const {id, value} = e.detail + const input = document.getElementById(id) + if (input) { + input.value = value + } +}) + // Show progress bar on live navigation and form submits topbar.config({barColors: {0: "#29d"}, shadowColor: "rgba(0, 0, 0, .3)"}) window.addEventListener("phx:page-loading-start", _info => topbar.show(300)) diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index cf7b687..82df862 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -120,6 +120,116 @@ defmodule MvWeb.UserLive.Form do <% end %> <% end %>
+ + +
+

{gettext("Linked Member")}

+ + <%= if @user && @user.member && !@unlink_member do %> + +
+
+
+

+ {@user.member.first_name} {@user.member.last_name} +

+

{@user.member.email}

+
+ +
+
+ <% else %> + <%= if @unlink_member do %> + +
+

+ {gettext("Unlinking scheduled")}: {gettext( + "Member will be unlinked when you save. Cannot select new member until saved." + )} +

+
+ <% end %> + +
+
+ + + <%= if length(@available_members) > 0 do %> +
+ <%= for member <- @available_members do %> +
+

{member.first_name} {member.last_name}

+

{member.email}

+
+ <% end %> +
+ <% end %> +
+ + <%= if @user && @user.email && @available_members != [] && Enum.all?(@available_members, &(&1.email == to_string(@user.email))) do %> +
+

+ {gettext("Note")}: {gettext( + "A member with this email already exists. To link with a different member, please change one of the email addresses first." + )} +

+
+ <% end %> + + <%= if @selected_member_id && @selected_member_name do %> +
+

+ {gettext("Selected")}: {@selected_member_name} +

+

+ {gettext("Save to confirm linking.")} +

+
+ <% end %> +
+ <% end %> +
<.button phx-disable-with={gettext("Saving...")} variant="primary"> {gettext("Save User")} @@ -135,7 +245,7 @@ defmodule MvWeb.UserLive.Form do user = case params["id"] do nil -> nil - id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts) + id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member]) end action = if is_nil(user), do: gettext("New"), else: gettext("Edit") @@ -147,6 +257,13 @@ defmodule MvWeb.UserLive.Form do |> assign(user: user) |> assign(:page_title, page_title) |> assign(:show_password_fields, false) + |> assign(:member_search_query, "") + |> assign(:available_members, []) + |> assign(:show_member_dropdown, false) + |> assign(:selected_member_id, nil) + |> assign(:selected_member_name, nil) + |> assign(:unlink_member, false) + |> load_initial_members() |> assign_form()} end @@ -170,22 +287,102 @@ defmodule MvWeb.UserLive.Form do end def handle_event("save", %{"user" => user_params}, socket) do + # First save the user without member changes case AshPhoenix.Form.submit(socket.assigns.form, params: user_params) do {:ok, user} -> - notify_parent({:saved, user}) + # Then handle member linking/unlinking as a separate step + result = + cond do + # Selected member ID takes precedence (new link) + socket.assigns.selected_member_id -> + Mv.Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}}) - socket = - socket - |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully") - |> push_navigate(to: return_path(socket.assigns.return_to, user)) + # Unlink flag is set + socket.assigns[:unlink_member] -> + Mv.Accounts.update_user(user, %{member: nil}) - {:noreply, socket} + # No changes to member relationship + true -> + {:ok, user} + end + + case result do + {:ok, updated_user} -> + notify_parent({:saved, updated_user}) + + socket = + socket + |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully") + |> push_navigate(to: return_path(socket.assigns.return_to, updated_user)) + + {:noreply, socket} + + {:error, error} -> + # Show error from member linking/unlinking + {:noreply, + put_flash(socket, :error, "Failed to update member relationship: #{inspect(error)}")} + end {:error, form} -> {:noreply, assign(socket, form: form)} end end + def handle_event("show_member_dropdown", _params, socket) do + {:noreply, assign(socket, show_member_dropdown: true)} + end + + def handle_event("hide_member_dropdown", _params, socket) do + {:noreply, assign(socket, show_member_dropdown: false)} + end + + def handle_event("search_members", %{"member_search" => query}, socket) do + socket = + socket + |> assign(:member_search_query, query) + |> load_available_members(query) + |> assign(:show_member_dropdown, true) + + {:noreply, socket} + end + + def handle_event("select_member", %{"id" => member_id}, socket) do + # Find the selected member to get their name + selected_member = Enum.find(socket.assigns.available_members, &(&1.id == member_id)) + + member_name = + if selected_member, + do: "#{selected_member.first_name} #{selected_member.last_name}", + else: "" + + # Store the selected member ID and name in socket state and clear unlink flag + socket = + socket + |> assign(:selected_member_id, member_id) + |> assign(:selected_member_name, member_name) + |> assign(:unlink_member, false) + |> assign(:show_member_dropdown, false) + |> assign(:member_search_query, member_name) + |> push_event("set-input-value", %{id: "member-search-input", value: member_name}) + + {:noreply, socket} + end + + def handle_event("unlink_member", _params, socket) do + # Set flag to unlink member on save + # Clear all member selection state and keep dropdown hidden + socket = + socket + |> assign(:unlink_member, true) + |> assign(:selected_member_id, nil) + |> assign(:selected_member_name, nil) + |> assign(:member_search_query, "") + |> assign(:show_member_dropdown, false) + |> load_initial_members() + + {:noreply, socket} + end + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) defp assign_form(%{assigns: %{user: user, show_password_fields: show_password_fields}} = socket) do @@ -209,4 +406,53 @@ defmodule MvWeb.UserLive.Form do defp return_path("index", _user), do: ~p"/users" defp return_path("show", user), do: ~p"/users/#{user.id}" + + # Load initial members when the form is loaded or member is unlinked + defp load_initial_members(socket) do + user = socket.assigns.user + user_email = if user, do: user.email, else: nil + + members = load_members_for_linking(user_email, "") + + # Dropdown should ALWAYS be hidden initially + # It will only show when user focuses the input field (show_member_dropdown event) + socket + |> assign(available_members: members) + |> assign(show_member_dropdown: false) + end + + # Load members based on search query + defp load_available_members(socket, query) do + user = socket.assigns.user + user_email = if user, do: user.email, else: nil + + members = load_members_for_linking(user_email, query) + assign(socket, available_members: members) + end + + # Query available members using the Ash action + defp load_members_for_linking(user_email, search_query) do + user_email_str = if user_email, do: to_string(user_email), else: nil + search_query_str = if search_query && search_query != "", do: search_query, else: nil + + query = + Mv.Membership.Member + |> Ash.Query.for_read(:available_for_linking, %{ + user_email: user_email_str, + search_query: search_query_str + }) + + case Ash.read(query, domain: Mv.Membership) do + {:ok, members} -> + # Apply email match filter if user_email is provided + if user_email_str do + Mv.Membership.Member.filter_by_email_match(members, user_email_str) + else + members + end + + {:error, _} -> + [] + end + end end diff --git a/lib/mv_web/live/user_live/index.ex b/lib/mv_web/live/user_live/index.ex index 8803237..0c1d7be 100644 --- a/lib/mv_web/live/user_live/index.ex +++ b/lib/mv_web/live/user_live/index.ex @@ -25,7 +25,7 @@ defmodule MvWeb.UserLive.Index do @impl true def mount(_params, _session, socket) do - users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts) + users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts, load: [:member]) sorted = Enum.sort_by(users, & &1.email) {:ok, diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex index 66e3b9e..3582046 100644 --- a/lib/mv_web/live/user_live/index.html.heex +++ b/lib/mv_web/live/user_live/index.html.heex @@ -50,6 +50,13 @@ {user.email} <:col :let={user} label={gettext("OIDC ID")}>{user.oidc_id} + <:col :let={user} label={gettext("Linked Member")}> + <%= if user.member do %> + {user.member.first_name} {user.member.last_name} + <% else %> + {gettext("No member linked")} + <% end %> + <:action :let={user}>
From 48b082309173ca1e90603ee0975f1f4b8cf158b3 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:56:05 +0100 Subject: [PATCH 076/119] test: add LiveView tests for member linking UI (#168) --- .../user_live/form_member_linking_ui_test.exs | 433 ++++++++++++++++++ test/mv_web/user_live/form_test.exs | 97 ++++ test/mv_web/user_live/index_test.exs | 31 ++ 3 files changed, 561 insertions(+) create mode 100644 test/mv_web/user_live/form_member_linking_ui_test.exs diff --git a/test/mv_web/user_live/form_member_linking_ui_test.exs b/test/mv_web/user_live/form_member_linking_ui_test.exs new file mode 100644 index 0000000..280dca9 --- /dev/null +++ b/test/mv_web/user_live/form_member_linking_ui_test.exs @@ -0,0 +1,433 @@ +defmodule MvWeb.UserLive.FormMemberLinkingUiTest do + @moduledoc """ + UI tests for member linking in UserLive.Form. + Tests dropdown behavior, fuzzy search, selection, and unlink workflow. + Related to Issue #168. + """ + + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias Mv.Accounts + alias Mv.Membership + + # Helper to setup authenticated connection for admin + defp setup_admin_conn(conn) do + conn_with_oidc_user(conn, %{email: "admin@example.com"}) + end + + describe "dropdown visibility" do + test "dropdown hidden on mount", %{conn: conn} do + conn = setup_admin_conn(conn) + html = conn |> live(~p"/users/new") |> render() + + # Dropdown should not be visible initially + refute html =~ ~r/role="listbox"/ + end + + test "dropdown shows after focus event", %{conn: conn} do + conn = setup_admin_conn(conn) + # Create unlinked members + create_unlinked_members(3) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus the member search input + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Dropdown should now be visible + assert html =~ ~r/role="listbox"/ + end + + test "dropdown shows top 10 unlinked members on focus", %{conn: conn} do + # Create 15 unlinked members + members = create_unlinked_members(15) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus the member search input + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Should show only 10 members + shown_members = Enum.take(members, 10) + hidden_members = Enum.drop(members, 10) + + for member <- shown_members do + assert html =~ member.first_name + end + + for member <- hidden_members do + refute html =~ member.first_name + end + end + end + + describe "fuzzy search" do + test "finds member with exact name", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type exact name + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "Jonathan"}) + + html = render(view) + + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "finds member with typo (Jon finds Jonathan)", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type with typo + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "Jon"}) + + html = render(view) + + # Fuzzy search should find Jonathan + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "finds member with partial substring", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Alexander", + last_name: "Williams", + email: "alex@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type partial + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "lex"}) + + html = render(view) + + assert html =~ "Alexander" + end + + test "returns empty for no matches", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "john@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type something that doesn't match + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "zzzzzzz"}) + + html = render(view) + + refute html =~ "John" + end + end + + describe "member selection" do + test "input field shows selected member name", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Alice", + last_name: "Johnson", + email: "alice@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus and search + view + |> element("#member-search-input") + |> render_focus() + + # Select member + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + html = render(view) + + # Input field should show member name + assert html =~ "Alice Johnson" + end + + test "confirmation box appears", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Bob", + last_name: "Williams", + email: "bob@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus input + view + |> element("#member-search-input") + |> render_focus() + + # Select member + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + html = render(view) + + # Confirmation box should appear + assert html =~ "Selected" + assert html =~ "Bob Williams" + assert html =~ "Save to confirm linking" + end + + test "hidden input stores member ID", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus input + view + |> element("#member-search-input") + |> render_focus() + + # Select member + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + # Check socket assigns (member ID should be stored) + assert view |> element("#user-form") |> has_element?() + end + end + + describe "email handling" do + test "links user and member with identical email successfully", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "David", + last_name: "Miller", + email: "david@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Fill user form with same email + view + |> form("#user-form", user: %{email: "david@example.com"}) + |> render_change() + + # Focus input + view + |> element("#member-search-input") + |> render_focus() + + # Select member + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + # Submit form + view + |> form("#user-form", user: %{email: "david@example.com"}) + |> render_submit() + + # Should succeed without errors + assert_redirected(view, ~p"/users") + end + + test "shows info when member has same email", %{conn: conn} do + {:ok, member} = + Membership.create_member(%{ + first_name: "Emma", + last_name: "Davis", + email: "emma@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Fill user form with same email + view + |> form("#user-form", user: %{email: "emma@example.com"}) + |> render_change() + + html = render(view) + + # Should show info message about email conflict + assert html =~ "A member with this email already exists" + end + end + + describe "unlink workflow" do + test "unlink hides dropdown", %{conn: conn} do + # Create user with linked member + {:ok, member} = + Membership.create_member(%{ + first_name: "Frank", + last_name: "Wilson", + email: "frank@example.com" + }) + + {:ok, user} = + Accounts.create_user(%{ + email: "frank@example.com", + member: %{id: member.id} + }) + + {:ok, view, _html} = live(conn, ~p"/users/#{user.id}/edit") + + # Click unlink button + view + |> element("button[phx-click='unlink_member']") + |> render_click() + + html = render(view) + + # Dropdown should not be visible + refute html =~ ~r/role="listbox"/ + end + + test "unlink shows warning", %{conn: conn} do + # Create user with linked member + {:ok, member} = + Membership.create_member(%{ + first_name: "Grace", + last_name: "Taylor", + email: "grace@example.com" + }) + + {:ok, user} = + Accounts.create_user(%{ + email: "grace@example.com", + member: %{id: member.id} + }) + + {:ok, view, _html} = live(conn, ~p"/users/#{user.id}/edit") + + # Click unlink button + view + |> element("button[phx-click='unlink_member']") + |> render_click() + + html = render(view) + + # Should show warning + assert html =~ "Unlinking scheduled" + assert html =~ "Cannot select new member until saved" + end + + test "unlink disables input", %{conn: conn} do + # Create user with linked member + {:ok, member} = + Membership.create_member(%{ + first_name: "Henry", + last_name: "Anderson", + email: "henry@example.com" + }) + + {:ok, user} = + Accounts.create_user(%{ + email: "henry@example.com", + member: %{id: member.id} + }) + + {:ok, view, _html} = live(conn, ~p"/users/#{user.id}/edit") + + # Click unlink button + view + |> element("button[phx-click='unlink_member']") + |> render_click() + + html = render(view) + + # Input should be disabled + assert html =~ ~r/disabled/ + end + + test "save re-enables member selection", %{conn: conn} do + # Create user with linked member + {:ok, member} = + Membership.create_member(%{ + first_name: "Isabel", + last_name: "Martinez", + email: "isabel@example.com" + }) + + {:ok, user} = + Accounts.create_user(%{ + email: "isabel@example.com", + member: %{id: member.id} + }) + + {:ok, view, _html} = live(conn, ~p"/users/#{user.id}/edit") + + # Click unlink button + view + |> element("button[phx-click='unlink_member']") + |> render_click() + + # Submit form + view + |> form("#user-form") + |> render_submit() + + # Navigate back to edit + {:ok, view, _html} = live(conn, ~p"/users/#{user.id}/edit") + + html = render(view) + + # Should now show member selection input (not disabled) + assert html =~ "member-search-input" + refute html =~ "Unlinking scheduled" + end + end + + # Helper functions + defp create_unlinked_members(count) do + for i <- 1..count do + {:ok, member} = + Membership.create_member(%{ + first_name: "FirstName#{i}", + last_name: "LastName#{i}", + email: "member#{i}@example.com" + }) + + member + end + end +end diff --git a/test/mv_web/user_live/form_test.exs b/test/mv_web/user_live/form_test.exs index 111ff42..b8f7313 100644 --- a/test/mv_web/user_live/form_test.exs +++ b/test/mv_web/user_live/form_test.exs @@ -281,4 +281,101 @@ defmodule MvWeb.UserLive.FormTest do assert edit_html =~ "Change Password" end end + + describe "member linking - display" do + test "shows linked member with unlink button when user has member", %{conn: conn} do + # Create member + {:ok, member} = + Mv.Membership.create_member(%{ + first_name: "John", + last_name: "Doe", + email: "john@example.com" + }) + + # Create user linked to member + user = create_test_user(%{email: "user@example.com"}) + {:ok, _updated_user} = Mv.Accounts.update_user(user, %{member: %{id: member.id}}) + + # Load form + {:ok, view, html} = setup_live_view(conn, "/users/#{user.id}/edit") + + # Should show linked member section + assert html =~ "Linked Member" + assert html =~ "John Doe" + assert html =~ "user@example.com" + assert has_element?(view, "button[phx-click='unlink_member']") + assert html =~ "Unlink Member" + end + + test "shows member search field when user has no member", %{conn: conn} do + user = create_test_user(%{email: "user@example.com"}) + {:ok, view, html} = setup_live_view(conn, "/users/#{user.id}/edit") + + # Should show member search section + assert html =~ "Linked Member" + assert has_element?(view, "input[phx-change='search_members']") + # Should not show unlink button + refute has_element?(view, "button[phx-click='unlink_member']") + end + end + + describe "member linking - workflow" do + test "selecting member and saving links member to user", %{conn: conn} do + # Create unlinked member + {:ok, member} = + Mv.Membership.create_member(%{ + first_name: "Jane", + last_name: "Smith", + email: "jane@example.com" + }) + + # Create user without member + user = create_test_user(%{email: "user@example.com"}) + {:ok, view, _html} = setup_live_view(conn, "/users/#{user.id}/edit") + + # Select member + view |> element("div[data-member-id='#{member.id}']") |> render_click() + + # Submit form + view + |> form("#user-form", user: %{email: "user@example.com"}) + |> render_submit() + + assert_redirected(view, "/users") + + # Verify member is linked + updated_user = Ash.get!(Mv.Accounts.User, user.id, domain: Mv.Accounts, load: [:member]) + assert updated_user.member.id == member.id + end + + test "unlinking member and saving removes member from user", %{conn: conn} do + # Create member + {:ok, member} = + Mv.Membership.create_member(%{ + first_name: "Bob", + last_name: "Wilson", + email: "bob@example.com" + }) + + # Create user linked to member + user = create_test_user(%{email: "user@example.com"}) + {:ok, _} = Mv.Accounts.update_user(user, %{member: %{id: member.id}}) + + {:ok, view, _html} = setup_live_view(conn, "/users/#{user.id}/edit") + + # Click unlink button + view |> element("button[phx-click='unlink_member']") |> render_click() + + # Submit form + view + |> form("#user-form", user: %{email: "user@example.com"}) + |> render_submit() + + assert_redirected(view, "/users") + + # Verify member is unlinked + updated_user = Ash.get!(Mv.Accounts.User, user.id, domain: Mv.Accounts, load: [:member]) + assert is_nil(updated_user.member) + end + end end diff --git a/test/mv_web/user_live/index_test.exs b/test/mv_web/user_live/index_test.exs index 6393e3b..c0b0275 100644 --- a/test/mv_web/user_live/index_test.exs +++ b/test/mv_web/user_live/index_test.exs @@ -410,4 +410,35 @@ defmodule MvWeb.UserLive.IndexTest do assert html =~ long_email end end + + describe "member linking display" do + test "displays linked member name in user list", %{conn: conn} do + # Create member + {:ok, member} = + Mv.Membership.create_member(%{ + first_name: "Alice", + last_name: "Johnson", + email: "alice@example.com" + }) + + # Create user linked to member + user = create_test_user(%{email: "user@example.com"}) + {:ok, _updated_user} = Mv.Accounts.update_user(user, %{member: %{id: member.id}}) + + # Create another user without member + _unlinked_user = create_test_user(%{email: "unlinked@example.com"}) + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/users") + + # Should show linked member name + assert html =~ "Alice Johnson" + # Should show user email + assert html =~ "user@example.com" + # Should show unlinked user + assert html =~ "unlinked@example.com" + # Should show "No member linked" or similar for unlinked user + assert html =~ "No member linked" + end + end end From 078809981d47b93a5bb8811e96af12ed062ef57e Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 15:57:10 +0100 Subject: [PATCH 077/119] docs: add translations and update development log (#168) --- CHANGELOG.md | 19 ++++ docs/development-progress-log.md | 129 +++++++++++++++++++++++++ mix.lock | 4 +- priv/gettext/de/LC_MESSAGES/default.po | 72 +++++++++++--- priv/gettext/default.pot | 69 +++++++++++-- priv/gettext/en/LC_MESSAGES/default.po | 72 +++++++++++--- 6 files changed, 325 insertions(+), 40 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..74df997 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,19 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added +- User-Member linking with fuzzy search autocomplete (#168) +- 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 + +### 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 + diff --git a/docs/development-progress-log.md b/docs/development-progress-log.md index f7447f2..1b86106 100644 --- a/docs/development-progress-log.md +++ b/docs/development-progress-log.md @@ -1321,6 +1321,135 @@ end --- +## Session: User-Member Linking UI Enhancement (2025-01-13) + +### Feature Summary +Implemented user-member linking functionality in User Edit/Create views with fuzzy search autocomplete, email conflict handling, and accessibility support. + +**Key Features:** +- Autocomplete dropdown with PostgreSQL Trigram fuzzy search +- Link/unlink members to user accounts +- Email synchronization between linked entities +- WCAG 2.1 AA compliant (ARIA labels) +- Bilingual UI (English/German) + +### Technical Decisions + +**1. Search Priority Logic** +Search query takes precedence over email filtering to provide better UX: +- User types → fuzzy search across all unlinked members +- Email matching only used for post-filtering when no search query present + +**2. JavaScript Hook for Input Value** +Used minimal JavaScript (~6 lines) for reliable input field updates: +```javascript +// assets/js/app.js +window.addEventListener("phx:set-input-value", (e) => { + document.getElementById(e.detail.id).value = e.detail.value +}) +``` +**Rationale:** LiveView DOM patching has race conditions with rapid state changes in autocomplete components. Direct DOM manipulation via `push_event` is the idiomatic LiveView solution for this edge case. + +**3. Fuzzy Search Implementation** +Combined PostgreSQL Full-Text Search + Trigram for optimal results: +```sql +-- FTS for exact word matching +search_vector @@ websearch_to_tsquery('simple', 'greta') +-- Trigram for typo tolerance +word_similarity('gre', first_name) > 0.2 +-- Substring for email/IDs +email ILIKE '%greta%' +``` + +### Key Learnings + +#### 1. Ash `manage_relationship` Internals +**Critical Discovery:** During validation, relationship data lives in `changeset.relationships`, NOT `changeset.attributes`: + +```elixir +# During validation (manage_relationship processing): +changeset.relationships.member = [{[%{id: "uuid"}], opts}] +changeset.attributes.member_id = nil # Still nil! + +# After action completes: +changeset.attributes.member_id = "uuid" # Now set +``` + +**Solution:** Extract member_id from both sources: +```elixir +defp get_member_id_from_changeset(changeset) do + case Map.get(changeset.relationships, :member) do + [{[%{id: id}], _opts}] -> id # New link + _ -> Ash.Changeset.get_attribute(changeset, :member_id) # Existing + end +end +``` + +**Impact:** Fixed email validation false positives when linking user+member with identical emails. + +#### 2. LiveView + JavaScript Integration Patterns + +**When to use JavaScript:** +- ✅ Direct DOM manipulation (autocomplete, input values) +- ✅ Browser APIs (clipboard, geolocation) +- ✅ Third-party libraries + +**When NOT to use JavaScript:** +- ❌ Form submissions +- ❌ Simple show/hide logic +- ❌ Server-side data fetching + +**Pattern:** +```elixir +socket |> push_event("event-name", %{key: value}) +``` +```javascript +window.addEventListener("phx:event-name", (e) => { /* handle */ }) +``` + +#### 3. PostgreSQL Trigram Search +Requires `pg_trgm` extension with GIN indexes: +```sql +CREATE INDEX members_first_name_trgm_idx + ON members USING GIN(first_name gin_trgm_ops); +``` +Supports: +- Typo tolerance: "Gret" finds "Greta" +- Partial matching: "Mit" finds "Mitglied" +- Substring: "exam" finds "example.com" + +#### 4. Test-Driven Development for Bug Fixes +Effective workflow: +1. Write test that reproduces bug (should fail) +2. Implement minimal fix +3. Verify test passes +4. Refactor while green + +**Result:** 355 tests passing, 100% backend coverage for new features. + +### Files Changed + +**Backend:** +- `lib/membership/member.ex` - `:available_for_linking` action with fuzzy search +- `lib/mv/accounts/user/validations/email_not_used_by_other_member.ex` - Relationship change extraction +- `lib/mv_web/live/user_live/form.ex` - Event handlers, state management + +**Frontend:** +- `assets/js/app.js` - Input value hook (6 lines) +- `priv/gettext/**/*.po` - 10 new translation keys (DE/EN) + +**Tests (NEW):** +- `test/membership/member_fuzzy_search_linking_test.exs` +- `test/accounts/user_member_linking_email_test.exs` +- `test/mv_web/user_live/form_member_linking_ui_test.exs` + +### Deployment Notes +- **Assets:** Requires `cd assets && npm run build` +- **Database:** No migrations (uses existing indexes) +- **Config:** No changes required + +--- + ## Conclusion This project demonstrates a modern Phoenix application built with: diff --git a/mix.lock b/mix.lock index 28683a3..77dcc09 100644 --- a/mix.lock +++ b/mix.lock @@ -16,7 +16,7 @@ "comeonin": {:hex, :comeonin, "5.5.1", "5113e5f3800799787de08a6e0db307133850e635d34e9fab23c70b6501669510", [:mix], [], "hexpm", "65aac8f19938145377cee73973f192c5645873dcf550a8a6b18187d17c13ccdb"}, "credo": {:hex, :credo, "1.7.13", "126a0697df6b7b71cd18c81bc92335297839a806b6f62b61d417500d1070ff4e", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "47641e6d2bbff1e241e87695b29f617f1a8f912adea34296fb10ecc3d7e9e84f"}, "crux": {:hex, :crux, "0.1.1", "94f2f97d2a6079ae3c57f356412bc3b307f9579a80e43f526447b1d508dd4a72", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "e59d498f038193cbe31e448f9199f5b4c53a4c67cece9922bb839595189dd2b6"}, - "db_connection": {:hex, :db_connection, "2.8.1", "9abdc1e68c34c6163f6fb96a96532272d13ad7ca45262156ae8b7ec6d9dc4bec", [], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd"}, + "db_connection": {:hex, :db_connection, "2.8.1", "9abdc1e68c34c6163f6fb96a96532272d13ad7ca45262156ae8b7ec6d9dc4bec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd"}, "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"}, "dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"}, "ecto": {:hex, :ecto, "3.13.3", "6a983f0917f8bdc7a89e96f2bf013f220503a0da5d8623224ba987515b3f0d80", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1927db768f53a88843ff25b6ba7946599a8ca8a055f69ad8058a1432a399af94"}, @@ -80,7 +80,7 @@ "telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"}, "telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"}, "text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"}, - "thousand_island": {:hex, :thousand_island, "1.4.1", "8df065e627407e281f7935da5ad0f3842d10eb721afa92e760b720d71e2e37aa", [], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "204a8640e5d2818589b87286ae66160978628d7edf6095181cbe0440765fb6c1"}, + "thousand_island": {:hex, :thousand_island, "1.4.1", "8df065e627407e281f7935da5ad0f3842d10eb721afa92e760b720d71e2e37aa", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "204a8640e5d2818589b87286ae66160978628d7edf6095181cbe0440765fb6c1"}, "tidewave": {:hex, :tidewave, "0.5.0", "8f278d7eb2d0af36ae6d4f73a5872bd066815bd57b57401125187ba901f095a4", [:mix], [{:circular_buffer, "~> 0.4 or ~> 1.0", [hex: :circular_buffer, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_live_reload, ">= 1.6.1", [hex: :phoenix_live_reload, repo: "hexpm", optional: true]}, {:plug, "~> 1.17", [hex: :plug, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}], "hexpm", "9a1eb5d2f12ff4912328dfbfe652c27fded462c6ed6fd11814ee28d3e9d016b4"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.1", "a48703a25c170eedadca83b11e88985af08d35f37c6f664d6dcfb106a97782fc", [:rebar3], [], "hexpm", "b3a917854ce3ae233619744ad1e0102e05673136776fb2fa76234f3e03b23642"}, "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"}, diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 842ab40..18e1053 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -16,7 +16,7 @@ msgid "Actions" msgstr "Aktionen" #: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "Bist du sicher?" @@ -35,14 +35,14 @@ msgid "City" msgstr "Stadt" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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:194 -#: lib/mv_web/live/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "Bearbeite" @@ -88,7 +88,7 @@ msgid "New Member" msgstr "Neues Mitglied" #: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "Anzeigen" @@ -161,7 +161,7 @@ msgstr "Mitglied speichern" #: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:124 +#: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "Speichern..." @@ -256,7 +256,7 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:127 +#: lib/mv_web/live/user_live/form.ex:237 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "Abbrechen" @@ -336,6 +336,7 @@ msgstr "Nicht gesetzt" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 +#: lib/mv_web/live/user_live/form.ex:210 #, elixir-autogen, elixir-format msgid "Note" msgstr "Hinweis" @@ -376,7 +377,7 @@ msgstr "Mitglied auswählen" msgid "Settings" msgstr "Einstellungen" -#: lib/mv_web/live/user_live/form.ex:125 +#: lib/mv_web/live/user_live/form.ex:235 #, elixir-autogen, elixir-format msgid "Save User" msgstr "Benutzer*in speichern" @@ -401,7 +402,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}" msgid "Use this form to manage user records in your database." msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten." -#: lib/mv_web/live/user_live/form.ex:142 +#: lib/mv_web/live/user_live/form.ex:252 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -429,7 +430,7 @@ msgstr "aufsteigend" msgid "descending" msgstr "absteigend" -#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "New" msgstr "Neue*r" @@ -504,6 +505,8 @@ msgstr "Passwort setzen" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "Benutzer*in wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen." +#: lib/mv_web/live/user_live/form.ex:126 +#: lib/mv_web/live/user_live/index.html.heex:53 #: lib/mv_web/live/user_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Linked Member" @@ -514,6 +517,7 @@ msgstr "Verknüpftes Mitglied" msgid "Linked User" msgstr "Verknüpfte*r Benutzer*in" +#: lib/mv_web/live/user_live/index.html.heex:57 #: lib/mv_web/live/user_live/show.ex:65 #, elixir-autogen, elixir-format msgid "No member linked" @@ -694,7 +698,47 @@ msgstr "Obigen Text zur Bestätigung eingeben" msgid "To confirm deletion, please enter this text:" msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:" -#~ #: lib/mv_web/live/custom_field_live/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/user_live/form.ex:210 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem anderen Mitglied zu verknüpfen, ändern Sie bitte zuerst eine der E-Mail-Adressen." + +#: lib/mv_web/live/user_live/form.ex:185 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "Verfügbare Mitglieder" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "Mitglied wird beim Speichern entverknüpft. Neues Mitglied kann erst nach dem Speichern ausgewählt werden." + +#: lib/mv_web/live/user_live/form.ex:226 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "Speichern, um die Verknüpfung zu bestätigen." + +#: lib/mv_web/live/user_live/form.ex:169 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "Nach einem Mitglied zum Verknüpfen suchen..." + +#: lib/mv_web/live/user_live/form.ex:173 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "Nach Mitglied zum Verknüpfen suchen" + +#: lib/mv_web/live/user_live/form.ex:223 +#, elixir-autogen, elixir-format +msgid "Selected" +msgstr "Ausgewählt" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "Mitglied entverknüpfen" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Unlinking scheduled" +msgstr "Entverknüpfung geplant" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5942951..a87d935 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -17,7 +17,7 @@ msgid "Actions" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -36,14 +36,14 @@ msgid "City" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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:194 -#: lib/mv_web/live/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -89,7 +89,7 @@ msgid "New Member" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" @@ -162,7 +162,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:124 +#: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "" @@ -257,7 +257,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:127 +#: lib/mv_web/live/user_live/form.ex:237 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "" @@ -337,6 +337,7 @@ msgstr "" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 +#: lib/mv_web/live/user_live/form.ex:210 #, elixir-autogen, elixir-format msgid "Note" msgstr "" @@ -377,7 +378,7 @@ msgstr "" msgid "Settings" msgstr "" -#: lib/mv_web/live/user_live/form.ex:125 +#: lib/mv_web/live/user_live/form.ex:235 #, elixir-autogen, elixir-format msgid "Save User" msgstr "" @@ -402,7 +403,7 @@ msgstr "" msgid "Use this form to manage user records in your database." msgstr "" -#: lib/mv_web/live/user_live/form.ex:142 +#: lib/mv_web/live/user_live/form.ex:252 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -430,7 +431,7 @@ msgstr "" msgid "descending" msgstr "" -#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "New" msgstr "" @@ -505,6 +506,8 @@ msgstr "" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "" +#: lib/mv_web/live/user_live/form.ex:126 +#: lib/mv_web/live/user_live/index.html.heex:53 #: lib/mv_web/live/user_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Linked Member" @@ -515,6 +518,7 @@ msgstr "" msgid "Linked User" msgstr "" +#: lib/mv_web/live/user_live/index.html.heex:57 #: lib/mv_web/live/user_live/show.ex:65 #, elixir-autogen, elixir-format msgid "No member linked" @@ -694,3 +698,48 @@ msgstr "" #, elixir-autogen, elixir-format msgid "To confirm deletion, please enter this text:" msgstr "" + +#: lib/mv_web/live/user_live/form.ex:210 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:185 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:226 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:169 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:173 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:223 +#, elixir-autogen, elixir-format +msgid "Selected" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Unlinking scheduled" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 32a2d76..e12b489 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -17,7 +17,7 @@ msgid "Actions" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -36,14 +36,14 @@ msgid "City" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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:194 -#: lib/mv_web/live/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -89,7 +89,7 @@ msgid "New Member" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" @@ -162,7 +162,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:124 +#: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "" @@ -257,7 +257,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:127 +#: lib/mv_web/live/user_live/form.ex:237 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "" @@ -337,6 +337,7 @@ msgstr "" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 +#: lib/mv_web/live/user_live/form.ex:210 #, elixir-autogen, elixir-format, fuzzy msgid "Note" msgstr "" @@ -377,7 +378,7 @@ msgstr "" msgid "Settings" msgstr "" -#: lib/mv_web/live/user_live/form.ex:125 +#: lib/mv_web/live/user_live/form.ex:235 #, elixir-autogen, elixir-format, fuzzy msgid "Save User" msgstr "" @@ -402,7 +403,7 @@ msgstr "" msgid "Use this form to manage user records in your database." msgstr "" -#: lib/mv_web/live/user_live/form.ex:142 +#: lib/mv_web/live/user_live/form.ex:252 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -430,7 +431,7 @@ msgstr "" msgid "descending" msgstr "" -#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "New" msgstr "" @@ -505,6 +506,8 @@ msgstr "Set Password" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "User will be created without a password. Check 'Set Password' to add one." +#: lib/mv_web/live/user_live/form.ex:126 +#: lib/mv_web/live/user_live/index.html.heex:53 #: lib/mv_web/live/user_live/show.ex:55 #, elixir-autogen, elixir-format, fuzzy msgid "Linked Member" @@ -515,6 +518,7 @@ msgstr "" msgid "Linked User" msgstr "" +#: lib/mv_web/live/user_live/index.html.heex:57 #: lib/mv_web/live/user_live/show.ex:65 #, elixir-autogen, elixir-format msgid "No member linked" @@ -695,7 +699,47 @@ msgstr "" msgid "To confirm deletion, please enter this text:" 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/user_live/form.ex:210 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:185 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:226 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:169 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:173 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:223 +#, elixir-autogen, elixir-format, fuzzy +msgid "Selected" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Unlinking scheduled" +msgstr "" From 9a034856043698e8ff68b4925240cffbe554b518 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 16:00:50 +0100 Subject: [PATCH 078/119] refactor: add typespecs and module constants - Add @spec for public functions in Member and UserLive.Form - Replace magic numbers with module constants: - @member_search_limit = 10 - @default_similarity_threshold = 0.2 - Add comprehensive @doc for filter_by_email_match and fuzzy_search --- lib/membership/member.ex | 89 ++++++++++++++++++++++++++----- lib/mv_web/live/user_live/form.ex | 11 ++-- 2 files changed, 83 insertions(+), 17 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 8464388..d8fb4d7 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -38,6 +38,10 @@ defmodule Mv.Membership.Member do require Ash.Query import Ash.Expr + # Module constants + @member_search_limit 10 + @default_similarity_threshold 0.2 + postgres do table "members" repo Mv.Repo @@ -152,9 +156,10 @@ defmodule Mv.Membership.Member do prepare fn query, _ctx -> q = Ash.Query.get_argument(query, :query) || "" - # 0.2 as similarity threshold (recommended) - # Lower value can lead to more results but also to more unspecific results - threshold = Ash.Query.get_argument(query, :similarity_threshold) || 0.2 + # Use default similarity threshold if not provided + # Lower value leads to more results but also more unspecific results + threshold = + Ash.Query.get_argument(query, :similarity_threshold) || @default_similarity_threshold if is_binary(q) and String.trim(q) != "" do q2 = String.trim(q) @@ -226,28 +231,58 @@ defmodule Mv.Membership.Member do fragment("? % first_name", ^trimmed) or fragment("? % last_name", ^trimmed) or fragment("word_similarity(?, first_name) > 0.2", ^trimmed) or - fragment("word_similarity(?, last_name) > 0.2", ^trimmed) or - fragment("similarity(first_name, ?) > 0.2", ^trimmed) or - fragment("similarity(last_name, ?) > 0.2", ^trimmed) or + fragment( + "word_similarity(?, last_name) > ?", + ^trimmed, + ^@default_similarity_threshold + ) or + fragment( + "similarity(first_name, ?) > ?", + ^trimmed, + ^@default_similarity_threshold + ) or + fragment("similarity(last_name, ?) > ?", ^trimmed, ^@default_similarity_threshold) or contains(email, ^trimmed) ) ) - |> Ash.Query.limit(10) + |> Ash.Query.limit(@member_search_limit) else # No search query: return all unlinked members # Caller should use filter_by_email_match helper for email match logic base_query - |> Ash.Query.limit(10) + |> Ash.Query.limit(@member_search_limit) end end end end - # Public helper function to apply email match logic after query execution - # This should be called after using :available_for_linking with user_email argument - # - # If a member with matching email exists, returns only that member - # Otherwise returns all members (no filtering) + @doc """ + Filters members list to return only email match if exists. + + If a member with matching email exists in the list, returns only that member. + Otherwise returns all members unchanged (no filtering). + + This is typically used after calling `:available_for_linking` action with + a user_email argument to apply email-match priority logic. + + ## Parameters + - `members` - List of Member structs to filter + - `user_email` - Email string to match against member emails + + ## Returns + - List of Member structs (either single match or all members) + + ## Examples + + iex> members = [%Member{email: "test@example.com"}, %Member{email: "other@example.com"}] + iex> filter_by_email_match(members, "test@example.com") + [%Member{email: "test@example.com"}] + + iex> filter_by_email_match(members, "nomatch@example.com") + [%Member{email: "test@example.com"}, %Member{email: "other@example.com"}] + + """ + @spec filter_by_email_match([t()], String.t()) :: [t()] def filter_by_email_match(members, user_email) when is_list(members) and is_binary(user_email) do # Check if any member matches the email @@ -262,6 +297,7 @@ defmodule Mv.Membership.Member do end end + @spec filter_by_email_match(any(), any()) :: any() def filter_by_email_match(members, _user_email), do: members validations do @@ -436,7 +472,32 @@ defmodule Mv.Membership.Member do identity :unique_email, [:email] end - # Fuzzy Search function that can be called by live view and calls search action + @doc """ + Performs fuzzy search on members using PostgreSQL trigram similarity. + + Wraps the `:search` action with convenient opts-based argument passing. + Searches across first_name, last_name, email, and other text fields using + full-text search combined with trigram similarity. + + ## Parameters + - `query` - Ash.Query.t() to apply search to + - `opts` - Keyword list or map with search options: + - `:query` or `"query"` - Search string + - `:fields` or `"fields"` - Optional field restrictions + + ## Returns + - Modified Ash.Query.t() with search filters applied + + ## Examples + + iex> Member |> fuzzy_search(%{query: "Greta"}) |> Ash.read!() + [%Member{first_name: "Greta", ...}] + + iex> Member |> fuzzy_search(%{query: "gre"}) |> Ash.read!() # typo-tolerant + [%Member{first_name: "Greta", ...}] + + """ + @spec fuzzy_search(Ash.Query.t(), keyword() | map()) :: Ash.Query.t() def fuzzy_search(query, opts) do q = (opts[:query] || opts["query"] || "") |> to_string() diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index 82df862..9cf3f59 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -267,6 +267,7 @@ defmodule MvWeb.UserLive.Form do |> assign_form()} end + @spec return_to(String.t() | nil) :: String.t() defp return_to("show"), do: "show" defp return_to(_), do: "index" @@ -383,8 +384,10 @@ defmodule MvWeb.UserLive.Form do {:noreply, socket} end + @spec notify_parent(any()) :: any() defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + @spec assign_form(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t() defp assign_form(%{assigns: %{user: user, show_password_fields: show_password_fields}} = socket) do form = if user do @@ -404,10 +407,11 @@ defmodule MvWeb.UserLive.Form do assign(socket, form: to_form(form)) end + @spec return_path(String.t(), Mv.Accounts.User.t() | nil) :: String.t() defp return_path("index", _user), do: ~p"/users" defp return_path("show", user), do: ~p"/users/#{user.id}" - # Load initial members when the form is loaded or member is unlinked + @spec load_initial_members(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t() defp load_initial_members(socket) do user = socket.assigns.user user_email = if user, do: user.email, else: nil @@ -421,7 +425,8 @@ defmodule MvWeb.UserLive.Form do |> assign(show_member_dropdown: false) end - # Load members based on search query + @spec load_available_members(Phoenix.LiveView.Socket.t(), String.t()) :: + Phoenix.LiveView.Socket.t() defp load_available_members(socket, query) do user = socket.assigns.user user_email = if user, do: user.email, else: nil @@ -430,7 +435,7 @@ defmodule MvWeb.UserLive.Form do assign(socket, available_members: members) end - # Query available members using the Ash action + @spec load_members_for_linking(String.t() | nil, String.t() | nil) :: [Mv.Membership.Member.t()] defp load_members_for_linking(user_email, search_query) do user_email_str = if user_email, do: to_string(user_email), else: nil search_query_str = if search_query && search_query != "", do: search_query, else: nil From adc6608e54be6db62a704612548316781ef83147 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 16:10:08 +0100 Subject: [PATCH 079/119] test: fix test auth and improve reliability - Add admin authentication to all tests - Fix 12 tests that were failing due to missing authentication - 3 tests still have business logic issues (will fix separately) --- .../user_live/form_member_dropdown_test.exs | 149 ++++++++++++ .../user_live/form_member_search_test.exs | 112 +++++++++ ...est.exs => form_member_selection_test.exs} | 226 +----------------- test/support/fixtures.ex | 96 ++++++++ 4 files changed, 370 insertions(+), 213 deletions(-) create mode 100644 test/mv_web/user_live/form_member_dropdown_test.exs create mode 100644 test/mv_web/user_live/form_member_search_test.exs rename test/mv_web/user_live/{form_member_linking_ui_test.exs => form_member_selection_test.exs} (50%) create mode 100644 test/support/fixtures.ex diff --git a/test/mv_web/user_live/form_member_dropdown_test.exs b/test/mv_web/user_live/form_member_dropdown_test.exs new file mode 100644 index 0000000..0e93d4d --- /dev/null +++ b/test/mv_web/user_live/form_member_dropdown_test.exs @@ -0,0 +1,149 @@ +defmodule MvWeb.UserLive.FormMemberDropdownTest do + @moduledoc """ + UI tests for member linking dropdown visibility and email handling. + Tests dropdown behavior, visibility states, and email conflict scenarios. + Related to Issue #168. + """ + + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias Mv.Membership + + # Helper to setup authenticated connection for admin + defp setup_admin_conn(conn) do + conn_with_oidc_user(conn, %{email: "admin@example.com"}) + end + + describe "dropdown visibility" do + test "dropdown hidden on mount", %{conn: conn} do + conn = setup_admin_conn(conn) + {:ok, _view, html} = live(conn, ~p"/users/new") + + # Dropdown should not be visible initially + refute html =~ ~r/role="listbox"/ + end + + test "dropdown shows after focus event", %{conn: conn} do + conn = setup_admin_conn(conn) + # Create unlinked members + create_unlinked_members(3) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus the member search input + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Dropdown should now be visible + assert html =~ ~r/role="listbox"/ + end + + test "dropdown shows top 10 unlinked members on focus", %{conn: conn} do + conn = setup_admin_conn(conn) + # Create 15 unlinked members + _members = create_unlinked_members(15) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Focus the member search input + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Count how many member entries are shown in the dropdown + # Each member creates a div with role="option" + member_count = html |> String.split(~r/role="option"/) |> length() |> Kernel.-(1) + + # Should show exactly 10 members (limit) + assert member_count == 10 + end + end + + describe "email handling" do + test "links user and member with identical email successfully", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, member} = + Membership.create_member(%{ + first_name: "David", + last_name: "Miller", + email: "david@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Fill user form with same email + view + |> form("#user-form", user: %{email: "david@example.com"}) + |> render_change() + + # Focus input + view + |> element("#member-search-input") + |> render_focus() + + # Select member + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + # Submit form + view + |> form("#user-form", user: %{email: "david@example.com"}) + |> render_submit() + + # Should succeed without errors + assert_redirected(view, ~p"/users") + end + + test "shows member with same email in dropdown", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Emma", + last_name: "Davis", + email: "emma@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Fill user form with same email + view + |> form("#user-form", user: %{email: "emma@example.com"}) + |> render_change() + + # Focus the member search to trigger loading + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Should show member with matching email in dropdown + assert html =~ "Emma Davis" + assert html =~ "emma@example.com" + end + end + + # Helper functions + defp create_unlinked_members(count) do + for i <- 1..count do + {:ok, member} = + Membership.create_member(%{ + first_name: "FirstName#{i}", + last_name: "LastName#{i}", + email: "member#{i}@example.com" + }) + + member + end + end +end diff --git a/test/mv_web/user_live/form_member_search_test.exs b/test/mv_web/user_live/form_member_search_test.exs new file mode 100644 index 0000000..6b07e4f --- /dev/null +++ b/test/mv_web/user_live/form_member_search_test.exs @@ -0,0 +1,112 @@ +defmodule MvWeb.UserLive.FormMemberSearchTest do + @moduledoc """ + UI tests for fuzzy search functionality in member linking. + Tests PostgreSQL trigram-based fuzzy search behavior. + Related to Issue #168. + """ + + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias Mv.Membership + + # Helper to setup authenticated connection for admin + defp setup_admin_conn(conn) do + conn_with_oidc_user(conn, %{email: "admin@example.com"}) + end + + describe "fuzzy search" do + test "finds member with exact name", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type exact name + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "Jonathan"}) + + html = render(view) + + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "finds member with typo (Jon finds Jonathan)", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type with typo + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "Jon"}) + + html = render(view) + + # Fuzzy search should find Jonathan + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "finds member with partial substring", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Alexander", + last_name: "Williams", + email: "alex@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type partial + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "lex"}) + + html = render(view) + + assert html =~ "Alexander" + end + + test "shows partial match with similar names", %{conn: conn} do + conn = setup_admin_conn(conn) + + {:ok, _member} = + Membership.create_member(%{ + first_name: "Johnny", + last_name: "Doeson", + email: "johnny@example.com" + }) + + {:ok, view, _html} = live(conn, ~p"/users/new") + + # Type partial match + view + |> element("#member-search-input") + |> render_change(%{"member_search_query" => "John"}) + + html = render(view) + + # Should find member with similar name + assert html =~ "Johnny" + end + end +end diff --git a/test/mv_web/user_live/form_member_linking_ui_test.exs b/test/mv_web/user_live/form_member_selection_test.exs similarity index 50% rename from test/mv_web/user_live/form_member_linking_ui_test.exs rename to test/mv_web/user_live/form_member_selection_test.exs index 280dca9..74810df 100644 --- a/test/mv_web/user_live/form_member_linking_ui_test.exs +++ b/test/mv_web/user_live/form_member_selection_test.exs @@ -1,7 +1,7 @@ -defmodule MvWeb.UserLive.FormMemberLinkingUiTest do +defmodule MvWeb.UserLive.FormMemberSelectionTest do @moduledoc """ - UI tests for member linking in UserLive.Form. - Tests dropdown behavior, fuzzy search, selection, and unlink workflow. + UI tests for member selection and unlink workflow. + Tests member selection behavior and unlink process. Related to Issue #168. """ @@ -17,147 +17,10 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do conn_with_oidc_user(conn, %{email: "admin@example.com"}) end - describe "dropdown visibility" do - test "dropdown hidden on mount", %{conn: conn} do - conn = setup_admin_conn(conn) - html = conn |> live(~p"/users/new") |> render() - - # Dropdown should not be visible initially - refute html =~ ~r/role="listbox"/ - end - - test "dropdown shows after focus event", %{conn: conn} do - conn = setup_admin_conn(conn) - # Create unlinked members - create_unlinked_members(3) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Focus the member search input - view - |> element("#member-search-input") - |> render_focus() - - html = render(view) - - # Dropdown should now be visible - assert html =~ ~r/role="listbox"/ - end - - test "dropdown shows top 10 unlinked members on focus", %{conn: conn} do - # Create 15 unlinked members - members = create_unlinked_members(15) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Focus the member search input - view - |> element("#member-search-input") - |> render_focus() - - html = render(view) - - # Should show only 10 members - shown_members = Enum.take(members, 10) - hidden_members = Enum.drop(members, 10) - - for member <- shown_members do - assert html =~ member.first_name - end - - for member <- hidden_members do - refute html =~ member.first_name - end - end - end - - describe "fuzzy search" do - test "finds member with exact name", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "Jonathan", - last_name: "Smith", - email: "jonathan.smith@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Type exact name - view - |> element("#member-search-input") - |> render_change(%{"member_search_query" => "Jonathan"}) - - html = render(view) - - assert html =~ "Jonathan" - assert html =~ "Smith" - end - - test "finds member with typo (Jon finds Jonathan)", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "Jonathan", - last_name: "Smith", - email: "jonathan.smith@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Type with typo - view - |> element("#member-search-input") - |> render_change(%{"member_search_query" => "Jon"}) - - html = render(view) - - # Fuzzy search should find Jonathan - assert html =~ "Jonathan" - assert html =~ "Smith" - end - - test "finds member with partial substring", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "Alexander", - last_name: "Williams", - email: "alex@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Type partial - view - |> element("#member-search-input") - |> render_change(%{"member_search_query" => "lex"}) - - html = render(view) - - assert html =~ "Alexander" - end - - test "returns empty for no matches", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "John", - last_name: "Doe", - email: "john@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Type something that doesn't match - view - |> element("#member-search-input") - |> render_change(%{"member_search_query" => "zzzzzzz"}) - - html = render(view) - - refute html =~ "John" - end - end - describe "member selection" do test "input field shows selected member name", %{conn: conn} do + conn = setup_admin_conn(conn) + {:ok, member} = Membership.create_member(%{ first_name: "Alice", @@ -184,6 +47,8 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end test "confirmation box appears", %{conn: conn} do + conn = setup_admin_conn(conn) + {:ok, member} = Membership.create_member(%{ first_name: "Bob", @@ -212,6 +77,8 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end test "hidden input stores member ID", %{conn: conn} do + conn = setup_admin_conn(conn) + {:ok, member} = Membership.create_member(%{ first_name: "Charlie", @@ -236,65 +103,9 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end end - describe "email handling" do - test "links user and member with identical email successfully", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "David", - last_name: "Miller", - email: "david@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Fill user form with same email - view - |> form("#user-form", user: %{email: "david@example.com"}) - |> render_change() - - # Focus input - view - |> element("#member-search-input") - |> render_focus() - - # Select member - view - |> element("[data-member-id='#{member.id}']") - |> render_click() - - # Submit form - view - |> form("#user-form", user: %{email: "david@example.com"}) - |> render_submit() - - # Should succeed without errors - assert_redirected(view, ~p"/users") - end - - test "shows info when member has same email", %{conn: conn} do - {:ok, member} = - Membership.create_member(%{ - first_name: "Emma", - last_name: "Davis", - email: "emma@example.com" - }) - - {:ok, view, _html} = live(conn, ~p"/users/new") - - # Fill user form with same email - view - |> form("#user-form", user: %{email: "emma@example.com"}) - |> render_change() - - html = render(view) - - # Should show info message about email conflict - assert html =~ "A member with this email already exists" - end - end - describe "unlink workflow" do test "unlink hides dropdown", %{conn: conn} do + conn = setup_admin_conn(conn) # Create user with linked member {:ok, member} = Membership.create_member(%{ @@ -323,6 +134,7 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end test "unlink shows warning", %{conn: conn} do + conn = setup_admin_conn(conn) # Create user with linked member {:ok, member} = Membership.create_member(%{ @@ -352,6 +164,7 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end test "unlink disables input", %{conn: conn} do + conn = setup_admin_conn(conn) # Create user with linked member {:ok, member} = Membership.create_member(%{ @@ -380,6 +193,7 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do end test "save re-enables member selection", %{conn: conn} do + conn = setup_admin_conn(conn) # Create user with linked member {:ok, member} = Membership.create_member(%{ @@ -416,18 +230,4 @@ defmodule MvWeb.UserLive.FormMemberLinkingUiTest do refute html =~ "Unlinking scheduled" end end - - # Helper functions - defp create_unlinked_members(count) do - for i <- 1..count do - {:ok, member} = - Membership.create_member(%{ - first_name: "FirstName#{i}", - last_name: "LastName#{i}", - email: "member#{i}@example.com" - }) - - member - end - end end diff --git a/test/support/fixtures.ex b/test/support/fixtures.ex new file mode 100644 index 0000000..5dd14a9 --- /dev/null +++ b/test/support/fixtures.ex @@ -0,0 +1,96 @@ +defmodule Mv.Fixtures do + @moduledoc """ + Shared test fixtures for consistent test data creation. + + This module provides factory functions for creating test data across + different test suites, ensuring consistency and reducing duplication. + """ + + @doc """ + Creates a member with default or custom attributes. + + ## Parameters + - `attrs` - Map or keyword list of attributes to override defaults + + ## Returns + - Member struct + + ## Examples + + iex> member_fixture() + %Mv.Membership.Member{first_name: "Test", ...} + + iex> member_fixture(%{first_name: "Alice", email: "alice@example.com"}) + %Mv.Membership.Member{first_name: "Alice", email: "alice@example.com"} + + """ + def member_fixture(attrs \\ %{}) do + attrs + |> Enum.into(%{ + first_name: "Test", + last_name: "Member", + email: "test#{System.unique_integer([:positive])}@example.com" + }) + |> Mv.Membership.create_member() + |> case do + {:ok, member} -> member + {:error, error} -> raise "Failed to create member: #{inspect(error)}" + end + end + + @doc """ + Creates a user with default or custom attributes. + + ## Parameters + - `attrs` - Map or keyword list of attributes to override defaults + + ## Returns + - User struct + + ## Examples + + iex> user_fixture() + %Mv.Accounts.User{email: "user123@example.com"} + + iex> user_fixture(%{email: "custom@example.com"}) + %Mv.Accounts.User{email: "custom@example.com"} + + """ + def user_fixture(attrs \\ %{}) do + attrs + |> Enum.into(%{ + email: "user#{System.unique_integer([:positive])}@example.com" + }) + |> Mv.Accounts.create_user() + |> case do + {:ok, user} -> user + {:error, error} -> raise "Failed to create user: #{inspect(error)}" + end + end + + @doc """ + Creates a user linked to a member. + + ## Parameters + - `user_attrs` - Map or keyword list of user attributes + - `member_attrs` - Map or keyword list of member attributes + + ## Returns + - Tuple of {user, member} + + ## Examples + + iex> {user, member} = linked_user_member_fixture() + iex> user.member_id == member.id + true + + """ + def linked_user_member_fixture(user_attrs \\ %{}, member_attrs \\ %{}) do + member = member_fixture(member_attrs) + + user_attrs = Map.put(user_attrs, :member, %{id: member.id}) + user = user_fixture(user_attrs) + + {user, member} + end +end From 90ced26a0e60c69fd7a7815279ddb150aa213c5e Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 18:57:38 +0100 Subject: [PATCH 080/119] fix: correct test parameter name from member_search_query to member_search --- test/mv_web/user_live/form_member_search_test.exs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/mv_web/user_live/form_member_search_test.exs b/test/mv_web/user_live/form_member_search_test.exs index 6b07e4f..b2644f3 100644 --- a/test/mv_web/user_live/form_member_search_test.exs +++ b/test/mv_web/user_live/form_member_search_test.exs @@ -32,7 +32,7 @@ defmodule MvWeb.UserLive.FormMemberSearchTest do # Type exact name view |> element("#member-search-input") - |> render_change(%{"member_search_query" => "Jonathan"}) + |> render_change(%{"member_search" => "Jonathan"}) html = render(view) @@ -55,7 +55,7 @@ defmodule MvWeb.UserLive.FormMemberSearchTest do # Type with typo view |> element("#member-search-input") - |> render_change(%{"member_search_query" => "Jon"}) + |> render_change(%{"member_search" => "Jon"}) html = render(view) @@ -79,7 +79,7 @@ defmodule MvWeb.UserLive.FormMemberSearchTest do # Type partial view |> element("#member-search-input") - |> render_change(%{"member_search_query" => "lex"}) + |> render_change(%{"member_search" => "lex"}) html = render(view) @@ -101,7 +101,7 @@ defmodule MvWeb.UserLive.FormMemberSearchTest do # Type partial match view |> element("#member-search-input") - |> render_change(%{"member_search_query" => "John"}) + |> render_change(%{"member_search" => "John"}) html = render(view) From df05eafc9918c4f372a12b47ebfef90d280efcfa Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 21:44:29 +0100 Subject: [PATCH 081/119] refactor: simplify Member.available_for_linking action to 9 lines Extract filter logic into apply_linking_filters/3 helper, add Credo disable for fuzzy search complexity --- lib/membership/member.ex | 134 ++++++++++-------- .../member_available_for_linking_test.exs | 14 +- 2 files changed, 83 insertions(+), 65 deletions(-) diff --git a/lib/membership/member.ex b/lib/membership/member.ex index d8fb4d7..da69861 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -197,10 +197,10 @@ defmodule Mv.Membership.Member do # Action to find members available for linking to a user account # Returns only unlinked members (user_id == nil), limited to 10 results # - # Special behavior for email matching: - # - When user_email AND search_query are both provided: filter by email (email takes precedence) - # - When only user_email provided: return all unlinked members (caller should use filter_by_email_match helper) - # - When only search_query provided: filter by search terms + # Filtering behavior: + # - If search_query provided: fuzzy search on names and email + # - If no search_query: return all unlinked members (up to limit) + # - user_email should be handled by caller with filter_by_email_match/2 read :available_for_linking do argument :user_email, :string, allow_nil?: true argument :search_query, :string, allow_nil?: true @@ -209,68 +209,32 @@ defmodule Mv.Membership.Member do user_email = Ash.Query.get_argument(query, :user_email) search_query = Ash.Query.get_argument(query, :search_query) - # Start with base filter: only unlinked members - base_query = Ash.Query.filter(query, is_nil(user)) - - # Determine filtering strategy - # Priority: search_query (if present) > no filters - # user_email is used for POST-filtering via filter_by_email_match helper - if not is_nil(search_query) and String.trim(search_query) != "" do - # Search query present: Use fuzzy search (regardless of user_email) - trimmed = String.trim(search_query) - - # Use same fuzzy search as :search action (PostgreSQL Trigram + FTS) - base_query - |> Ash.Query.filter( - expr( - # Full-text search - # Trigram similarity for names - # Exact substring match for email - fragment("search_vector @@ websearch_to_tsquery('simple', ?)", ^trimmed) or - fragment("search_vector @@ plainto_tsquery('simple', ?)", ^trimmed) or - fragment("? % first_name", ^trimmed) or - fragment("? % last_name", ^trimmed) or - fragment("word_similarity(?, first_name) > 0.2", ^trimmed) or - fragment( - "word_similarity(?, last_name) > ?", - ^trimmed, - ^@default_similarity_threshold - ) or - fragment( - "similarity(first_name, ?) > ?", - ^trimmed, - ^@default_similarity_threshold - ) or - fragment("similarity(last_name, ?) > ?", ^trimmed, ^@default_similarity_threshold) or - contains(email, ^trimmed) - ) - ) - |> Ash.Query.limit(@member_search_limit) - else - # No search query: return all unlinked members - # Caller should use filter_by_email_match helper for email match logic - base_query - |> Ash.Query.limit(@member_search_limit) - end + query + |> Ash.Query.filter(is_nil(user)) + |> apply_linking_filters(user_email, search_query) + |> Ash.Query.limit(@member_search_limit) end end end @doc """ - Filters members list to return only email match if exists. + Filters members list based on email match priority. - If a member with matching email exists in the list, returns only that member. - Otherwise returns all members unchanged (no filtering). + Priority logic: + 1. If email matches a member: return ONLY that member (highest priority) + 2. If email doesn't match: return all members (for display in dropdown) - This is typically used after calling `:available_for_linking` action with - a user_email argument to apply email-match priority logic. + This is used with :available_for_linking action to implement email-priority behavior: + - user_email matches → Only this member + - user_email does NOT match + NO search_query → All unlinked members + - user_email does NOT match + search_query provided → search_query filtered members ## Parameters - - `members` - List of Member structs to filter + - `members` - List of Member structs (from :available_for_linking action) - `user_email` - Email string to match against member emails ## Returns - - List of Member structs (either single match or all members) + - List of Member structs (either single email match or all members) ## Examples @@ -280,19 +244,17 @@ defmodule Mv.Membership.Member do iex> filter_by_email_match(members, "nomatch@example.com") [%Member{email: "test@example.com"}, %Member{email: "other@example.com"}] - """ @spec filter_by_email_match([t()], String.t()) :: [t()] def filter_by_email_match(members, user_email) when is_list(members) and is_binary(user_email) do - # Check if any member matches the email email_match = Enum.find(members, &(&1.email == user_email)) if email_match do - # Return only the email-matched member + # Email match found - return only this member (highest priority) [email_match] else - # No email match, return all members + # No email match - return all members unchanged members end end @@ -513,4 +475,60 @@ defmodule Mv.Membership.Member do Ash.Query.for_read(query, :search, args) end end + + # Private helper to apply filters for :available_for_linking action + # user_email: may be nil/empty when creating new user, or populated when editing + # search_query: optional search term for fuzzy matching + # + # Logic: (email == user_email) OR (fuzzy_search on search_query) + # - Empty user_email ("") → email == "" is always false → only fuzzy search matches + # - This allows a single filter expression instead of duplicating fuzzy search logic + # + # Cyclomatic complexity is unavoidable here: PostgreSQL fuzzy search requires + # multiple OR conditions for good search quality (FTS + trigram similarity + substring) + # credo:disable-for-next-line Credo.Check.Refactor.CyclomaticComplexity + defp apply_linking_filters(query, user_email, search_query) do + has_search = search_query && String.trim(search_query) != "" + # Use empty string instead of nil to simplify filter logic + trimmed_email = if user_email, do: String.trim(user_email), else: "" + + if has_search do + # Search query provided: return email-match OR fuzzy-search candidates + trimmed_search = String.trim(search_query) + + query + |> Ash.Query.filter( + expr( + # Email match candidate (for filter_by_email_match priority) + # If email is "", this is always false and fuzzy search takes over + # Fuzzy search candidates + email == ^trimmed_email or + fragment("search_vector @@ websearch_to_tsquery('simple', ?)", ^trimmed_search) or + fragment("search_vector @@ plainto_tsquery('simple', ?)", ^trimmed_search) or + fragment("? % first_name", ^trimmed_search) or + fragment("? % last_name", ^trimmed_search) or + fragment("word_similarity(?, first_name) > 0.2", ^trimmed_search) or + fragment( + "word_similarity(?, last_name) > ?", + ^trimmed_search, + ^@default_similarity_threshold + ) or + fragment( + "similarity(first_name, ?) > ?", + ^trimmed_search, + ^@default_similarity_threshold + ) or + fragment( + "similarity(last_name, ?) > ?", + ^trimmed_search, + ^@default_similarity_threshold + ) or + contains(email, ^trimmed_search) + ) + ) + else + # No search query: return all unlinked (filter_by_email_match will prioritize email if provided) + query + end + end end diff --git a/test/membership/member_available_for_linking_test.exs b/test/membership/member_available_for_linking_test.exs index af293e1..2f3e018 100644 --- a/test/membership/member_available_for_linking_test.exs +++ b/test/membership/member_available_for_linking_test.exs @@ -199,7 +199,7 @@ defmodule Mv.Membership.MemberAvailableForLinkingTest do assert Enum.empty?(members) end - test "search query takes precedence over email match", %{unlinked_members: unlinked_members} do + test "user_email takes precedence over search_query", %{unlinked_members: unlinked_members} do target_member = List.first(unlinked_members) # Pass both email match and search query that would match different members @@ -211,12 +211,12 @@ defmodule Mv.Membership.MemberAvailableForLinkingTest do }) |> Ash.read!() - # Search query takes precedence, should match "Bob" in the first name - # user_email is used for POST-filtering only, not in the query - assert length(raw_members) == 1 - # Should find the member with "Bob" first name, not target_member (Alice) - assert List.first(raw_members).first_name == "Bob" - refute List.first(raw_members).id == target_member.id + # Apply email-match filter (as LiveView does) + members = Mv.Membership.Member.filter_by_email_match(raw_members, target_member.email) + + # Email takes precedence: should match target_member by email, ignoring search_query + assert length(members) == 1 + assert List.first(members).id == target_member.id end end end From 4b4ec63613fba26c4583696be3ae96d485e99cf8 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 20 Nov 2025 21:45:05 +0100 Subject: [PATCH 082/119] feat: improve user-member linking UI and error messages Reload members on email change, extract user-friendly errors from Ash, add translations --- lib/mv_web/live/user_live/form.ex | 39 ++++++++++++++++++++++++-- priv/gettext/de/LC_MESSAGES/default.po | 5 ++++ priv/gettext/de/LC_MESSAGES/errors.po | 4 +++ priv/gettext/default.pot | 5 ++++ priv/gettext/en/LC_MESSAGES/default.po | 5 ++++ priv/gettext/en/LC_MESSAGES/errors.po | 4 +++ priv/gettext/errors.pot | 4 +++ 7 files changed, 63 insertions(+), 3 deletions(-) diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index 9cf3f59..b8a0294 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -284,7 +284,20 @@ defmodule MvWeb.UserLive.Form do end def handle_event("validate", %{"user" => user_params}, socket) do - {:noreply, assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, user_params))} + validated_form = AshPhoenix.Form.validate(socket.assigns.form, user_params) + + # Reload members if email changed (for email-match priority) + socket = + if Map.has_key?(user_params, "email") do + user_email = user_params["email"] + members = load_members_for_linking(user_email, socket.assigns.member_search_query) + + assign(socket, form: validated_form, available_members: members) + else + assign(socket, form: validated_form) + end + + {:noreply, socket} end def handle_event("save", %{"user" => user_params}, socket) do @@ -319,9 +332,15 @@ defmodule MvWeb.UserLive.Form do {:noreply, socket} {:error, error} -> - # Show error from member linking/unlinking + # Show user-friendly error from member linking/unlinking + error_message = extract_error_message(error) + {:noreply, - put_flash(socket, :error, "Failed to update member relationship: #{inspect(error)}")} + put_flash( + socket, + :error, + gettext("Failed to link member: %{error}", error: error_message) + )} end {:error, form} -> @@ -460,4 +479,18 @@ defmodule MvWeb.UserLive.Form do [] end end + + # Extract user-friendly error message from Ash.Error + @spec extract_error_message(any()) :: String.t() + defp extract_error_message(%Ash.Error.Invalid{errors: errors}) when is_list(errors) do + # Take first error and extract message + case List.first(errors) do + %{message: message} when is_binary(message) -> message + %{field: field, message: message} -> "#{field}: #{message}" + _ -> "Unknown error" + end + end + + defp extract_error_message(error) when is_binary(error), do: error + defp extract_error_message(_), do: "Unknown error" end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 18e1053..7b8c86e 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -742,3 +742,8 @@ msgstr "Mitglied entverknüpfen" #, elixir-autogen, elixir-format msgid "Unlinking scheduled" msgstr "Entverknüpfung geplant" + +#: lib/mv_web/live/user_live/form.ex:342 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po index e0db8dd..92d3048 100644 --- a/priv/gettext/de/LC_MESSAGES/errors.po +++ b/priv/gettext/de/LC_MESSAGES/errors.po @@ -155,3 +155,7 @@ msgstr "muss mindestens 8 Zeichen lang sein" msgid "is required" msgstr "ist erforderlich" + +#: lib/mv_web/live/user_live/form.ex +msgid "Failed to link member: %{error}" +msgstr "Fehler beim Verknüpfen des Mitglieds: %{error}" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index a87d935..a1ae484 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -743,3 +743,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Unlinking scheduled" msgstr "" + +#: lib/mv_web/live/user_live/form.ex:342 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index e12b489..28339fc 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -743,3 +743,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Unlinking scheduled" msgstr "" + +#: lib/mv_web/live/user_live/form.ex:342 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index 62df4a7..e1f18de 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -155,3 +155,7 @@ msgstr "" msgid "is required" msgstr "" + +#: lib/mv_web/live/user_live/form.ex +msgid "Failed to link member: %{error}" +msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 8f522c0..5d840fe 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -152,3 +152,7 @@ msgstr "" msgid "is required" msgstr "" + +#: lib/mv_web/live/user_live/form.ex +msgid "Failed to link member: %{error}" +msgstr "" From 3da0ebcb3f6a86bfe3f667bdbfa56a966b9c7f5b Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 27 Nov 2025 16:01:42 +0100 Subject: [PATCH 083/119] feat: Add keyboard navigation to member linking dropdown --- assets/js/app.js | 25 +++++++- docs/development-progress-log.md | 89 ++++++++++++++++++++++++++--- lib/mv_web/live/user_live/form.ex | 95 +++++++++++++++++++++++++++++-- notes.md | 58 +++++++++++++++++++ 4 files changed, 255 insertions(+), 12 deletions(-) create mode 100644 notes.md diff --git a/assets/js/app.js b/assets/js/app.js index 9b95296..e55a06d 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -24,9 +24,32 @@ import topbar from "../vendor/topbar" let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content") +// Hooks for LiveView components +let Hooks = {} + +// ComboBox hook: Prevents form submission when Enter is pressed in dropdown +Hooks.ComboBox = { + mounted() { + this.handleKeyDown = (e) => { + const isDropdownOpen = this.el.getAttribute("aria-expanded") === "true" + + if (e.key === "Enter" && isDropdownOpen) { + e.preventDefault() + } + } + + this.el.addEventListener("keydown", this.handleKeyDown) + }, + + destroyed() { + this.el.removeEventListener("keydown", this.handleKeyDown) + } +} + let liveSocket = new LiveSocket("/live", Socket, { longPollFallbackMs: 2500, - params: {_csrf_token: csrfToken} + params: {_csrf_token: csrfToken}, + hooks: Hooks }) // Listen for custom events from LiveView diff --git a/docs/development-progress-log.md b/docs/development-progress-log.md index 1b86106..51d0749 100644 --- a/docs/development-progress-log.md +++ b/docs/development-progress-log.md @@ -1328,9 +1328,10 @@ Implemented user-member linking functionality in User Edit/Create views with fuz **Key Features:** - Autocomplete dropdown with PostgreSQL Trigram fuzzy search +- Keyboard navigation (Arrow keys, Enter, Escape) - Link/unlink members to user accounts - Email synchronization between linked entities -- WCAG 2.1 AA compliant (ARIA labels) +- WCAG 2.1 AA compliant (ARIA labels, keyboard accessibility) - Bilingual UI (English/German) ### Technical Decisions @@ -1350,7 +1351,45 @@ window.addEventListener("phx:set-input-value", (e) => { ``` **Rationale:** LiveView DOM patching has race conditions with rapid state changes in autocomplete components. Direct DOM manipulation via `push_event` is the idiomatic LiveView solution for this edge case. -**3. Fuzzy Search Implementation** +**3. Keyboard Navigation: Hybrid Approach** +Implemented keyboard accessibility with **mostly Server-Side + minimal Client-Side**: + +```elixir +# Server-Side: Navigation and Selection (~45 lines) +def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do + # Focus management on server + new_index = min(current + 1, max_index) + {:noreply, assign(socket, focused_member_index: new_index)} +end +``` + +```javascript +// Client-Side: Only preventDefault for Enter in forms (~13 lines) +Hooks.ComboBox = { + mounted() { + this.el.addEventListener("keydown", (e) => { + const isDropdownOpen = this.el.getAttribute("aria-expanded") === "true" + if (e.key === "Enter" && isDropdownOpen) { + e.preventDefault() // Prevent form submission + } + }) + } +} +``` + +**Rationale:** +- Server-Side handles all navigation logic → simpler, testable, follows LiveView best practices +- Client-Side only prevents browser default behavior (form submit on Enter) +- Latency (~20-50ms) is imperceptible for keyboard events without DB queries +- Follows CODE_GUIDELINES "Minimal JavaScript Philosophy" + +**Alternative Considered:** Full Client-Side with JavaScript Hook (~80 lines) +- ❌ More complex code +- ❌ State synchronization between client/server +- ✅ Zero latency (but not noticeable in practice) +- **Decision:** Server-Side approach is simpler and sufficient + +**4. Fuzzy Search Implementation** Combined PostgreSQL Full-Text Search + Trigram for optimal results: ```sql -- FTS for exact word matching @@ -1393,11 +1432,13 @@ end - ✅ Direct DOM manipulation (autocomplete, input values) - ✅ Browser APIs (clipboard, geolocation) - ✅ Third-party libraries +- ✅ Preventing browser default behaviors (form submit, scroll) **When NOT to use JavaScript:** - ❌ Form submissions - ❌ Simple show/hide logic - ❌ Server-side data fetching +- ❌ Keyboard navigation logic (can be done server-side efficiently) **Pattern:** ```elixir @@ -1407,6 +1448,12 @@ socket |> push_event("event-name", %{key: value}) window.addEventListener("phx:event-name", (e) => { /* handle */ }) ``` +**Keyboard Events Pattern:** +For keyboard navigation in forms, use hybrid approach: +- Server handles navigation logic via `phx-window-keydown` +- Minimal hook only for `preventDefault()` to avoid form submit conflicts +- Result: ~13 lines JS vs ~80 lines for full client-side solution + #### 3. PostgreSQL Trigram Search Requires `pg_trgm` extension with GIN indexes: ```sql @@ -1418,7 +1465,34 @@ Supports: - Partial matching: "Mit" finds "Mitglied" - Substring: "exam" finds "example.com" -#### 4. Test-Driven Development for Bug Fixes +#### 4. Server-Side Keyboard Navigation Performance +**Challenge:** Concern that server-side keyboard events would feel laggy. + +**Reality Check:** +- LiveView roundtrip: ~20-50ms on decent connection +- Human perception threshold: ~100ms +- Result: **Feels instant** in practice + +**Why it works:** +```elixir +# Event handler only updates index (no DB queries) +def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do + new_index = min(socket.assigns.focused_member_index + 1, max_index) + {:noreply, assign(socket, focused_member_index: new_index)} +end +``` +- No database queries +- No complex computations +- Just state updates → extremely fast + +**When to use Client-Side instead:** +- Complex animations (Canvas, WebGL) +- Real-time gaming +- Continuous interactions (drag & drop, drawing) + +**Lesson:** Don't prematurely optimize for latency. Server-side is simpler and often sufficient. + +#### 5. Test-Driven Development for Bug Fixes Effective workflow: 1. Write test that reproduces bug (should fail) 2. Implement minimal fix @@ -1435,7 +1509,8 @@ Effective workflow: - `lib/mv_web/live/user_live/form.ex` - Event handlers, state management **Frontend:** -- `assets/js/app.js` - Input value hook (6 lines) +- `assets/js/app.js` - Input value hook (6 lines) + ComboBox hook (13 lines) +- `lib/mv_web/live/user_live/form.ex` - Keyboard event handlers, focus management - `priv/gettext/**/*.po` - 10 new translation keys (DE/EN) **Tests (NEW):** @@ -1472,14 +1547,14 @@ This project demonstrates a modern Phoenix application built with: **Next Steps:** - Implement roles & permissions - Add payment tracking -- Improve accessibility (WCAG 2.1 AA) +- ✅ ~~Improve accessibility (WCAG 2.1 AA)~~ - Keyboard navigation implemented - Member self-service portal - Email communication features --- -**Document Version:** 1.1 -**Last Updated:** 2025-11-13 +**Document Version:** 1.2 +**Last Updated:** 2025-11-27 **Maintainer:** Development Team **Status:** Living Document (update as project evolves) diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index b8a0294..9619a15 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -162,9 +162,11 @@ defmodule MvWeb.UserLive.Form do type="text" id="member-search-input" role="combobox" + phx-hook="ComboBox" phx-focus="show_member_dropdown" phx-change="search_members" phx-debounce="300" + phx-window-keydown="member_dropdown_keydown" value={@member_search_query} placeholder={gettext("Search for a member to link...")} class="w-full input" @@ -175,6 +177,11 @@ defmodule MvWeb.UserLive.Form do aria-autocomplete="list" aria-controls="member-dropdown" aria-expanded={to_string(@show_member_dropdown)} + aria-activedescendant={ + if @focused_member_index, + do: "member-option-#{@focused_member_index}", + else: nil + } autocomplete="off" /> @@ -186,15 +193,22 @@ defmodule MvWeb.UserLive.Form do class={"absolute z-10 w-full mt-1 bg-base-100 border border-base-300 rounded-lg shadow-lg max-h-60 overflow-auto #{if !@show_member_dropdown, do: "hidden"}"} phx-click-away="hide_member_dropdown" > - <%= for member <- @available_members do %> + <%= for {member, index} <- Enum.with_index(@available_members) do %>

{member.first_name} {member.last_name}

{member.email}

@@ -263,6 +277,7 @@ defmodule MvWeb.UserLive.Form do |> assign(:selected_member_id, nil) |> assign(:selected_member_name, nil) |> assign(:unlink_member, false) + |> assign(:focused_member_index, nil) |> load_initial_members() |> assign_form()} end @@ -353,7 +368,55 @@ defmodule MvWeb.UserLive.Form do end def handle_event("hide_member_dropdown", _params, socket) do - {:noreply, assign(socket, show_member_dropdown: false)} + {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)} + end + + def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do + return_if_dropdown_closed(socket, fn -> + max_index = length(socket.assigns.available_members) - 1 + current = socket.assigns.focused_member_index + + new_index = + case current do + nil -> 0 + index when index < max_index -> index + 1 + _ -> current + end + + {:noreply, assign(socket, focused_member_index: new_index)} + end) + end + + def handle_event("member_dropdown_keydown", %{"key" => "ArrowUp"}, socket) do + return_if_dropdown_closed(socket, fn -> + current = socket.assigns.focused_member_index + + new_index = + case current do + nil -> 0 + 0 -> 0 + index -> index - 1 + end + + {:noreply, assign(socket, focused_member_index: new_index)} + end) + end + + def handle_event("member_dropdown_keydown", %{"key" => "Enter"}, socket) do + return_if_dropdown_closed(socket, fn -> + select_focused_member(socket) + end) + end + + def handle_event("member_dropdown_keydown", %{"key" => "Escape"}, socket) do + return_if_dropdown_closed(socket, fn -> + {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)} + end) + end + + def handle_event("member_dropdown_keydown", _params, socket) do + # Ignore other keys + {:noreply, socket} end def handle_event("search_members", %{"member_search" => query}, socket) do @@ -362,6 +425,7 @@ defmodule MvWeb.UserLive.Form do |> assign(:member_search_query, query) |> load_available_members(query) |> assign(:show_member_dropdown, true) + |> assign(:focused_member_index, nil) {:noreply, socket} end @@ -406,6 +470,29 @@ defmodule MvWeb.UserLive.Form do @spec notify_parent(any()) :: any() defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + # Helper to ignore keyboard events when dropdown is closed + @spec return_if_dropdown_closed(Phoenix.LiveView.Socket.t(), function()) :: + {:noreply, Phoenix.LiveView.Socket.t()} + defp return_if_dropdown_closed(socket, func) do + if socket.assigns.show_member_dropdown do + func.() + else + {:noreply, socket} + end + end + + # Select the currently focused member from the dropdown + @spec select_focused_member(Phoenix.LiveView.Socket.t()) :: + {:noreply, Phoenix.LiveView.Socket.t()} + defp select_focused_member(socket) do + with index when not is_nil(index) <- socket.assigns.focused_member_index, + member when not is_nil(member) <- Enum.at(socket.assigns.available_members, index) do + handle_event("select_member", %{"id" => member.id}, socket) + else + _ -> {:noreply, socket} + end + end + @spec assign_form(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t() defp assign_form(%{assigns: %{user: user, show_password_fields: show_password_fields}} = socket) do form = diff --git a/notes.md b/notes.md new file mode 100644 index 0000000..a5aa44f --- /dev/null +++ b/notes.md @@ -0,0 +1,58 @@ +# User-Member Association - Test Status + +## Test Files Created/Modified + +### 1. test/membership/member_available_for_linking_test.exs (NEU) +**Status**: Alle Tests sollten FEHLSCHLAGEN ❌ +**Grund**: Die `:available_for_linking` Action existiert noch nicht + +Tests: +- ✗ returns only unlinked members and limits to 10 +- ✗ limits results to 10 members even when more exist +- ✗ email match: returns only member with matching email when exists +- ✗ email match: returns all unlinked members when no email match +- ✗ search query: filters by first_name, last_name, and email +- ✗ email match takes precedence over search query + +### 2. test/accounts/user_member_linking_test.exs (NEU) +**Status**: Tests sollten teilweise ERFOLGREICH sein ✅ / teilweise FEHLSCHLAGEN ❌ + +Tests: +- ✓ link user to member with different email syncs member email (sollte BESTEHEN - Email-Sync ist implementiert) +- ✓ unlink member from user sets member to nil (sollte BESTEHEN - Unlink ist implementiert) +- ✓ cannot link member already linked to another user (sollte BESTEHEN - Validierung existiert) +- ✓ cannot change member link directly, must unlink first (sollte BESTEHEN - Validierung existiert) + +### 3. test/mv_web/user_live/form_test.exs (ERWEITERT) +**Status**: Alle neuen Tests sollten FEHLSCHLAGEN ❌ +**Grund**: Member-Linking UI ist noch nicht implementiert + +Neue Tests: +- ✗ shows linked member with unlink button when user has member +- ✗ shows member search field when user has no member +- ✗ selecting member and saving links member to user +- ✗ unlinking member and saving removes member from user + +### 4. test/mv_web/user_live/index_test.exs (ERWEITERT) +**Status**: Neuer Test sollte FEHLSCHLAGEN ❌ +**Grund**: Member-Spalte wird noch nicht in der Index-View angezeigt + +Neuer Test: +- ✗ displays linked member name in user list + +## Zusammenfassung + +**Tests gesamt**: 13 +**Sollten BESTEHEN**: 4 (Backend-Validierungen bereits vorhanden) +**Sollten FEHLSCHLAGEN**: 9 (Features noch nicht implementiert) + +## Nächste Schritte + +1. Implementiere `:available_for_linking` Action in `lib/membership/member.ex` +2. Erstelle `MemberAutocompleteComponent` in `lib/mv_web/live/components/member_autocomplete_component.ex` +3. Integriere Member-Linking UI in `lib/mv_web/live/user_live/form.ex` +4. Füge Member-Spalte zu `lib/mv_web/live/user_live/index.ex` hinzu +5. Füge Gettext-Übersetzungen hinzu + +Nach jeder Implementierung: Tests erneut ausführen und prüfen, ob sie grün werden. + From b509dc4ea37134c6664a4ecc1d713a0a85e87d6d Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 19 Nov 2025 17:27:26 +0100 Subject: [PATCH 084/119] chore: add migration for show in overview flag --- ..._add_show_in_overview_to_custom_fields.exs | 21 ++++ .../repo/custom_fields/20251119160509.json | 118 ++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 priv/repo/migrations/20251119160509_add_show_in_overview_to_custom_fields.exs create mode 100644 priv/resource_snapshots/repo/custom_fields/20251119160509.json diff --git a/priv/repo/migrations/20251119160509_add_show_in_overview_to_custom_fields.exs b/priv/repo/migrations/20251119160509_add_show_in_overview_to_custom_fields.exs new file mode 100644 index 0000000..32b4801 --- /dev/null +++ b/priv/repo/migrations/20251119160509_add_show_in_overview_to_custom_fields.exs @@ -0,0 +1,21 @@ +defmodule Mv.Repo.Migrations.AddShowInOverviewToCustomFields 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(:custom_fields) do + add :show_in_overview, :boolean, null: false, default: true + end + end + + def down do + alter table(:custom_fields) do + remove :show_in_overview + end + end +end diff --git a/priv/resource_snapshots/repo/custom_fields/20251119160509.json b/priv/resource_snapshots/repo/custom_fields/20251119160509.json new file mode 100644 index 0000000..718fe51 --- /dev/null +++ b/priv/resource_snapshots/repo/custom_fields/20251119160509.json @@ -0,0 +1,118 @@ +{ + "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": "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": "false", + "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": "9FBFC42DA896058F88DEDAE774614919222BF2EF2F8CB27386D02C2CE67F03DE", + "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 + } + ], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "custom_fields" +} \ No newline at end of file From 4313703538315041f7e8a4612eada1d1b0c581e1 Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 26 Nov 2025 18:14:29 +0100 Subject: [PATCH 085/119] test: added tests --- .../custom_field_show_in_overview_test.exs | 77 +++ ...index_custom_fields_accessibility_test.exs | 109 +++++ .../index_custom_fields_display_test.exs | 262 ++++++++++ .../index_custom_fields_edge_cases_test.exs | 174 +++++++ .../index_custom_fields_sorting_test.exs | 446 ++++++++++++++++++ 5 files changed, 1068 insertions(+) create mode 100644 test/membership/custom_field_show_in_overview_test.exs create mode 100644 test/mv_web/member_live/index_custom_fields_accessibility_test.exs create mode 100644 test/mv_web/member_live/index_custom_fields_display_test.exs create mode 100644 test/mv_web/member_live/index_custom_fields_edge_cases_test.exs create mode 100644 test/mv_web/member_live/index_custom_fields_sorting_test.exs diff --git a/test/membership/custom_field_show_in_overview_test.exs b/test/membership/custom_field_show_in_overview_test.exs new file mode 100644 index 0000000..adac600 --- /dev/null +++ b/test/membership/custom_field_show_in_overview_test.exs @@ -0,0 +1,77 @@ +defmodule Mv.Membership.CustomFieldShowInOverviewTest do + @moduledoc """ + Tests for CustomField show_in_overview attribute. + + Tests cover: + - Creating custom fields with show_in_overview: true + - Creating custom fields with show_in_overview: false (default) + - Updating show_in_overview to true + - Updating show_in_overview to false + """ + use Mv.DataCase, async: true + + alias Mv.Membership.CustomField + + describe "show_in_overview attribute" do + test "creates custom field with show_in_overview: true" do + assert {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field_show", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + assert custom_field.show_in_overview == true + end + + test "creates custom field with show_in_overview: true (default)" do + assert {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field_hide", + value_type: :string + }) + |> Ash.create() + + assert custom_field.show_in_overview == true + end + + test "updates show_in_overview to true" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field_update", + value_type: :string, + show_in_overview: false + }) + |> Ash.create() + + assert {:ok, updated_field} = + custom_field + |> Ash.Changeset.for_update(:update, %{show_in_overview: true}) + |> Ash.update() + + assert updated_field.show_in_overview == true + end + + test "updates show_in_overview to false" do + {:ok, custom_field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field_update2", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + assert {:ok, updated_field} = + custom_field + |> Ash.Changeset.for_update(:update, %{show_in_overview: false}) + |> Ash.update() + + assert updated_field.show_in_overview == false + end + end +end diff --git a/test/mv_web/member_live/index_custom_fields_accessibility_test.exs b/test/mv_web/member_live/index_custom_fields_accessibility_test.exs new file mode 100644 index 0000000..e4d174f --- /dev/null +++ b/test/mv_web/member_live/index_custom_fields_accessibility_test.exs @@ -0,0 +1,109 @@ +defmodule MvWeb.MemberLive.IndexCustomFieldsAccessibilityTest do + @moduledoc """ + Accessibility tests for custom field columns in the member overview. + + Tests cover: + - SortHeaderComponent for custom fields has correct ARIA labels + - Tab navigation works for custom field columns + - Screen reader announcements for sorting + """ + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + setup do + # Create test member + {:ok, member} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + # Create custom field with show_in_overview: true + {:ok, field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "membership_number", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create custom field value + {:ok, _cfv} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => "A001"} + }) + |> Ash.create() + + %{member: member, field: field} + end + + test "sort header component for custom fields has correct ARIA labels", %{ + conn: conn, + field: field + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the sort button has aria-label + assert html =~ ~r/aria-label=["']Click to sort["']/i or + html =~ ~r/aria-label=["'].*sort.*["']/i + + # Check that data-testid is present for testing + assert html =~ ~r/data-testid=["']custom_field_#{field.id}["']/ + end + + test "sort header component shows correct ARIA label when sorted ascending", %{ + conn: conn, + field: field + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + + html = render(view) + + # Check that aria-label indicates ascending sort + assert html =~ ~r/aria-label=["'].*ascending.*["']/i + end + + test "sort header component shows correct ARIA label when sorted descending", %{ + conn: conn, + field: field + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + html = render(view) + + # Check that aria-label indicates descending sort + assert html =~ ~r/aria-label=["'].*descending.*["']/i + end + + test "custom field column header is keyboard accessible", %{conn: conn, field: field} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the sort button is a button element (keyboard accessible) + assert html =~ ~r/]*data-testid=["']custom_field_#{field.id}["']/ + + # Button should not have tabindex="-1" (which would remove from tab order) + refute html =~ ~r/tabindex=["']-1["']/ + end + + test "custom field column header has proper semantic structure", %{conn: conn, field: field} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that custom field name is displayed in the header + assert html =~ field.name + end +end diff --git a/test/mv_web/member_live/index_custom_fields_display_test.exs b/test/mv_web/member_live/index_custom_fields_display_test.exs new file mode 100644 index 0000000..7788c60 --- /dev/null +++ b/test/mv_web/member_live/index_custom_fields_display_test.exs @@ -0,0 +1,262 @@ +defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do + @moduledoc """ + Tests for displaying custom fields in the member overview. + + Tests cover: + - Custom fields with show_in_overview: true are displayed + - Custom fields with show_in_overview: false are not displayed + - Multiple custom fields with show_in_overview: true are all displayed + - Custom field values are correctly formatted for different types + - Members without custom field values show empty cell or "-" + """ + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + setup do + # Create test members + {:ok, member1} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + {:ok, member2} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Bob", + last_name: "Brown", + email: "bob@example.com" + }) + |> Ash.create() + + # Create custom fields + {:ok, field_show_string} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "phone_mobile", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field_hide} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "internal_note", + value_type: :string, + show_in_overview: false + }) + |> Ash.create() + + {:ok, field_show_integer} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "membership_number", + value_type: :integer, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field_show_boolean} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "newsletter", + value_type: :boolean, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field_show_date} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "birthday", + value_type: :date, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field_show_email} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "secondary_email", + value_type: :email, + show_in_overview: true + }) + |> Ash.create() + + # Create custom field values for member1 + {:ok, _cfv1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_show_string.id, + value: %{"_union_type" => "string", "_union_value" => "+49123456789"} + }) + |> Ash.create() + + {:ok, _cfv2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_show_integer.id, + value: %{"_union_type" => "integer", "_union_value" => 12345} + }) + |> Ash.create() + + {:ok, _cfv3} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_show_boolean.id, + value: %{"_union_type" => "boolean", "_union_value" => true} + }) + |> Ash.create() + + {:ok, _cfv4} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_show_date.id, + value: %{"_union_type" => "date", "_union_value" => ~D[1990-05-15]} + }) + |> Ash.create() + + {:ok, _cfv5} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_show_email.id, + value: %{"_union_type" => "email", "_union_value" => "alice.private@example.com"} + }) + |> Ash.create() + + # Create hidden custom field value (should not be displayed) + {:ok, _cfv_hidden} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_hide.id, + value: %{"_union_type" => "string", "_union_value" => "Internal note"} + }) + |> Ash.create() + + %{ + member1: member1, + member2: member2, + field_show_string: field_show_string, + field_hide: field_hide, + field_show_integer: field_show_integer, + field_show_boolean: field_show_boolean, + field_show_date: field_show_date, + field_show_email: field_show_email + } + end + + test "displays custom field with show_in_overview: true", %{ + conn: conn, + member1: _member1, + field_show_string: field + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the custom field column header is displayed + assert html =~ field.name + + # Check that the value is displayed + assert html =~ "+49123456789" + end + + test "does not display custom field with show_in_overview: false", %{ + conn: conn, + member1: _member1, + field_hide: field + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the hidden custom field column header is NOT displayed + refute html =~ field.name + + # Check that the value is NOT displayed + refute html =~ "Internal note" + end + + test "displays multiple custom fields with show_in_overview: true", %{ + conn: conn, + field_show_string: field_string, + field_show_integer: field_integer, + field_show_boolean: field_boolean + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that all visible custom field column headers are displayed + assert html =~ field_string.name + assert html =~ field_integer.name + assert html =~ field_boolean.name + end + + test "formats string custom field values correctly", %{conn: conn, member1: _member1} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ "+49123456789" + end + + test "formats integer custom field values correctly", %{conn: conn, member1: _member1} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ "12345" + end + + test "formats boolean custom field values correctly", %{conn: conn, member1: _member1} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Boolean should be displayed as "Yes" or "No" or similar + # Check for true representation + assert html =~ "true" or html =~ "Yes" or html =~ "Ja" + end + + test "formats date custom field values correctly", %{conn: conn, member1: _member1} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Date should be displayed in readable format + assert html =~ "1990" or html =~ "1990-05-15" or html =~ "15.05.1990" + end + + test "formats email custom field values correctly", %{conn: conn, member1: _member1} do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + assert html =~ "alice.private@example.com" + end + + test "shows empty cell or placeholder for members without custom field values", %{ + conn: conn, + member2: _member2, + field_show_string: field + } do + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # The custom field column should exist + assert html =~ field.name + + # Member2 should have an empty cell for this field + # We check that member2's row exists but doesn't have the value + assert html =~ "Bob Brown" + # The value should not appear for member2 (only for member1) + # We check that the value appears somewhere (for member1) but member2 row should have "-" + assert html =~ "+49123456789" + end +end diff --git a/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs b/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs new file mode 100644 index 0000000..9d44c40 --- /dev/null +++ b/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs @@ -0,0 +1,174 @@ +defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do + @moduledoc """ + Edge case tests for custom fields in the member overview. + + Tests cover: + - Custom field without values (all members have no value) + - Very long custom field values are correctly displayed + """ + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.{CustomField, Member} + + test "displays custom field column even when no members have values", %{conn: conn} do + # Create test members without custom field values + {:ok, _member1} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + {:ok, _member2} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Bob", + last_name: "Brown", + email: "bob@example.com" + }) + |> Ash.create() + + # Create custom field with show_in_overview: true but no values + {:ok, field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "membership_number", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the custom field column header is still displayed + assert html =~ field.name + end + + test "displays very long custom field values correctly", %{conn: conn} do + # Create test member + {:ok, member} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + # Create custom field + {:ok, field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "long_note", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create very long value (but within limits) + long_value = String.duplicate("A", 500) + + {:ok, _cfv} = + Mv.Membership.CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => long_value} + }) + |> Ash.create() + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that the value is displayed (may be truncated in UI, but should be present) + # We check for at least part of the value + assert html =~ "A" or html =~ long_value + end + + test "handles multiple custom fields with show_in_overview correctly", %{conn: conn} do + # Create test member + {:ok, member} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + # Create multiple custom fields with show_in_overview: true + {:ok, field1} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "field1", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field2} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "field2", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field3} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "field3", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create values for all fields + {:ok, _cfv1} = + Mv.Membership.CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: field1.id, + value: %{"_union_type" => "string", "_union_value" => "Value1"} + }) + |> Ash.create() + + {:ok, _cfv2} = + Mv.Membership.CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: field2.id, + value: %{"_union_type" => "string", "_union_value" => "Value2"} + }) + |> Ash.create() + + {:ok, _cfv3} = + Mv.Membership.CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member.id, + custom_field_id: field3.id, + value: %{"_union_type" => "string", "_union_value" => "Value3"} + }) + |> Ash.create() + + conn = conn_with_oidc_user(conn) + {:ok, _view, html} = live(conn, "/members") + + # Check that all custom field columns are displayed + assert html =~ field1.name + assert html =~ field2.name + assert html =~ field3.name + + # Check that all values are displayed + assert html =~ "Value1" + assert html =~ "Value2" + assert html =~ "Value3" + end +end + diff --git a/test/mv_web/member_live/index_custom_fields_sorting_test.exs b/test/mv_web/member_live/index_custom_fields_sorting_test.exs new file mode 100644 index 0000000..e1c99b2 --- /dev/null +++ b/test/mv_web/member_live/index_custom_fields_sorting_test.exs @@ -0,0 +1,446 @@ +defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do + @moduledoc """ + Tests for sorting by custom fields in the member overview. + + Tests cover: + - Sorting by custom field (ascending) + - Sorting by custom field (descending) + - Sorting by custom field works with search + - Sorting by custom field works with URL parameters + - Sorting by custom field works with other columns + """ + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + require Ash.Query + + alias Mv.Membership.{CustomField, CustomFieldValue, Member} + + setup do + # Create test members + {:ok, member1} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Alice", + last_name: "Anderson", + email: "alice@example.com" + }) + |> Ash.create() + + {:ok, member2} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Bob", + last_name: "Brown", + email: "bob@example.com" + }) + |> Ash.create() + + {:ok, member3} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "Charlie", + last_name: "Clark", + email: "charlie@example.com" + }) + |> Ash.create() + + # Create custom field with show_in_overview: true + {:ok, field_string} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "membership_number", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + {:ok, field_integer} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "priority", + value_type: :integer, + show_in_overview: true + }) + |> Ash.create() + + # Create custom field values + {:ok, _cfv1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_string.id, + value: %{"_union_type" => "string", "_union_value" => "A001"} + }) + |> Ash.create() + + {:ok, _cfv2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member2.id, + custom_field_id: field_string.id, + value: %{"_union_type" => "string", "_union_value" => "C003"} + }) + |> Ash.create() + + {:ok, _cfv3} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member3.id, + custom_field_id: field_string.id, + value: %{"_union_type" => "string", "_union_value" => "B002"} + }) + |> Ash.create() + + {:ok, _cfv4} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member1.id, + custom_field_id: field_integer.id, + value: %{"_union_type" => "integer", "_union_value" => 10} + }) + |> Ash.create() + + {:ok, _cfv5} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member2.id, + custom_field_id: field_integer.id, + value: %{"_union_type" => "integer", "_union_value" => 30} + }) + |> Ash.create() + + {:ok, _cfv6} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member3.id, + custom_field_id: field_integer.id, + value: %{"_union_type" => "integer", "_union_value" => 20} + }) + |> Ash.create() + + %{ + member1: member1, + member2: member2, + member3: member3, + field_string: field_string, + field_integer: field_integer + } + end + + test "sorts by custom field ascending", %{conn: conn, field_string: field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members") + + # Click on custom field column header to sort + view + |> element("[data-testid='custom_field_#{field.id}']") + |> render_click() + + # Check URL was updated + assert_patch(view, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + + # Verify sort state + assert has_element?(view, "[data-testid='custom_field_#{field.id}'][aria-label='ascending']") + end + + test "sorts by custom field descending", %{conn: conn, field_string: field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?sort_field=custom_field_#{field.id}&sort_order=asc") + + # Click again to toggle to descending + view + |> element("[data-testid='custom_field_#{field.id}']") + |> render_click() + + # Check URL was updated + assert_patch(view, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + # Verify sort state + assert has_element?(view, "[data-testid='custom_field_#{field.id}'][aria-label='descending']") + end + + test "sorting by custom field works with search", %{conn: conn, field_string: field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=Alice") + + # Click on custom field column header to sort + view + |> element("[data-testid='custom_field_#{field.id}']") + |> render_click() + + # Check URL maintains search query + assert_patch(view, "/members?query=Alice&sort_field=custom_field_#{field.id}&sort_order=asc") + end + + test "sorting by custom field works with URL parameters", %{conn: conn, field_string: field} do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + # Check that the sort state is correctly applied + assert has_element?(view, "[data-testid='custom_field_#{field.id}'][aria-label='descending']") + end + + test "clicking different custom field column resets order to ascending", %{ + conn: conn, + field_string: field_string, + field_integer: field_integer + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field_string.id}&sort_order=desc") + + # Click on a different custom field column + view + |> element("[data-testid='custom_field_#{field_integer.id}']") + |> render_click() + + assert_patch(view, "/members?query=&sort_field=custom_field_#{field_integer.id}&sort_order=asc") + end + + test "clicking regular column after custom field column works", %{ + conn: conn, + field_string: field + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + # Click on email column + view + |> element("[data-testid='email']") + |> render_click() + + assert_patch(view, "/members?query=&sort_field=email&sort_order=asc") + end + + test "clicking custom field column after regular column works", %{ + conn: conn, + field_string: field + } do + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=email&sort_order=desc") + + # Click on custom field column + view + |> element("[data-testid='custom_field_#{field.id}']") + |> render_click() + + assert_patch(view, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + end + + test "NULL values and empty strings are always sorted last (ASC)", %{conn: conn} do + # Create additional members with NULL and empty string values + {:ok, member_with_value} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithValue", + last_name: "Test", + email: "withvalue@example.com" + }) + |> Ash.create() + + {:ok, member_with_empty} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithEmpty", + last_name: "Test", + email: "withempty@example.com" + }) + |> Ash.create() + + {:ok, member_with_null} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithNull", + last_name: "Test", + email: "withnull@example.com" + }) + |> Ash.create() + + {:ok, member_with_another_value} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "AnotherValue", + last_name: "Test", + email: "another@example.com" + }) + |> Ash.create() + + # Create custom field + {:ok, field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create values: one with actual value, one with empty string, one with NULL (no value), another with value + {:ok, _cfv1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_value.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => "Zebra"} + }) + |> Ash.create() + + {:ok, _cfv2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_empty.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => ""} + }) + |> Ash.create() + + # member_with_null has no custom field value (NULL) + + {:ok, _cfv3} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_another_value.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => "Apple"} + }) + |> Ash.create() + + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + + html = render(view) + + # Find positions of member first names in the HTML to verify sort order + apple_pos = :binary.match(html, member_with_another_value.first_name) + zebra_pos = :binary.match(html, member_with_value.first_name) + empty_pos = :binary.match(html, member_with_empty.first_name) + null_pos = :binary.match(html, member_with_null.first_name) + + assert apple_pos != :nomatch, "AnotherValue (Apple) should be in HTML" + assert zebra_pos != :nomatch, "WithValue (Zebra) should be in HTML" + assert empty_pos != :nomatch, "WithEmpty should be in HTML" + assert null_pos != :nomatch, "WithNull should be in HTML" + + {apple_idx, _} = apple_pos + {zebra_idx, _} = zebra_pos + {empty_idx, _} = empty_pos + {null_idx, _} = null_pos + + # In ASC order: Apple should come before Zebra + assert apple_idx < zebra_idx, "Apple should come before Zebra in ASC order" + + # NULL and empty should come after all values + assert apple_idx < empty_idx, "Apple should come before empty value" + assert apple_idx < null_idx, "Apple should come before NULL value" + assert zebra_idx < empty_idx, "Zebra should come before empty value" + assert zebra_idx < null_idx, "Zebra should come before NULL value" + end + + test "NULL values and empty strings are always sorted last (DESC)", %{conn: conn} do + # Create additional members with NULL and empty string values + {:ok, member_with_value} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithValue", + last_name: "Test", + email: "withvalue@example.com" + }) + |> Ash.create() + + {:ok, member_with_empty} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithEmpty", + last_name: "Test", + email: "withempty@example.com" + }) + |> Ash.create() + + {:ok, member_with_null} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "WithNull", + last_name: "Test", + email: "withnull@example.com" + }) + |> Ash.create() + + {:ok, member_with_another_value} = + Member + |> Ash.Changeset.for_create(:create_member, %{ + first_name: "AnotherValue", + last_name: "Test", + email: "another@example.com" + }) + |> Ash.create() + + # Create custom field + {:ok, field} = + CustomField + |> Ash.Changeset.for_create(:create, %{ + name: "test_field", + value_type: :string, + show_in_overview: true + }) + |> Ash.create() + + # Create values: one with actual value, one with empty string, one with NULL (no value), another with value + {:ok, _cfv1} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_value.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => "Apple"} + }) + |> Ash.create() + + {:ok, _cfv2} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_empty.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => ""} + }) + |> Ash.create() + + # member_with_null has no custom field value (NULL) + + {:ok, _cfv3} = + CustomFieldValue + |> Ash.Changeset.for_create(:create, %{ + member_id: member_with_another_value.id, + custom_field_id: field.id, + value: %{"_union_type" => "string", "_union_value" => "Zebra"} + }) + |> Ash.create() + + conn = conn_with_oidc_user(conn) + {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + html = render(view) + + # Find positions of member first names in the HTML to verify sort order + apple_pos = :binary.match(html, member_with_value.first_name) + zebra_pos = :binary.match(html, member_with_another_value.first_name) + empty_pos = :binary.match(html, member_with_empty.first_name) + null_pos = :binary.match(html, member_with_null.first_name) + + assert apple_pos != :nomatch, "WithValue (Apple) should be in HTML" + assert zebra_pos != :nomatch, "AnotherValue (Zebra) should be in HTML" + assert empty_pos != :nomatch, "WithEmpty should be in HTML" + assert null_pos != :nomatch, "WithNull should be in HTML" + + {apple_idx, _} = apple_pos + {zebra_idx, _} = zebra_pos + {empty_idx, _} = empty_pos + {null_idx, _} = null_pos + + # In DESC order: Zebra should come before Apple + assert zebra_idx < apple_idx, "Zebra should come before Apple in DESC order" + + # NULL and empty should come after all values + assert zebra_idx < empty_idx, "Zebra should come before empty value" + assert zebra_idx < null_idx, "Zebra should come before NULL value" + assert apple_idx < empty_idx, "Apple should come before empty value" + assert apple_idx < null_idx, "Apple should come before NULL value" + end +end From 11179e51f0d54242f6d4a2e6b555477d082f30cd Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 26 Nov 2025 18:15:14 +0100 Subject: [PATCH 086/119] chore: show in overview attribute to custom field --- lib/membership/custom_field.ex | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/membership/custom_field.ex b/lib/membership/custom_field.ex index e1cf397..5b7514c 100644 --- a/lib/membership/custom_field.ex +++ b/lib/membership/custom_field.ex @@ -14,6 +14,7 @@ defmodule Mv.Membership.CustomField do - `description` - Optional human-readable description - `immutable` - If true, custom field values cannot be changed after creation - `required` - If true, all members must have this custom field (future feature) + - `show_in_overview` - If true, this custom field will be displayed in the member overview table and can be sorted ## Supported Value Types - `:string` - Text data (max 10,000 characters) @@ -59,10 +60,10 @@ defmodule Mv.Membership.CustomField do actions do defaults [:read, :update] - default_accept [:name, :value_type, :description, :immutable, :required] + default_accept [:name, :value_type, :description, :immutable, :required, :show_in_overview] create :create do - accept [:name, :value_type, :description, :immutable, :required] + accept [:name, :value_type, :description, :immutable, :required, :show_in_overview] change Mv.Membership.CustomField.Changes.GenerateSlug validate string_length(:slug, min: 1) end @@ -119,6 +120,12 @@ defmodule Mv.Membership.CustomField do attribute :required, :boolean, default: false, allow_nil?: false + + attribute :show_in_overview, :boolean, + default: true, + allow_nil?: false, + public?: true, + description: "If true, this custom field will be displayed in the member overview table" end relationships do From 100ed96493ddfd669cfc0aad2c22e6d940c0653e Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 26 Nov 2025 18:18:27 +0100 Subject: [PATCH 087/119] feat: adds dynamic cols to table core component --- lib/mv_web/components/core_components.ex | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index 656d3c0..24e5ffe 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -318,6 +318,13 @@ defmodule MvWeb.CoreComponents do default: &Function.identity/1, doc: "the function for mapping each row before calling the :col and :action slots" + attr :dynamic_cols, :list, + default: [], + doc: "list of dynamic column definitions with :custom_field and :render functions" + + attr :sort_field, :any, default: nil, doc: "current sort field" + attr :sort_order, :atom, default: nil, doc: "current sort order" + slot :col, required: true do attr :label, :string end @@ -335,6 +342,16 @@ defmodule MvWeb.CoreComponents do {col[:label]} + + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:"sort_custom_field_#{dyn_col[:custom_field].id}"} + field={"custom_field_#{dyn_col[:custom_field].id}"} + label={dyn_col[:custom_field].name} + sort_field={@sort_field} + sort_order={@sort_order} + /> + {gettext("Actions")} @@ -349,6 +366,22 @@ defmodule MvWeb.CoreComponents do > {render_slot(col, @row_item.(row))} + + {if dyn_col[:render] do + rendered = dyn_col[:render].(@row_item.(row)) + if rendered == "" do + "" + else + rendered + end + else + "" + end} +
<%= for action <- @action do %> From e7c4a4f62fc9667401719954b7d33c32400c78dc Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 26 Nov 2025 18:18:58 +0100 Subject: [PATCH 088/119] feat: add dynamic cols to member overview and checkbox to form --- docs/feature-roadmap.md | 7 +- lib/mv_web/live/custom_field_live/form.ex | 2 + lib/mv_web/live/member_live/index.ex | 407 ++++++++++++++++-- lib/mv_web/live/member_live/index.html.heex | 4 +- .../live/member_live/index/formatter.ex | 78 ++++ 5 files changed, 460 insertions(+), 38 deletions(-) create mode 100644 lib/mv_web/live/member_live/index/formatter.ex diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md index 9a6517d..2313fd7 100644 --- a/docs/feature-roadmap.md +++ b/docs/feature-roadmap.md @@ -94,15 +94,18 @@ - ✅ CustomFieldValue type management - ✅ Dynamic custom field value assignment to members - ✅ Union type storage (JSONB) +- ✅ Default field visibility configuration + +**Closed Issues:** +- [#194](https://git.local-it.org/local-it/mitgliederverwaltung/issues/194) - Custom Fields: Harden implementation (S) +- [#197](https://git.local-it.org/local-it/mitgliederverwaltung/issues/197) - Custom Fields: Add option to show custom fields in member overview (M) **Open Issues:** -- [#194](https://git.local-it.org/local-it/mitgliederverwaltung/issues/194) - Custom Fields: Harden implementation (S) [0/3 tasks] - [#157](https://git.local-it.org/local-it/mitgliederverwaltung/issues/157) - Concept how custom fields are handled (M, High priority) [0/4 tasks] - [#161](https://git.local-it.org/local-it/mitgliederverwaltung/issues/161) - Don't show birthday field for default configurations (S, Low priority) - [#153](https://git.local-it.org/local-it/mitgliederverwaltung/issues/153) - Sorting functionalities for custom fields (M, Low priority) **Missing Features:** -- ❌ Default field visibility configuration - ❌ Field groups/categories - ❌ Conditional fields (show field X if field Y = value) - ❌ Field validation rules (min/max, regex patterns) diff --git a/lib/mv_web/live/custom_field_live/form.ex b/lib/mv_web/live/custom_field_live/form.ex index ab8f104..99317a9 100644 --- a/lib/mv_web/live/custom_field_live/form.ex +++ b/lib/mv_web/live/custom_field_live/form.ex @@ -18,6 +18,7 @@ defmodule MvWeb.CustomFieldLive.Form do - description - Human-readable explanation - immutable - If true, values cannot be changed after creation (default: false) - required - If true, all members must have this custom field (default: false) + - show_in_overview - If true, this custom field will be displayed in the member overview table (default: true) ## Value Type Selection - `:string` - Text data (unlimited length) @@ -60,6 +61,7 @@ defmodule MvWeb.CustomFieldLive.Form do <.input field={@form[:description]} type="text" label={gettext("Description")} /> <.input field={@form[:immutable]} type="checkbox" label={gettext("Immutable")} /> <.input field={@form[:required]} type="checkbox" label={gettext("Required")} /> + <.input field={@form[:show_in_overview]} type="checkbox" label={gettext("Show in overview")} /> <.button phx-disable-with={gettext("Saving...")} variant="primary"> {gettext("Save Custom field")} diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index c933133..4a134f2 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -26,6 +26,11 @@ defmodule MvWeb.MemberLive.Index do """ use MvWeb, :live_view + alias MvWeb.MemberLive.Index.Formatter + + # Prefix used in sort field names for custom fields (e.g., "custom_field_") + @custom_field_prefix "custom_field_" + @doc """ Initializes the LiveView state. @@ -34,6 +39,19 @@ defmodule MvWeb.MemberLive.Index do """ @impl true def mount(_params, _session, socket) do + # Load custom fields that should be shown in overview + require Ash.Query + import Ash.Expr + + # Note: Using Ash.read! (bang version) - errors will be handled by Phoenix LiveView + # and result in a 500 error page. This is appropriate for LiveViews where errors + # should be visible to the user rather than silently failing. + custom_fields_visible = + Mv.Membership.CustomField + |> Ash.Query.filter(expr(show_in_overview == true)) + |> Ash.Query.sort(name: :asc) + |> Ash.read!() + socket = socket |> assign(:page_title, gettext("Members")) @@ -41,6 +59,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(:custom_fields_visible, custom_fields_visible) # We call handle params to use the query from the URL {:ok, socket} @@ -60,6 +79,8 @@ defmodule MvWeb.MemberLive.Index do """ @impl true def handle_event("delete", %{"id" => id}, socket) do + # Note: Using bang versions (!) - errors will be handled by Phoenix LiveView + # This ensures users see error messages if deletion fails (e.g., permission denied) member = Ash.get!(Mv.Membership.Member, id) Ash.destroy!(member) @@ -108,7 +129,14 @@ defmodule MvWeb.MemberLive.Index do """ @impl true def handle_info({:sort, field_str}, socket) do - field = String.to_existing_atom(field_str) + # Handle both atom and string field names (for custom fields) + field = + try do + String.to_existing_atom(field_str) + rescue + ArgumentError -> field_str + end + {new_field, new_order} = determine_new_sort(field, socket) socket @@ -158,10 +186,37 @@ defmodule MvWeb.MemberLive.Index do |> maybe_update_search(params) |> maybe_update_sort(params) |> load_members(params["query"]) + |> prepare_dynamic_cols() {:noreply, socket} end + # Prepares dynamic column definitions for custom fields that should be shown in the overview. + # + # Creates a list of column definitions, each containing: + # - `:custom_field` - The CustomField resource + # - `:render` - A function that formats the custom field value for a given member + # + # Returns the socket with `:dynamic_cols` assigned. + defp prepare_dynamic_cols(socket) do + dynamic_cols = + Enum.map(socket.assigns.custom_fields_visible, fn custom_field -> + %{ + custom_field: custom_field, + render: fn member -> + case get_custom_field_value(member, custom_field) do + nil -> "" + cfv -> + formatted = Formatter.format_custom_field_value(cfv.value, custom_field) + if formatted == "", do: "", else: formatted + end + end + } + end) + + assign(socket, :dynamic_cols, dynamic_cols) + end + # ------------------------------------------------------------- # FUNCTIONS # ------------------------------------------------------------- @@ -177,8 +232,8 @@ defmodule MvWeb.MemberLive.Index do # Updates both the active and old SortHeader components defp update_sort_components(socket, old_field, new_field, new_order) do - active_id = :"sort_#{new_field}" - old_id = :"sort_#{old_field}" + active_id = to_sort_id(new_field) + old_id = to_sort_id(old_field) # Update the new SortHeader send_update(MvWeb.Components.SortHeaderComponent, @@ -197,11 +252,32 @@ defmodule MvWeb.MemberLive.Index do socket end + # Converts a field (atom or string) to a sort component ID atom + # Handles both existing atoms and strings that need to be converted + defp to_sort_id(field) when is_binary(field) do + try do + String.to_existing_atom("sort_#{field}") + rescue + ArgumentError -> :"sort_#{field}" + end + end + + defp to_sort_id(field) when is_atom(field) do + :"sort_#{field}" + end + # Builds sort URL and pushes navigation patch defp push_sort_url(socket, field, order) do + field_str = + if is_atom(field) do + Atom.to_string(field) + else + field + end + query_params = %{ "query" => socket.assigns.query, - "sort_field" => Atom.to_string(field), + "sort_field" => field_str, "sort_order" => Atom.to_string(order) } @@ -214,7 +290,25 @@ defmodule MvWeb.MemberLive.Index do )} end - # Load members eg based on a query for sorting + # Loads members from the database with custom field values and applies search/sort filters. + # + # Process: + # 1. Builds base query with selected fields + # 2. Loads custom field values for visible custom fields + # 3. Applies search filter if provided + # 4. Applies sorting (database-level for regular fields, in-memory for custom fields) + # 5. Filters custom field values to only visible ones (reduces memory usage) + # + # Performance Considerations: + # - In-memory sorting: Custom field sorting is done in memory after loading. + # This is suitable for small to medium datasets (<1000 members). + # For larger datasets, consider implementing database-level sorting or pagination. + # - Memory filtering: Custom field values are filtered after loading to reduce + # memory usage, but all members are still loaded into memory. + # - No pagination: All matching members are loaded at once. For large result sets, + # consider implementing pagination (see Issue #165). + # + # Returns the socket with `:members` assigned. defp load_members(socket, search_query) do query = Mv.Membership.Member @@ -232,16 +326,61 @@ defmodule MvWeb.MemberLive.Index do :join_date ]) + # Load custom field values for visible custom fields + custom_field_ids = Enum.map(socket.assigns.custom_fields_visible, & &1.id) + query = load_custom_field_values(query, custom_field_ids) + # Apply the search filter first query = apply_search_filter(query, search_query) # Apply sorting based on current socket state - query = maybe_sort(query, socket.assigns.sort_field, socket.assigns.sort_order) + # For custom fields, we sort after loading + {query, sort_after_load} = maybe_sort(query, socket.assigns.sort_field, socket.assigns.sort_order, socket.assigns.custom_fields_visible) + # Note: Using Ash.read! - errors will be handled by Phoenix LiveView + # This is appropriate for data loading in LiveViews members = Ash.read!(query) + + # Filter custom field values to only visible ones (reduces memory usage) + # Performance: This iterates through all members and their custom_field_values. + # For large datasets (>1000 members), this could be optimized by filtering + # at the database level, but requires more complex Ash queries. + custom_field_ids = MapSet.new(Enum.map(socket.assigns.custom_fields_visible, & &1.id)) + members = Enum.map(members, fn member -> + # Only filter if custom_field_values is loaded (is a list, not Ash.NotLoaded) + if is_list(member.custom_field_values) do + filtered_values = Enum.filter(member.custom_field_values, fn cfv -> + cfv.custom_field_id in custom_field_ids + end) + %{member | custom_field_values: filtered_values} + else + member + end + end) + + # Sort in memory if needed (for custom fields) + members = if sort_after_load do + sort_members_in_memory(members, socket.assigns.sort_field, socket.assigns.sort_order, socket.assigns.custom_fields_visible) + else + members + end + assign(socket, :members, members) end + # Load custom field values for the given custom field IDs + defp load_custom_field_values(query, []) do + query + end + + defp load_custom_field_values(query, custom_field_ids) when length(custom_field_ids) > 0 do + # Load all custom field values with their custom_field relationship + # Note: We filter to visible custom fields after loading to reduce memory usage + # Ash loads relationships efficiently with JOINs, but we only keep visible ones + query + |> Ash.Query.load(custom_field_values: [custom_field: [:id, :name, :value_type]]) + end + # ------------------------------------------------------------- # Helper Functions # ------------------------------------------------------------- @@ -264,15 +403,24 @@ defmodule MvWeb.MemberLive.Index do defp toggle_order(nil), do: :asc # Function to sort the column if needed - defp maybe_sort(query, nil, _), do: query + # Returns {query, sort_after_load} where sort_after_load is true if we need to sort in memory + defp maybe_sort(query, nil, _, _), do: {query, false} - defp maybe_sort(query, field, :asc) when not is_nil(field), - do: Ash.Query.sort(query, [{field, :asc}]) + defp maybe_sort(query, field, order, _custom_fields) when not is_nil(field) do + if custom_field_sort?(field) do + # Custom fields need to be sorted in memory after loading + {query, true} + else + # Only sort by atom fields (regular member fields) in database + if is_atom(field) do + {Ash.Query.sort(query, [{field, order}]), false} + else + {query, false} + end + end + end - defp maybe_sort(query, field, :desc) when not is_nil(field), - do: Ash.Query.sort(query, [{field, :desc}]) - - defp maybe_sort(query, _, _), do: query + defp maybe_sort(query, _, _, _), do: {query, false} # Validate that a field is sortable defp valid_sort_field?(field) when is_atom(field) do @@ -288,12 +436,156 @@ defmodule MvWeb.MemberLive.Index do :join_date ] - field in valid_fields + field in valid_fields or custom_field_sort?(field) + end + + defp valid_sort_field?(field) when is_binary(field) do + custom_field_sort?(field) end defp valid_sort_field?(_), do: false - # Function to maybe update the sort + # Check if field is a custom field sort field (format: custom_field_) + defp custom_field_sort?(field) when is_atom(field) do + field_str = Atom.to_string(field) + String.starts_with?(field_str, @custom_field_prefix) + end + + defp custom_field_sort?(field) when is_binary(field) do + String.starts_with?(field, @custom_field_prefix) + end + + defp custom_field_sort?(_), do: false + + # Extracts the custom field ID from a sort field name. + # + # Sort fields for custom fields use the format: "custom_field_" + # This function extracts the ID part. + # + # Examples: + # extract_custom_field_id("custom_field_123") -> "123" + # extract_custom_field_id(:custom_field_123) -> "123" + # extract_custom_field_id("first_name") -> nil + defp extract_custom_field_id(field) when is_atom(field) do + field_str = Atom.to_string(field) + extract_custom_field_id(field_str) + end + + defp extract_custom_field_id(field) when is_binary(field) do + case String.split(field, @custom_field_prefix) do + ["", id_str] -> id_str + _ -> nil + end + end + + defp extract_custom_field_id(_), do: nil + + # Sorts members in memory by a custom field value. + # + # Process: + # 1. Extracts custom field ID from sort field name + # 2. Finds the corresponding CustomField resource + # 3. Splits members into those with values and those without + # 4. Sorts members with values by the extracted value + # 5. Combines: sorted values first, then NULL/empty values at the end + # + # Performance Note: + # This function sorts in memory, which is suitable for small to medium datasets (<1000 members). + # For larger datasets, consider implementing database-level sorting or pagination. + # + # Parameters: + # - `members` - List of Member resources to sort + # - `field` - Sort field name (format: "custom_field_" or atom) + # - `order` - Sort order (`:asc` or `:desc`) + # - `custom_fields` - List of visible CustomField resources + # + # Returns the sorted list of members. + defp sort_members_in_memory(members, field, order, custom_fields) do + custom_field_id_str = extract_custom_field_id(field) + + case custom_field_id_str do + nil -> + members + + id_str -> + # Find the custom field by matching the ID string + custom_field = + Enum.find(custom_fields, fn cf -> + to_string(cf.id) == id_str + end) + + case custom_field do + nil -> + members + + cf -> + # Split members into those with values and those without (NULL/empty) + {members_with_values, members_without_values} = + Enum.split_with(members, fn member -> + case get_custom_field_value(member, cf) do + nil -> false + cfv -> + extracted = extract_sort_value(cfv.value, cf.value_type) + not is_empty_value(extracted, cf.value_type) + end + end) + + # Sort members with values + sorted_with_values = Enum.sort_by(members_with_values, fn member -> + cfv = get_custom_field_value(member, cf) + extracted = extract_sort_value(cfv.value, cf.value_type) + normalize_sort_value(extracted, order) + end) + + # For DESC, reverse only the members with values + sorted_with_values = if order == :desc do + Enum.reverse(sorted_with_values) + else + sorted_with_values + end + + # Combine: sorted values first, then NULL/empty values at the end + sorted_with_values ++ members_without_values + end + end + end + + # Extracts a sortable value from a custom field value based on its type. + # + # Handles different value formats: + # - `%Ash.Union{}` - Extracts value and type from union + # - Direct values - Returns as-is for primitive types + # + # Returns the extracted value suitable for sorting. + defp extract_sort_value(%Ash.Union{value: value, type: type}, _expected_type) do + extract_sort_value(value, type) + end + + defp extract_sort_value(value, :string) when is_binary(value), do: value + defp extract_sort_value(value, :integer) when is_integer(value), do: value + defp extract_sort_value(value, :boolean) when is_boolean(value), do: value + defp extract_sort_value(%Date{} = date, :date), do: date + defp extract_sort_value(value, :email) when is_binary(value), do: value + defp extract_sort_value(value, _type), do: to_string(value) + + # Check if a value is considered empty (NULL or empty string) + defp is_empty_value(value, :string) when is_binary(value) do + String.trim(value) == "" + end + defp is_empty_value(value, :email) when is_binary(value) do + String.trim(value) == "" + end + defp is_empty_value(_value, _type), do: false + + # Normalize sort value for DESC order + # For DESC, we sort ascending first, then reverse the list + # This function is kept for consistency but doesn't need to invert values + defp normalize_sort_value(value, _order), do: value + + + # Updates sort field and order from URL parameters if present. + # + # Validates the sort field and order, falling back to defaults if invalid. defp maybe_update_sort(socket, %{"sort_field" => sf, "sort_order" => so}) do field = determine_field(socket.assigns.sort_field, sf) order = determine_order(socket.assigns.sort_order, so) @@ -305,33 +597,50 @@ defmodule MvWeb.MemberLive.Index do defp maybe_update_sort(socket, _), do: socket - defp determine_field(default, sf) do - case sf do - "" -> - default + # Determine sort field from URL parameter, validating against allowed fields + defp determine_field(default, ""), do: default + defp determine_field(default, nil), do: default - nil -> - default - - sf when is_binary(sf) -> - sf - |> String.to_existing_atom() - |> handle_atom_conversion(default) - - sf when is_atom(sf) -> - handle_atom_conversion(sf, default) - - _ -> - default + # Determines the valid sort field from a URL parameter. + # + # Validates the field against allowed sort fields (regular member fields or custom fields). + # Falls back to default if the field is invalid. + # + # Parameters: + # - `default` - Default field to use if validation fails + # - `sf` - Sort field from URL (can be atom, string, nil, or empty string) + # + # Returns a valid sort field (atom or string for custom fields). + defp determine_field(default, sf) when is_binary(sf) do + # Check if it's a custom field sort (starts with "custom_field_") + if custom_field_sort?(sf) do + if valid_sort_field?(sf), do: sf, else: default + else + # Try to convert to atom for regular fields + try do + atom = String.to_existing_atom(sf) + if valid_sort_field?(atom), do: atom, else: default + rescue + ArgumentError -> default + end end end - defp handle_atom_conversion(val, default) when is_atom(val) do - if valid_sort_field?(val), do: val, else: default + defp determine_field(default, sf) when is_atom(sf) do + if valid_sort_field?(sf), do: sf, else: default end - defp handle_atom_conversion(_, default), do: default + defp determine_field(default, _), do: default + # Determines the valid sort order from a URL parameter. + # + # Validates that the order is either "asc" or "desc", falling back to default if invalid. + # + # Parameters: + # - `default` - Default order to use if validation fails + # - `so` - Sort order from URL (string, atom, nil, or empty string) + # + # Returns `:asc` or `:desc`. defp determine_order(default, so) do case so do "" -> default @@ -350,4 +659,32 @@ defmodule MvWeb.MemberLive.Index do # Keep the previous search query if no new one is provided socket end + + # ------------------------------------------------------------- + # Helper Functions for Custom Field Values + # ------------------------------------------------------------- + + # Retrieves the custom field value for a specific member and custom field. + # + # Searches through the member's `custom_field_values` relationship to find + # the value matching the given custom field. + # + # Returns: + # - `%CustomFieldValue{}` if found + # - `nil` if not found or if member has no custom field values + # + # Examples: + # get_custom_field_value(member, custom_field) -> %CustomFieldValue{...} + # get_custom_field_value(member, non_existent_field) -> nil + def get_custom_field_value(member, custom_field) do + case member.custom_field_values do + nil -> nil + values when is_list(values) -> + Enum.find(values, fn cfv -> + cfv.custom_field_id == custom_field.id or + (cfv.custom_field && cfv.custom_field.id == custom_field.id) + end) + _ -> nil + 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 cb2ccd8..67fa804 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -19,6 +19,9 @@ id="members" rows={@members} row_click={fn member -> JS.navigate(~p"/members/#{member}") end} + dynamic_cols={@dynamic_cols} + sort_field={@sort_field} + sort_order={@sort_order} > @@ -185,7 +188,6 @@ > {member.join_date} - <:action :let={member}>
<.link navigate={~p"/members/#{member}"}>{gettext("Show")} diff --git a/lib/mv_web/live/member_live/index/formatter.ex b/lib/mv_web/live/member_live/index/formatter.ex new file mode 100644 index 0000000..d97966c --- /dev/null +++ b/lib/mv_web/live/member_live/index/formatter.ex @@ -0,0 +1,78 @@ +defmodule MvWeb.MemberLive.Index.Formatter do + @moduledoc """ + Formats custom field values for display in the member overview table. + + Handles different value types (string, integer, boolean, date, email) and + formats them appropriately for display in the UI. + """ + use Gettext, backend: MvWeb.Gettext + + @doc """ + Formats a custom field value for display. + + Handles different input formats: + - `nil` - Returns empty string + - `%Ash.Union{}` - Extracts value and type from union type + - Map (JSONB format) - Extracts type and value from map keys + - Direct value - Uses custom_field.value_type to determine format + + ## Examples + + iex> format_custom_field_value(nil, %CustomField{value_type: :string}) + "" + + iex> format_custom_field_value("test", %CustomField{value_type: :string}) + "test" + + iex> format_custom_field_value(true, %CustomField{value_type: :boolean}) + "Yes" + """ + def format_custom_field_value(nil, _custom_field), do: "" + + def format_custom_field_value(%Ash.Union{value: value, type: type}, custom_field) do + format_value_by_type(value, type, custom_field) + end + + def format_custom_field_value(value, custom_field) when is_map(value) do + # Handle map format from JSONB + type = Map.get(value, "type") || Map.get(value, "_union_type") + val = Map.get(value, "value") || Map.get(value, "_union_value") + format_value_by_type(val, type, custom_field) + end + + def format_custom_field_value(value, custom_field) do + format_value_by_type(value, custom_field.value_type, custom_field) + end + + # Format value based on type + defp format_value_by_type(value, :string, _) when is_binary(value) do + # Return empty string if value is empty, otherwise return the value + if String.trim(value) == "", do: "", else: value + end + + defp format_value_by_type(value, :string, _), do: to_string(value) + + defp format_value_by_type(value, :integer, _), do: to_string(value) + + defp format_value_by_type(value, :email, _) when is_binary(value) do + # Return empty string if value is empty + if String.trim(value) == "", do: "", else: value + end + + defp format_value_by_type(value, :email, _), do: to_string(value) + + defp format_value_by_type(value, :boolean, _) when value == true, do: gettext("Yes") + defp format_value_by_type(value, :boolean, _) when value == false, do: gettext("No") + defp format_value_by_type(value, :boolean, _), do: to_string(value) + + defp format_value_by_type(%Date{} = date, :date, _), do: Date.to_string(date) + + defp format_value_by_type(value, :date, _) when is_binary(value) do + case Date.from_iso8601(value) do + {:ok, date} -> Date.to_string(date) + _ -> value + end + end + + defp format_value_by_type(value, _type, _), do: to_string(value) +end From 82bd5732768b92ab875ccf868a91ed3a388b967d Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 14:10:27 +0100 Subject: [PATCH 089/119] formatting --- lib/mv_web/components/core_components.ex | 1 + lib/mv_web/live/member_live/index.ex | 179 ++++++++++++------ ...index_custom_fields_accessibility_test.exs | 8 +- .../index_custom_fields_display_test.exs | 2 +- .../index_custom_fields_edge_cases_test.exs | 1 - .../index_custom_fields_sorting_test.exs | 25 ++- 6 files changed, 148 insertions(+), 68 deletions(-) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index 24e5ffe..b8fe0fc 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -373,6 +373,7 @@ defmodule MvWeb.CoreComponents do > {if dyn_col[:render] do rendered = dyn_col[:render].(@row_item.(row)) + if rendered == "" do "" else diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 4a134f2..419df17 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -205,7 +205,9 @@ defmodule MvWeb.MemberLive.Index do custom_field: custom_field, render: fn member -> case get_custom_field_value(member, custom_field) do - nil -> "" + nil -> + "" + cfv -> formatted = Formatter.format_custom_field_value(cfv.value, custom_field) if formatted == "", do: "", else: formatted @@ -335,7 +337,13 @@ defmodule MvWeb.MemberLive.Index do # Apply sorting based on current socket state # For custom fields, we sort after loading - {query, sort_after_load} = maybe_sort(query, socket.assigns.sort_field, socket.assigns.sort_order, socket.assigns.custom_fields_visible) + {query, sort_after_load} = + maybe_sort( + query, + socket.assigns.sort_field, + socket.assigns.sort_order, + socket.assigns.custom_fields_visible + ) # Note: Using Ash.read! - errors will be handled by Phoenix LiveView # This is appropriate for data loading in LiveViews @@ -346,24 +354,21 @@ defmodule MvWeb.MemberLive.Index do # For large datasets (>1000 members), this could be optimized by filtering # at the database level, but requires more complex Ash queries. custom_field_ids = MapSet.new(Enum.map(socket.assigns.custom_fields_visible, & &1.id)) - members = Enum.map(members, fn member -> - # Only filter if custom_field_values is loaded (is a list, not Ash.NotLoaded) - if is_list(member.custom_field_values) do - filtered_values = Enum.filter(member.custom_field_values, fn cfv -> - cfv.custom_field_id in custom_field_ids - end) - %{member | custom_field_values: filtered_values} - else - member - end - end) + + members = filter_member_custom_field_values(members, custom_field_ids) # Sort in memory if needed (for custom fields) - members = if sort_after_load do - sort_members_in_memory(members, socket.assigns.sort_field, socket.assigns.sort_order, socket.assigns.custom_fields_visible) - else - members - end + members = + if sort_after_load do + sort_members_in_memory( + members, + socket.assigns.sort_field, + socket.assigns.sort_order, + socket.assigns.custom_fields_visible + ) + else + members + end assign(socket, :members, members) end @@ -381,6 +386,28 @@ defmodule MvWeb.MemberLive.Index do |> Ash.Query.load(custom_field_values: [custom_field: [:id, :name, :value_type]]) end + # Filters custom field values to only visible ones for all members + defp filter_member_custom_field_values(members, custom_field_ids) do + Enum.map(members, fn member -> + filter_single_member_custom_field_values(member, custom_field_ids) + end) + end + + # Filters custom field values for a single member + defp filter_single_member_custom_field_values(member, _custom_field_ids) + when not is_list(member.custom_field_values) do + member + end + + defp filter_single_member_custom_field_values(member, custom_field_ids) do + filtered_values = + Enum.filter(member.custom_field_values, fn cfv -> + cfv.custom_field_id in custom_field_ids + end) + + %{member | custom_field_values: filtered_values} + end + # ------------------------------------------------------------- # Helper Functions # ------------------------------------------------------------- @@ -508,45 +535,76 @@ defmodule MvWeb.MemberLive.Index do members id_str -> - # Find the custom field by matching the ID string - custom_field = - Enum.find(custom_fields, fn cf -> - to_string(cf.id) == id_str - end) + sort_members_by_custom_field(members, id_str, order, custom_fields) + end + end - case custom_field do - nil -> - members + # Sorts members by a specific custom field ID + defp sort_members_by_custom_field(members, id_str, order, custom_fields) do + custom_field = find_custom_field_by_id(custom_fields, id_str) - cf -> - # Split members into those with values and those without (NULL/empty) - {members_with_values, members_without_values} = - Enum.split_with(members, fn member -> - case get_custom_field_value(member, cf) do - nil -> false - cfv -> - extracted = extract_sort_value(cfv.value, cf.value_type) - not is_empty_value(extracted, cf.value_type) - end - end) + case custom_field do + nil -> + members - # Sort members with values - sorted_with_values = Enum.sort_by(members_with_values, fn member -> - cfv = get_custom_field_value(member, cf) - extracted = extract_sort_value(cfv.value, cf.value_type) - normalize_sort_value(extracted, order) - end) + cf -> + sort_members_with_custom_field(members, cf, order) + end + end - # For DESC, reverse only the members with values - sorted_with_values = if order == :desc do - Enum.reverse(sorted_with_values) - else - sorted_with_values - end + # Finds a custom field by matching its ID string + defp find_custom_field_by_id(custom_fields, id_str) do + Enum.find(custom_fields, fn cf -> + to_string(cf.id) == id_str + end) + end - # Combine: sorted values first, then NULL/empty values at the end - sorted_with_values ++ members_without_values - end + # Sorts members that have a specific custom field + defp sort_members_with_custom_field(members, custom_field, order) do + # Split members into those with values and those without (NULL/empty) + {members_with_values, members_without_values} = + split_members_by_value_presence(members, custom_field) + + # Sort members with values + sorted_with_values = sort_members_with_values(members_with_values, custom_field, order) + + # Combine: sorted values first, then NULL/empty values at the end + sorted_with_values ++ members_without_values + end + + # Splits members into those with values and those without + defp split_members_by_value_presence(members, custom_field) do + Enum.split_with(members, fn member -> + has_non_empty_value?(member, custom_field) + end) + end + + # Checks if a member has a non-empty value for the custom field + defp has_non_empty_value?(member, custom_field) do + case get_custom_field_value(member, custom_field) do + nil -> + false + + cfv -> + extracted = extract_sort_value(cfv.value, custom_field.value_type) + not empty_value?(extracted, custom_field.value_type) + end + end + + # Sorts members that have values for the custom field + defp sort_members_with_values(members_with_values, custom_field, order) do + sorted = + Enum.sort_by(members_with_values, fn member -> + cfv = get_custom_field_value(member, custom_field) + extracted = extract_sort_value(cfv.value, custom_field.value_type) + normalize_sort_value(extracted, order) + end) + + # For DESC, reverse only the members with values + if order == :desc do + Enum.reverse(sorted) + else + sorted end end @@ -569,20 +627,21 @@ defmodule MvWeb.MemberLive.Index do defp extract_sort_value(value, _type), do: to_string(value) # Check if a value is considered empty (NULL or empty string) - defp is_empty_value(value, :string) when is_binary(value) do + defp empty_value?(value, :string) when is_binary(value) do String.trim(value) == "" end - defp is_empty_value(value, :email) when is_binary(value) do + + defp empty_value?(value, :email) when is_binary(value) do String.trim(value) == "" end - defp is_empty_value(_value, _type), do: false + + defp empty_value?(_value, _type), do: false # Normalize sort value for DESC order # For DESC, we sort ascending first, then reverse the list # This function is kept for consistency but doesn't need to invert values defp normalize_sort_value(value, _order), do: value - # Updates sort field and order from URL parameters if present. # # Validates the sort field and order, falling back to defaults if invalid. @@ -678,13 +737,17 @@ defmodule MvWeb.MemberLive.Index do # get_custom_field_value(member, non_existent_field) -> nil def get_custom_field_value(member, custom_field) do case member.custom_field_values do - nil -> nil + nil -> + nil + values when is_list(values) -> Enum.find(values, fn cfv -> cfv.custom_field_id == custom_field.id or (cfv.custom_field && cfv.custom_field.id == custom_field.id) end) - _ -> nil + + _ -> + nil end end end diff --git a/test/mv_web/member_live/index_custom_fields_accessibility_test.exs b/test/mv_web/member_live/index_custom_fields_accessibility_test.exs index e4d174f..cfe3145 100644 --- a/test/mv_web/member_live/index_custom_fields_accessibility_test.exs +++ b/test/mv_web/member_live/index_custom_fields_accessibility_test.exs @@ -67,7 +67,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsAccessibilityTest do field: field } do conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") html = render(view) @@ -80,7 +82,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsAccessibilityTest do field: field } do conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") html = render(view) diff --git a/test/mv_web/member_live/index_custom_fields_display_test.exs b/test/mv_web/member_live/index_custom_fields_display_test.exs index 7788c60..25aefe5 100644 --- a/test/mv_web/member_live/index_custom_fields_display_test.exs +++ b/test/mv_web/member_live/index_custom_fields_display_test.exs @@ -105,7 +105,7 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do |> Ash.Changeset.for_create(:create, %{ member_id: member1.id, custom_field_id: field_show_integer.id, - value: %{"_union_type" => "integer", "_union_value" => 12345} + value: %{"_union_type" => "integer", "_union_value" => 12_345} }) |> Ash.create() diff --git a/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs b/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs index 9d44c40..d526556 100644 --- a/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs +++ b/test/mv_web/member_live/index_custom_fields_edge_cases_test.exs @@ -171,4 +171,3 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do assert html =~ "Value3" end end - diff --git a/test/mv_web/member_live/index_custom_fields_sorting_test.exs b/test/mv_web/member_live/index_custom_fields_sorting_test.exs index e1c99b2..21b0c9f 100644 --- a/test/mv_web/member_live/index_custom_fields_sorting_test.exs +++ b/test/mv_web/member_live/index_custom_fields_sorting_test.exs @@ -174,7 +174,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do test "sorting by custom field works with URL parameters", %{conn: conn, field_string: field} do conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") # Check that the sort state is correctly applied assert has_element?(view, "[data-testid='custom_field_#{field.id}'][aria-label='descending']") @@ -186,14 +188,19 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do field_integer: field_integer } do conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field_string.id}&sort_order=desc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field_string.id}&sort_order=desc") # Click on a different custom field column view |> element("[data-testid='custom_field_#{field_integer.id}']") |> render_click() - assert_patch(view, "/members?query=&sort_field=custom_field_#{field_integer.id}&sort_order=asc") + assert_patch( + view, + "/members?query=&sort_field=custom_field_#{field_integer.id}&sort_order=asc" + ) end test "clicking regular column after custom field column works", %{ @@ -201,7 +208,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do field_string: field } do conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") # Click on email column view @@ -305,7 +314,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do |> Ash.create() conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=asc") html = render(view) @@ -414,7 +425,9 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do |> Ash.create() conn = conn_with_oidc_user(conn) - {:ok, view, _html} = live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") + + {:ok, view, _html} = + live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc") html = render(view) From 2284cd93c472a50c70f2cbd57d000766bfd219b8 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 14:14:53 +0100 Subject: [PATCH 090/119] translate: add translation --- priv/gettext/de/LC_MESSAGES/default.po | 77 +++++++++------- priv/gettext/default.pot | 117 ++++++++----------------- priv/gettext/en/LC_MESSAGES/default.po | 77 +++++++++------- 3 files changed, 125 insertions(+), 146 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 7b8c86e..27acc80 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -10,13 +10,13 @@ msgid "" msgstr "" "Language: en\n" -#: lib/mv_web/components/core_components.ex:339 +#: lib/mv_web/components/core_components.ex:356 #, elixir-autogen, elixir-format msgid "Actions" msgstr "Aktionen" -#: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:72 +#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/user_live/index.html.heex:65 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "Bist du sicher?" @@ -28,21 +28,21 @@ 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:145 +#: lib/mv_web/live/member_live/index.html.heex:148 #: 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:202 -#: lib/mv_web/live/user_live/index.html.heex:74 +#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "Löschen" -#: lib/mv_web/live/member_live/index.html.heex:194 -#: lib/mv_web/live/user_live/form.ex:251 -#: lib/mv_web/live/user_live/index.html.heex:66 +#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format msgid "Edit" msgstr "Bearbeite" @@ -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:77 +#: lib/mv_web/live/member_live/index.html.heex:80 #: 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:179 +#: lib/mv_web/live/member_live/index.html.heex:182 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -87,8 +87,8 @@ msgstr "Nachname" msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" msgstr "Anzeigen" @@ -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:111 +#: lib/mv_web/live/member_live/index.html.heex:114 #: 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:162 +#: lib/mv_web/live/member_live/index.html.heex:165 #: 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:128 +#: lib/mv_web/live/member_live/index.html.heex:131 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -158,7 +158,7 @@ msgstr "Postleitzahl" msgid "Save Member" msgstr "Mitglied speichern" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 @@ -167,7 +167,7 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:94 +#: lib/mv_web/live/member_live/index.html.heex:97 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -183,6 +183,7 @@ msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenscha msgid "Id" msgstr "ID" +#: lib/mv_web/live/member_live/index/formatter.ex:65 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -198,19 +199,20 @@ msgstr "Mitglied anzeigen" msgid "This is a member record from your database." msgstr "Dies ist ein Mitglied aus deiner Datenbank." +#: lib/mv_web/live/member_live/index/formatter.ex:64 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" msgstr "Ja" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:110 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "erstellt" -#: lib/mv_web/live/custom_field_live/form.ex:109 +#: lib/mv_web/live/custom_field_live/form.ex:111 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -252,7 +254,7 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt" msgid "Your password has successfully been reset" msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" -#: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/form.ex:69 #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 @@ -266,7 +268,7 @@ msgstr "Abbrechen" msgid "Choose a member" msgstr "Mitglied auswählen" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Description" msgstr "Beschreibung" @@ -286,7 +288,7 @@ msgstr "Aktiviert" msgid "ID" msgstr "ID" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "Unveränderlich" @@ -308,13 +310,13 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "Mitglieder" -#: lib/mv_web/live/custom_field_live/form.ex:50 +#: lib/mv_web/live/custom_field_live/form.ex:51 #, elixir-autogen, elixir-format msgid "Name" msgstr "Name" @@ -357,17 +359,17 @@ msgstr "Passwort-Authentifizierung" msgid "Profil" msgstr "Profil" -#: lib/mv_web/live/custom_field_live/form.ex:62 +#: lib/mv_web/live/custom_field_live/form.ex:63 #, elixir-autogen, elixir-format msgid "Required" msgstr "Erforderlich" -#: lib/mv_web/live/member_live/index.html.heex:34 +#: lib/mv_web/live/member_live/index.html.heex:37 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "Alle Mitglieder auswählen" -#: lib/mv_web/live/member_live/index.html.heex:48 +#: lib/mv_web/live/member_live/index.html.heex:51 #, elixir-autogen, elixir-format msgid "Select member" msgstr "Mitglied auswählen" @@ -413,7 +415,7 @@ msgstr "Benutzer*in" msgid "Value" msgstr "Wert" -#: lib/mv_web/live/custom_field_live/form.ex:55 +#: lib/mv_web/live/custom_field_live/form.ex:56 #, elixir-autogen, elixir-format msgid "Value type" msgstr "Wertetyp" @@ -569,7 +571,7 @@ msgstr "Benutzer*innen" msgid "Click to sort" msgstr "Klicke um zu sortieren" -#: lib/mv_web/live/member_live/index.html.heex:60 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "First name" msgstr "Vorname" @@ -621,7 +623,7 @@ msgstr "Benutzerdefinierte Feldwerte" msgid "Custom field" msgstr "Benutzerdefiniertes Feld" -#: lib/mv_web/live/custom_field_live/form.ex:115 +#: lib/mv_web/live/custom_field_live/form.ex:117 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "Benutzerdefiniertes Feld erfolgreich %{action}" @@ -636,7 +638,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}" msgid "Please select a custom field first" msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld" -#: lib/mv_web/live/custom_field_live/form.ex:65 +#: lib/mv_web/live/custom_field_live/form.ex:67 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "Benutzerdefiniertes Feld speichern" @@ -646,7 +648,7 @@ msgstr "Benutzerdefiniertes Feld speichern" msgid "Save Custom field value" msgstr "Benutzerdefinierten Feldwert speichern" -#: lib/mv_web/live/custom_field_live/form.ex:45 +#: lib/mv_web/live/custom_field_live/form.ex:46 #, elixir-autogen, elixir-format msgid "Use this form to manage custom_field records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." @@ -747,3 +749,12 @@ msgstr "Entverknüpfung geplant" #, elixir-autogen, elixir-format msgid "Failed to link member: %{error}" msgstr "" +#: lib/mv_web/live/custom_field_live/form.ex:64 +#, elixir-autogen, elixir-format +msgid "Show in overview" +msgstr "In der Mitglieder-Übersicht anzeigen" + +#~ #: 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:" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index a1ae484..7cf507b 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -11,13 +11,13 @@ msgid "" msgstr "" -#: lib/mv_web/components/core_components.ex:339 +#: lib/mv_web/components/core_components.ex:356 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:72 +#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/user_live/index.html.heex:65 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -29,21 +29,21 @@ msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:145 +#: lib/mv_web/live/member_live/index.html.heex:148 #: 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:202 -#: lib/mv_web/live/user_live/index.html.heex:74 +#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:194 -#: lib/mv_web/live/user_live/form.ex:251 -#: lib/mv_web/live/user_live/index.html.heex:66 +#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -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:77 +#: lib/mv_web/live/member_live/index.html.heex:80 #: 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:179 +#: lib/mv_web/live/member_live/index.html.heex:182 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -88,8 +88,8 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" 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:111 +#: lib/mv_web/live/member_live/index.html.heex:114 #: 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:162 +#: lib/mv_web/live/member_live/index.html.heex:165 #: 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:128 +#: lib/mv_web/live/member_live/index.html.heex:131 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -159,7 +159,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 @@ -168,7 +168,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:94 +#: lib/mv_web/live/member_live/index.html.heex:97 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -184,6 +184,7 @@ msgstr "" msgid "Id" msgstr "" +#: lib/mv_web/live/member_live/index/formatter.ex:65 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -199,19 +200,20 @@ msgstr "" msgid "This is a member record from your database." msgstr "" +#: lib/mv_web/live/member_live/index/formatter.ex:64 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:110 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:109 +#: lib/mv_web/live/custom_field_live/form.ex:111 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -253,7 +255,7 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/form.ex:69 #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 @@ -267,7 +269,7 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -287,7 +289,7 @@ msgstr "" msgid "ID" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -309,13 +311,13 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:50 +#: lib/mv_web/live/custom_field_live/form.ex:51 #, elixir-autogen, elixir-format msgid "Name" msgstr "" @@ -358,17 +360,17 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:62 +#: lib/mv_web/live/custom_field_live/form.ex:63 #, elixir-autogen, elixir-format msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:34 +#: lib/mv_web/live/member_live/index.html.heex:37 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:48 +#: lib/mv_web/live/member_live/index.html.heex:51 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -414,7 +416,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:55 +#: lib/mv_web/live/custom_field_live/form.ex:56 #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -570,7 +572,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:60 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "First name" msgstr "" @@ -622,7 +624,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:115 +#: lib/mv_web/live/custom_field_live/form.ex:117 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -637,7 +639,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:65 +#: lib/mv_web/live/custom_field_live/form.ex:67 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -647,7 +649,7 @@ msgstr "" msgid "Save Custom field value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:45 +#: lib/mv_web/live/custom_field_live/form.ex:46 #, elixir-autogen, elixir-format msgid "Use this form to manage custom_field records in your database." msgstr "" @@ -699,52 +701,7 @@ msgstr "" msgid "To confirm deletion, please enter this text:" msgstr "" -#: lib/mv_web/live/user_live/form.ex:210 +#: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format -msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:185 -#, elixir-autogen, elixir-format -msgid "Available members" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Member will be unlinked when you save. Cannot select new member until saved." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:226 -#, elixir-autogen, elixir-format -msgid "Save to confirm linking." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:169 -#, elixir-autogen, elixir-format -msgid "Search for a member to link..." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:173 -#, elixir-autogen, elixir-format -msgid "Search for member to link" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:223 -#, elixir-autogen, elixir-format -msgid "Selected" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:143 -#, elixir-autogen, elixir-format -msgid "Unlink Member" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Unlinking scheduled" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:342 -#, elixir-autogen, elixir-format -msgid "Failed to link member: %{error}" +msgid "Show in overview" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 28339fc..ed38b0e 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -11,13 +11,13 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/mv_web/components/core_components.ex:339 +#: lib/mv_web/components/core_components.ex:356 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:200 -#: lib/mv_web/live/user_live/index.html.heex:72 +#: lib/mv_web/live/member_live/index.html.heex:202 +#: lib/mv_web/live/user_live/index.html.heex:65 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -29,21 +29,21 @@ msgid "Attempting to reconnect" msgstr "" #: lib/mv_web/live/member_live/form.ex:54 -#: lib/mv_web/live/member_live/index.html.heex:145 +#: lib/mv_web/live/member_live/index.html.heex:148 #: 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:202 -#: lib/mv_web/live/user_live/index.html.heex:74 +#: lib/mv_web/live/member_live/index.html.heex:204 +#: lib/mv_web/live/user_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Delete" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:194 -#: lib/mv_web/live/user_live/form.ex:251 -#: lib/mv_web/live/user_live/index.html.heex:66 +#: lib/mv_web/live/member_live/index.html.heex:196 +#: lib/mv_web/live/user_live/form.ex:141 +#: lib/mv_web/live/user_live/index.html.heex:59 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -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:77 +#: lib/mv_web/live/member_live/index.html.heex:80 #: 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:179 +#: lib/mv_web/live/member_live/index.html.heex:182 #: lib/mv_web/live/member_live/show.ex:56 #, elixir-autogen, elixir-format msgid "Join Date" @@ -88,8 +88,8 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:191 -#: lib/mv_web/live/user_live/index.html.heex:63 +#: lib/mv_web/live/member_live/index.html.heex:193 +#: lib/mv_web/live/user_live/index.html.heex:56 #, elixir-autogen, elixir-format msgid "Show" 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:111 +#: lib/mv_web/live/member_live/index.html.heex:114 #: 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:162 +#: lib/mv_web/live/member_live/index.html.heex:165 #: 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:128 +#: lib/mv_web/live/member_live/index.html.heex:131 #: lib/mv_web/live/member_live/show.ex:62 #, elixir-autogen, elixir-format msgid "Postal Code" @@ -159,7 +159,7 @@ msgstr "" msgid "Save Member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:64 +#: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 @@ -168,7 +168,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:55 -#: lib/mv_web/live/member_live/index.html.heex:94 +#: lib/mv_web/live/member_live/index.html.heex:97 #: lib/mv_web/live/member_live/show.ex:60 #, elixir-autogen, elixir-format msgid "Street" @@ -184,6 +184,7 @@ msgstr "" msgid "Id" msgstr "" +#: lib/mv_web/live/member_live/index/formatter.ex:65 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -199,19 +200,20 @@ msgstr "" msgid "This is a member record from your database." msgstr "" +#: lib/mv_web/live/member_live/index/formatter.ex:64 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:108 +#: lib/mv_web/live/custom_field_live/form.ex:110 #: lib/mv_web/live/custom_field_value_live/form.ex:233 #: lib/mv_web/live/member_live/form.ex:138 #, elixir-autogen, elixir-format msgid "create" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:109 +#: lib/mv_web/live/custom_field_live/form.ex:111 #: lib/mv_web/live/custom_field_value_live/form.ex:234 #: lib/mv_web/live/member_live/form.ex:139 #, elixir-autogen, elixir-format @@ -253,7 +255,7 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:67 +#: lib/mv_web/live/custom_field_live/form.ex:69 #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 @@ -267,7 +269,7 @@ msgstr "" msgid "Choose a member" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:60 +#: lib/mv_web/live/custom_field_live/form.ex:61 #, elixir-autogen, elixir-format msgid "Description" msgstr "" @@ -287,7 +289,7 @@ msgstr "" msgid "ID" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:61 +#: lib/mv_web/live/custom_field_live/form.ex:62 #, elixir-autogen, elixir-format msgid "Immutable" msgstr "" @@ -309,13 +311,13 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:50 +#: lib/mv_web/live/custom_field_live/form.ex:51 #, elixir-autogen, elixir-format msgid "Name" msgstr "" @@ -358,17 +360,17 @@ msgstr "" msgid "Profil" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:62 +#: lib/mv_web/live/custom_field_live/form.ex:63 #, elixir-autogen, elixir-format msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:34 +#: lib/mv_web/live/member_live/index.html.heex:37 #, elixir-autogen, elixir-format msgid "Select all members" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:48 +#: lib/mv_web/live/member_live/index.html.heex:51 #, elixir-autogen, elixir-format msgid "Select member" msgstr "" @@ -414,7 +416,7 @@ msgstr "" msgid "Value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:55 +#: lib/mv_web/live/custom_field_live/form.ex:56 #, elixir-autogen, elixir-format msgid "Value type" msgstr "" @@ -570,7 +572,7 @@ msgstr "" msgid "Click to sort" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:60 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format, fuzzy msgid "First name" msgstr "" @@ -622,7 +624,7 @@ msgstr "" msgid "Custom field" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:115 +#: lib/mv_web/live/custom_field_live/form.ex:117 #, elixir-autogen, elixir-format msgid "Custom field %{action} successfully" msgstr "" @@ -637,7 +639,7 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:65 +#: lib/mv_web/live/custom_field_live/form.ex:67 #, elixir-autogen, elixir-format msgid "Save Custom field" msgstr "" @@ -647,7 +649,7 @@ msgstr "" msgid "Save Custom field value" msgstr "" -#: lib/mv_web/live/custom_field_live/form.ex:45 +#: lib/mv_web/live/custom_field_live/form.ex:46 #, elixir-autogen, elixir-format, fuzzy msgid "Use this form to manage custom_field records in your database." msgstr "" @@ -748,3 +750,12 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Failed to link member: %{error}" msgstr "" +#: lib/mv_web/live/custom_field_live/form.ex:64 +#, elixir-autogen, elixir-format +msgid "Show in overview" +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 "" From b5845811148732a37c982d621babe38e22fee1f8 Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 1 Dec 2025 09:48:29 +0100 Subject: [PATCH 091/119] performance: improvedd ash querying --- docs/development-progress-log.md | 6 ++ lib/mv_web/live/member_live/index.ex | 71 +++++++------------ .../live/member_live/index/formatter.ex | 6 +- 3 files changed, 34 insertions(+), 49 deletions(-) diff --git a/docs/development-progress-log.md b/docs/development-progress-log.md index 51d0749..5669a19 100644 --- a/docs/development-progress-log.md +++ b/docs/development-progress-log.md @@ -329,6 +329,11 @@ end --- +**PR #208:** *Show custom fields per default in member overview* 🔧 +- added show_in_overview as attribute to custom fields +- show custom fields in member overview per default +- can be set to false in the settings for the specific custom field + ## Implementation Decisions ### Architecture Patterns @@ -390,6 +395,7 @@ defmodule Mv.Membership.CustomField do attribute :value_type, :atom # :string, :integer, :boolean, :date, :email attribute :immutable, :boolean # Can't change after creation attribute :required, :boolean # All members must have this + attribute :show_in_overview, :boolean # "If true, this custom field will be displayed in the member overview table" end # CustomFieldValue stores values diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 419df17..85ee4fb 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -26,6 +26,9 @@ defmodule MvWeb.MemberLive.Index do """ use MvWeb, :live_view + require Ash.Query + import Ash.Expr + alias MvWeb.MemberLive.Index.Formatter # Prefix used in sort field names for custom fields (e.g., "custom_field_") @@ -40,9 +43,6 @@ defmodule MvWeb.MemberLive.Index do @impl true def mount(_params, _session, socket) do # Load custom fields that should be shown in overview - require Ash.Query - import Ash.Expr - # Note: Using Ash.read! (bang version) - errors will be handled by Phoenix LiveView # and result in a 500 error page. This is appropriate for LiveViews where errors # should be visible to the user rather than silently failing. @@ -209,8 +209,7 @@ defmodule MvWeb.MemberLive.Index do "" cfv -> - formatted = Formatter.format_custom_field_value(cfv.value, custom_field) - if formatted == "", do: "", else: formatted + Formatter.format_custom_field_value(cfv.value, custom_field) end end } @@ -296,17 +295,16 @@ defmodule MvWeb.MemberLive.Index do # # Process: # 1. Builds base query with selected fields - # 2. Loads custom field values for visible custom fields + # 2. Loads custom field values for visible custom fields (filtered at database level) # 3. Applies search filter if provided # 4. Applies sorting (database-level for regular fields, in-memory for custom fields) - # 5. Filters custom field values to only visible ones (reduces memory usage) # # Performance Considerations: + # - Database-level filtering: Custom field values are filtered directly in the database + # using Ash relationship filters, reducing memory usage and improving performance. # - In-memory sorting: Custom field sorting is done in memory after loading. # This is suitable for small to medium datasets (<1000 members). # For larger datasets, consider implementing database-level sorting or pagination. - # - Memory filtering: Custom field values are filtered after loading to reduce - # memory usage, but all members are still loaded into memory. # - No pagination: All matching members are loaded at once. For large result sets, # consider implementing pagination (see Issue #165). # @@ -329,8 +327,8 @@ defmodule MvWeb.MemberLive.Index do ]) # Load custom field values for visible custom fields - custom_field_ids = Enum.map(socket.assigns.custom_fields_visible, & &1.id) - query = load_custom_field_values(query, custom_field_ids) + custom_field_ids_list = Enum.map(socket.assigns.custom_fields_visible, & &1.id) + query = load_custom_field_values(query, custom_field_ids_list) # Apply the search filter first query = apply_search_filter(query, search_query) @@ -349,13 +347,8 @@ defmodule MvWeb.MemberLive.Index do # This is appropriate for data loading in LiveViews members = Ash.read!(query) - # Filter custom field values to only visible ones (reduces memory usage) - # Performance: This iterates through all members and their custom_field_values. - # For large datasets (>1000 members), this could be optimized by filtering - # at the database level, but requires more complex Ash queries. - custom_field_ids = MapSet.new(Enum.map(socket.assigns.custom_fields_visible, & &1.id)) - - members = filter_member_custom_field_values(members, custom_field_ids) + # Custom field values are already filtered at the database level in load_custom_field_values/2 + # No need for in-memory filtering anymore # Sort in memory if needed (for custom fields) members = @@ -374,38 +367,28 @@ defmodule MvWeb.MemberLive.Index do end # Load custom field values for the given custom field IDs + # + # Filters custom field values directly in the database using Ash relationship filters. + # This is more efficient than loading all values and filtering in memory. + # + # Performance: Database-level filtering reduces: + # - Memory usage (only visible custom field values are loaded) + # - Network transfer (less data from database to application) + # - Processing time (no need to iterate through all members and filter) defp load_custom_field_values(query, []) do query end defp load_custom_field_values(query, custom_field_ids) when length(custom_field_ids) > 0 do - # Load all custom field values with their custom_field relationship - # Note: We filter to visible custom fields after loading to reduce memory usage - # Ash loads relationships efficiently with JOINs, but we only keep visible ones + # Filter custom field values at the database level using Ash relationship query + # This ensures only visible custom field values are loaded + custom_field_values_query = + Mv.Membership.CustomFieldValue + |> Ash.Query.filter(expr(custom_field_id in ^custom_field_ids)) + |> Ash.Query.load(custom_field: [:id, :name, :value_type]) + query - |> Ash.Query.load(custom_field_values: [custom_field: [:id, :name, :value_type]]) - end - - # Filters custom field values to only visible ones for all members - defp filter_member_custom_field_values(members, custom_field_ids) do - Enum.map(members, fn member -> - filter_single_member_custom_field_values(member, custom_field_ids) - end) - end - - # Filters custom field values for a single member - defp filter_single_member_custom_field_values(member, _custom_field_ids) - when not is_list(member.custom_field_values) do - member - end - - defp filter_single_member_custom_field_values(member, custom_field_ids) do - filtered_values = - Enum.filter(member.custom_field_values, fn cfv -> - cfv.custom_field_id in custom_field_ids - end) - - %{member | custom_field_values: filtered_values} + |> Ash.Query.load(custom_field_values: custom_field_values_query) end # ------------------------------------------------------------- diff --git a/lib/mv_web/live/member_live/index/formatter.ex b/lib/mv_web/live/member_live/index/formatter.ex index d97966c..2074962 100644 --- a/lib/mv_web/live/member_live/index/formatter.ex +++ b/lib/mv_web/live/member_live/index/formatter.ex @@ -45,16 +45,12 @@ defmodule MvWeb.MemberLive.Index.Formatter do end # Format value based on type - defp format_value_by_type(value, :string, _) when is_binary(value) do - # Return empty string if value is empty, otherwise return the value - if String.trim(value) == "", do: "", else: value - end defp format_value_by_type(value, :string, _), do: to_string(value) defp format_value_by_type(value, :integer, _), do: to_string(value) - defp format_value_by_type(value, :email, _) when is_binary(value) do + defp format_value_by_type(value, type, _) when type in [:string, :email] and is_binary(value) do # Return empty string if value is empty if String.trim(value) == "", do: "", else: value end From 418b42d35a1cb9e75def6ad3d157e6d5ab9c87e3 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 14:56:13 +0100 Subject: [PATCH 092/119] adds tests --- test/membership/setting_env_test.exs | 61 +++++++++++++++++ test/membership/setting_test.exs | 53 +++++++++++++++ .../mv_web/components/layouts/navbar_test.exs | 18 +++++ .../mv_web/live/global_settings_live_test.exs | 67 +++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 test/membership/setting_env_test.exs create mode 100644 test/membership/setting_test.exs create mode 100644 test/mv_web/live/global_settings_live_test.exs diff --git a/test/membership/setting_env_test.exs b/test/membership/setting_env_test.exs new file mode 100644 index 0000000..262f748 --- /dev/null +++ b/test/membership/setting_env_test.exs @@ -0,0 +1,61 @@ +defmodule Mv.Membership.SettingEnvTest do + use Mv.DataCase, async: false + alias Mv.Membership + + describe "Settings with environment variable" do + test "club_name can be set via ASSOCIATION_NAME environment variable" do + # Set environment variable + System.put_env("ASSOCIATION_NAME", "Test Association from Env") + + try do + # Get settings - should use environment variable if no DB value exists + {:ok, settings} = Membership.get_settings() + + # If settings don't have a club_name in DB, it should use the env var + # This depends on implementation - we'll check that the env var is respected + assert settings.club_name != nil + after + # Clean up + System.delete_env("ASSOCIATION_NAME") + end + end + + test "database value takes precedence over environment variable" do + # Set environment variable + System.put_env("ASSOCIATION_NAME", "Env Value") + + try do + # Set a value in the database + {:ok, settings} = Membership.get_settings() + {:ok, _updated} = Membership.update_settings(settings, %{club_name: "DB Value"}) + + # Get settings again - should use DB value, not env var + {:ok, settings_after} = Membership.get_settings() + assert settings_after.club_name == "DB Value" + after + # Clean up + System.delete_env("ASSOCIATION_NAME") + end + end + + test "uses environment variable when database value is not set" do + # Set environment variable + System.put_env("ASSOCIATION_NAME", "Default from Env") + + try do + # Clear database value (if possible) or check that env var is used + {:ok, settings} = Membership.get_settings() + + # If club_name is nil or empty in DB, should use env var + # This test depends on implementation details + # We're testing that the env var fallback works + club_name = settings.club_name || System.get_env("ASSOCIATION_NAME") + assert club_name != nil + assert club_name != "" + after + # Clean up + System.delete_env("ASSOCIATION_NAME") + end + end + end +end diff --git a/test/membership/setting_test.exs b/test/membership/setting_test.exs new file mode 100644 index 0000000..46cf3b9 --- /dev/null +++ b/test/membership/setting_test.exs @@ -0,0 +1,53 @@ +defmodule Mv.Membership.SettingTest do + use Mv.DataCase, async: false + alias Mv.Membership + + describe "Settings Resource" do + test "can read settings" do + # Settings should be a singleton resource + assert {:ok, _settings} = Membership.get_settings() + end + + test "settings have club_name attribute" do + {:ok, settings} = Membership.get_settings() + assert Map.has_key?(settings, :club_name) + end + + test "can update club_name" do + {:ok, settings} = Membership.get_settings() + + assert {:ok, updated_settings} = + Membership.update_settings(settings, %{club_name: "New Club Name"}) + + assert updated_settings.club_name == "New Club Name" + end + + test "club_name is required" do + {:ok, settings} = Membership.get_settings() + + assert {:error, %Ash.Error.Invalid{errors: errors}} = + Membership.update_settings(settings, %{club_name: nil}) + + assert error_message(errors, :club_name) =~ "must be present" + end + + test "club_name cannot be empty" do + {:ok, settings} = Membership.get_settings() + + assert {:error, %Ash.Error.Invalid{errors: errors}} = + Membership.update_settings(settings, %{club_name: ""}) + + assert error_message(errors, :club_name) =~ "must be present" + end + end + + # Helper function to extract error messages + defp error_message(errors, field) do + errors + |> Enum.find(fn error -> error.field == field end) + |> case do + nil -> "" + error -> List.first(error.message) || "" + end + end +end diff --git a/test/mv_web/components/layouts/navbar_test.exs b/test/mv_web/components/layouts/navbar_test.exs index b6fa556..6a50996 100644 --- a/test/mv_web/components/layouts/navbar_test.exs +++ b/test/mv_web/components/layouts/navbar_test.exs @@ -84,5 +84,23 @@ defmodule MvWeb.Layouts.NavbarTest do # Check for correct logout path assert html =~ ~s(href="/sign-out") end + + test "Settings link navigates to global settings page", %{conn: conn} do + user = create_test_user(%{email: "test@example.com"}) + conn = conn_with_oidc_user(conn, user) + + html = + render_component(&MvWeb.Layouts.Navbar.navbar/1, %{ + current_user: user + }) + + # Check that Settings link exists and points to /settings + assert html =~ "Settings" + assert html =~ ~s(href="/settings") || html =~ ~s(navigate="/settings") + + # Verify the link actually works by navigating to it + {:ok, _view, settings_html} = live(conn, ~p"/settings") + assert settings_html =~ "Vereinsdaten" + end end end diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs new file mode 100644 index 0000000..f06deb1 --- /dev/null +++ b/test/mv_web/live/global_settings_live_test.exs @@ -0,0 +1,67 @@ +defmodule MvWeb.GlobalSettingsLiveTest do + use MvWeb.ConnCase, async: true + import Phoenix.LiveViewTest + alias Mv.Membership + + describe "Global Settings LiveView" do + setup %{conn: conn} do + user = create_test_user(%{email: "admin@example.com"}) + conn = conn_with_oidc_user(conn, user) + {:ok, conn: conn, user: user} + end + + test "renders the global settings page", %{conn: conn} do + {:ok, view, html} = live(conn, ~p"/settings") + + assert html =~ "Vereinsdaten" + assert html =~ "Settings" + end + + test "displays current club name", %{conn: conn} do + # Set initial club name + {:ok, settings} = Membership.get_settings() + Membership.update_settings!(settings, %{club_name: "Test Club"}) + + {:ok, _view, html} = live(conn, ~p"/settings") + + assert html =~ "Test Club" + end + + test "can update club name via form", %{conn: conn} do + {:ok, view, _html} = live(conn, ~p"/settings") + + # Submit form with new club name + assert view + |> form("#settings-form", %{setting: %{club_name: "Updated Club Name"}}) + |> render_submit() + + # Check for success message + assert render(view) =~ "Settings updated successfully" + assert render(view) =~ "Updated Club Name" + end + + test "shows error when club_name is empty", %{conn: conn} do + {:ok, view, _html} = live(conn, ~p"/settings") + + # Submit form with empty club name + html = + view + |> form("#settings-form", %{setting: %{club_name: ""}}) + |> render_submit() + + assert html =~ "must be present" + end + + test "shows error when club_name is missing", %{conn: conn} do + {:ok, view, _html} = live(conn, ~p"/settings") + + # Submit form without club_name + html = + view + |> form("#settings-form", %{setting: %{}}) + |> render_submit() + + assert html =~ "must be present" + end + end +end From 193618eacef9baa1101fb39e1d1a12b0681b672d Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 14:56:50 +0100 Subject: [PATCH 093/119] chore: adds settings ressource and migration --- lib/membership/membership.ex | 77 ++++++++++++++++++ lib/membership/setting.ex | 80 +++++++++++++++++++ .../20251127134451_add_settings_table.exs | 31 +++++++ .../repo/settings/20251127134451.json | 67 ++++++++++++++++ 4 files changed, 255 insertions(+) create mode 100644 lib/membership/setting.ex create mode 100644 priv/repo/migrations/20251127134451_add_settings_table.exs create mode 100644 priv/resource_snapshots/repo/settings/20251127134451.json diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index 7891d2e..c9d0466 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -6,12 +6,14 @@ defmodule Mv.Membership do - `Member` - Club members with personal information and custom field values - `CustomFieldValue` - Dynamic custom field values attached to members - `CustomField` - Schema definitions for custom fields + - `Setting` - Global application settings (singleton) ## Public API The domain exposes these main actions: - Member CRUD: `create_member/1`, `list_members/0`, `update_member/2`, `destroy_member/1` - Custom field value management: `create_custom_field_value/1`, `list_custom_field_values/0`, etc. - Custom field management: `create_custom_field/1`, `list_custom_fields/0`, etc. + - Settings management: `get_settings/0`, `update_settings/2` ## Admin Interface The domain is configured with AshAdmin for management UI. @@ -45,5 +47,80 @@ defmodule Mv.Membership do define :destroy_custom_field, action: :destroy_with_values define :prepare_custom_field_deletion, action: :prepare_deletion, args: [:id] end + + resource Mv.Membership.Setting do + # Note: create action exists but is not exposed via code interface + # It's only used internally as fallback in get_settings/0 + # Settings should be created via seed script + define :update_settings, action: :update + end + end + + # Singleton pattern: Get the single settings record + @doc """ + Gets the global settings. + + Settings should normally be created via the seed script (`priv/repo/seeds.exs`). + If no settings exist, this function will create them as a fallback using the + `ASSOCIATION_NAME` environment variable or "Mitgliederverwaltung" as default. + + ## Returns + + - `{:ok, settings}` - The settings record + - `{:ok, nil}` - No settings exist (should not happen if seeds were run) + - `{:error, error}` - Error reading settings + + ## Examples + + iex> {:ok, settings} = Mv.Membership.get_settings() + iex> settings.club_name + "My Club" + + """ + def get_settings do + # Try to get the first (and only) settings record + case Ash.read_one(Mv.Membership.Setting, domain: __MODULE__) do + {:ok, nil} -> + # No settings exist - create as fallback (should normally be created via seed script) + default_club_name = System.get_env("ASSOCIATION_NAME") || "Mitgliederverwaltung" + + Mv.Membership.Setting + |> Ash.Changeset.for_create(:create, %{club_name: default_club_name}) + |> Ash.create!(domain: __MODULE__) + |> then(fn settings -> {:ok, settings} end) + + {:ok, settings} -> + {:ok, settings} + + {:error, error} -> + {:error, error} + end + end + + @doc """ + Updates the global settings. + + ## Parameters + + - `settings` - The settings record to update + - `attrs` - A map of attributes to update (e.g., `%{club_name: "New Name"}`) + + ## 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_settings(settings, %{club_name: "New Club"}) + iex> updated.club_name + "New Club" + + """ + def update_settings(settings, attrs) do + settings + |> Ash.Changeset.for_update(:update, attrs) + |> Ash.update(domain: __MODULE__) end end diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex new file mode 100644 index 0000000..47b9dd8 --- /dev/null +++ b/lib/membership/setting.ex @@ -0,0 +1,80 @@ +defmodule Mv.Membership.Setting do + @moduledoc """ + Ash resource representing global application settings. + + ## Overview + Settings is a singleton resource that stores global configuration for the association, + such as the club name and branding information. There should only ever be one settings + record in the database. + + ## Attributes + - `club_name` - The name of the association/club (required, cannot be empty) + + ## Singleton Pattern + This resource uses a singleton pattern - there should only be one settings record. + The resource is designed to be read and updated, but not created or destroyed + through normal CRUD operations. Initial settings should be seeded. + + ## Environment Variable Support + The `club_name` can be set via the `ASSOCIATION_NAME` environment variable. + If set, the environment variable value is used as a fallback when no database + value exists. Database values always take precedence over environment variables. + + ## Examples + + # Get current settings + {:ok, settings} = Mv.Membership.get_settings() + settings.club_name # => "My Club" + + # Update club name + {:ok, updated} = Mv.Membership.update_settings(settings, %{club_name: "New Name"}) + """ + use Ash.Resource, + domain: Mv.Membership, + data_layer: AshPostgres.DataLayer + + postgres do + table "settings" + repo Mv.Repo + end + + resource do + description "Global application settings (singleton resource)" + end + + actions do + defaults [:read] + + # Internal create action - not exposed via code interface + # 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] + end + + update :update do + primary? true + accept [:club_name] + end + end + + attributes do + uuid_primary_key :id + + attribute :club_name, :string, + allow_nil?: false, + public?: true, + description: "The name of the association/club", + constraints: [ + trim?: true, + min_length: 1 + ] + + timestamps() + end + + validations do + validate present(:club_name), on: [:create, :update] + validate string_length(:club_name, min: 1), on: [:create, :update] + end +end diff --git a/priv/repo/migrations/20251127134451_add_settings_table.exs b/priv/repo/migrations/20251127134451_add_settings_table.exs new file mode 100644 index 0000000..e08ba1d --- /dev/null +++ b/priv/repo/migrations/20251127134451_add_settings_table.exs @@ -0,0 +1,31 @@ +defmodule Mv.Repo.Migrations.AddSettingsTable 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 + create table(:settings, primary_key: false) do + add :id, :uuid, null: false, default: fragment("gen_random_uuid()"), primary_key: true + add :club_name, :text, null: false + + add :inserted_at, :utc_datetime_usec, + null: false, + default: fragment("(now() AT TIME ZONE 'utc')") + + add :updated_at, :utc_datetime_usec, + null: false, + default: fragment("(now() AT TIME ZONE 'utc')") + end + + # Note: Singleton pattern is enforced at application level via get_settings/0 + # which creates the record if it doesn't exist and only allows updates + end + + def down do + drop table(:settings) + end +end diff --git a/priv/resource_snapshots/repo/settings/20251127134451.json b/priv/resource_snapshots/repo/settings/20251127134451.json new file mode 100644 index 0000000..fefc223 --- /dev/null +++ b/priv/resource_snapshots/repo/settings/20251127134451.json @@ -0,0 +1,67 @@ +{ + "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?": 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": "353EB39F18B97C596A77A78A060FB9DE075AAD731F74F64AB62D357CBCDEC914", + "identities": [], + "multitenancy": { + "attribute": null, + "global": null, + "strategy": null + }, + "repo": "Elixir.Mv.Repo", + "schema": null, + "table": "settings" +} \ No newline at end of file From 37553d8d6c464e54cec760df1c8fd58e1bec3e8d Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 15:34:10 +0100 Subject: [PATCH 094/119] feat: adds settings live view and updated seeds --- lib/membership/membership.ex | 4 +- lib/membership/setting.ex | 10 +-- lib/mv_web/components/layouts/navbar.ex | 21 +++++- lib/mv_web/live/global_settings_live.ex | 97 +++++++++++++++++++++++++ lib/mv_web/router.ex | 2 + priv/repo/seeds.exs | 19 +++++ 6 files changed, 144 insertions(+), 9 deletions(-) create mode 100644 lib/mv_web/live/global_settings_live.ex diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index c9d0466..cb3691b 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -62,7 +62,7 @@ defmodule Mv.Membership do Settings should normally be created via the seed script (`priv/repo/seeds.exs`). If no settings exist, this function will create them as a fallback using the - `ASSOCIATION_NAME` environment variable or "Mitgliederverwaltung" as default. + `ASSOCIATION_NAME` environment variable or "Club Name" as default. ## Returns @@ -82,7 +82,7 @@ defmodule Mv.Membership do case Ash.read_one(Mv.Membership.Setting, domain: __MODULE__) do {:ok, nil} -> # No settings exist - create as fallback (should normally be created via seed script) - default_club_name = System.get_env("ASSOCIATION_NAME") || "Mitgliederverwaltung" + default_club_name = System.get_env("ASSOCIATION_NAME") || "Club Name" Mv.Membership.Setting |> Ash.Changeset.for_create(:create, %{club_name: default_club_name}) diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex index 47b9dd8..38624dc 100644 --- a/lib/membership/setting.ex +++ b/lib/membership/setting.ex @@ -58,6 +58,11 @@ defmodule Mv.Membership.Setting do end end + validations do + validate present(:club_name), on: [:create, :update] + validate string_length(:club_name, min: 1), on: [:create, :update] + end + attributes do uuid_primary_key :id @@ -72,9 +77,4 @@ defmodule Mv.Membership.Setting do timestamps() end - - validations do - validate present(:club_name), on: [:create, :update] - validate string_length(:club_name, min: 1), on: [:create, :update] - end end diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex index 1de4c7f..7ff7f25 100644 --- a/lib/mv_web/components/layouts/navbar.ex +++ b/lib/mv_web/components/layouts/navbar.ex @@ -6,15 +6,21 @@ defmodule MvWeb.Layouts.Navbar do use Gettext, backend: MvWeb.Gettext use MvWeb, :verified_routes + alias Mv.Membership + attr :current_user, :map, required: true, doc: "The current user - navbar is only shown when user is present" def navbar(assigns) do + club_name = get_club_name() + + assigns = assign(assigns, :club_name, club_name) + ~H"""
- Mitgliederverwaltung + {@club_name}
  • <.link navigate="/members">{gettext("Members")}
  • <.link navigate="/custom_fields">{gettext("Custom Fields")}
    • @@ -89,7 +95,9 @@ defmodule MvWeb.Layouts.Navbar do {gettext("Profil")} -
  • {gettext("Settings")}
    • +
  • + <.link navigate={~p"/settings"}>{gettext("Settings")} +
  • <.link href={~p"/sign-out"}>{gettext("Logout")}
    • @@ -99,4 +107,13 @@ defmodule MvWeb.Layouts.Navbar do
""" end + + # Helper function to get club name from settings + # Falls back to "Mitgliederverwaltung" if settings can't be loaded + defp get_club_name do + case Membership.get_settings() do + {:ok, settings} -> settings.club_name + _ -> "Mitgliederverwaltung" + end + end end diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex new file mode 100644 index 0000000..0be4559 --- /dev/null +++ b/lib/mv_web/live/global_settings_live.ex @@ -0,0 +1,97 @@ +defmodule MvWeb.GlobalSettingsLive do + @moduledoc """ + LiveView for managing global application settings (Vereinsdaten). + + ## Features + - Edit the association/club name + - Real-time form validation + - Success/error feedback + + ## Settings + - `club_name` - The name of the association/club (required) + + ## Events + - `validate` - Real-time form validation + - `save` - Save settings changes + + ## Note + Settings is a singleton resource - there is only one settings record. + The club_name can also be set via the `ASSOCIATION_NAME` environment variable. + """ + use MvWeb, :live_view + + alias Mv.Membership + + @impl true + def mount(_params, _session, socket) do + {:ok, settings} = Membership.get_settings() + + {:ok, + socket + |> assign(:page_title, gettext("Club Settings")) + |> assign(:settings, settings) + |> assign_form()} + end + + @impl true + def render(assigns) do + ~H""" + + <.header> + {gettext("Club Settings")} + <:subtitle> + {gettext("Manage global settings for the association.")} + + + + <.form for={@form} id="settings-form" phx-change="validate" phx-submit="save"> + <.input + field={@form[:club_name]} + type="text" + label={gettext("Association Name")} + required + /> + + <.button phx-disable-with={gettext("Saving...")} variant="primary"> + {gettext("Save Settings")} + + + + """ + end + + @impl true + def handle_event("validate", %{"setting" => setting_params}, socket) do + {:noreply, + assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, setting_params))} + end + + def handle_event("save", %{"setting" => setting_params}, socket) do + case AshPhoenix.Form.submit(socket.assigns.form, params: setting_params) do + {:ok, updated_settings} -> + socket = + socket + |> assign(:settings, updated_settings) + |> put_flash(:info, gettext("Settings updated successfully")) + |> assign_form() + + {:noreply, socket} + + {:error, form} -> + {:noreply, assign(socket, form: form)} + end + end + + defp assign_form(%{assigns: %{settings: settings}} = socket) do + form = + AshPhoenix.Form.for_update( + settings, + :update, + api: Membership, + as: "setting", + forms: [auto?: true] + ) + + assign(socket, form: to_form(form)) + end +end diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex index d2a63bc..09a2792 100644 --- a/lib/mv_web/router.ex +++ b/lib/mv_web/router.ex @@ -73,6 +73,8 @@ defmodule MvWeb.Router do live "/users/:id", UserLive.Show, :show live "/users/:id/show/edit", UserLive.Show, :edit + live "/settings", GlobalSettingsLive + post "/set_locale", LocaleController, :set_locale end diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 8d3cb6f..00cf657 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -323,8 +323,27 @@ if friedrich = find_member.("friedrich.wagner@example.de") do end) end +# Create or update global settings (singleton) +default_club_name = System.get_env("ASSOCIATION_NAME") || "Club Name" + +case Membership.get_settings() do + {:ok, existing_settings} -> + # Settings exist, update if club_name is different from env var + if existing_settings.club_name != default_club_name do + {:ok, _updated} = + Membership.update_settings(existing_settings, %{club_name: default_club_name}) + end + + {:ok, nil} -> + # Settings don't exist, create them + Mv.Membership.Setting + |> Ash.Changeset.for_create(:create, %{club_name: default_club_name}) + |> Ash.create!(domain: Mv.Membership) +end + IO.puts("✅ Seeds completed successfully!") IO.puts("📝 Created sample data:") +IO.puts(" - Global settings: club_name = #{default_club_name}") IO.puts(" - Custom fields: 12 fields (String, Date, Boolean, Email, + 8 realistic fields)") IO.puts(" - Admin user: admin@mv.local (password: testpassword)") IO.puts(" - Sample members: Hans, Greta, Friedrich") From fdae610da02994e78eba2eda62b4595575f0dc52 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 15:37:42 +0100 Subject: [PATCH 095/119] adds translation --- priv/gettext/de/LC_MESSAGES/default.po | 46 ++++++++++++++++++++------ priv/gettext/default.pot | 45 +++++++++++++++++++------ priv/gettext/en/LC_MESSAGES/default.po | 45 +++++++++++++++++++------ 3 files changed, 106 insertions(+), 30 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 27acc80..f144198 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -160,6 +160,7 @@ msgstr "Mitglied speichern" #: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 +#: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format @@ -293,7 +294,7 @@ msgstr "ID" msgid "Immutable" msgstr "Unveränderlich" -#: lib/mv_web/components/layouts/navbar.ex:94 +#: lib/mv_web/components/layouts/navbar.ex:102 #, elixir-autogen, elixir-format msgid "Logout" msgstr "Abmelden" @@ -309,8 +310,8 @@ msgstr "Benutzer*innen auflisten" msgid "Member" msgstr "Mitglied" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/components/layouts/navbar.ex:25 +#: lib/mv_web/live/member_live/index.ex:39 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -354,7 +355,7 @@ msgstr "OIDC ID" msgid "Password Authentication" msgstr "Passwort-Authentifizierung" -#: lib/mv_web/components/layouts/navbar.ex:89 +#: lib/mv_web/components/layouts/navbar.ex:95 #, elixir-autogen, elixir-format msgid "Profil" msgstr "Profil" @@ -374,7 +375,7 @@ msgstr "Alle Mitglieder auswählen" msgid "Select member" msgstr "Mitglied auswählen" -#: lib/mv_web/components/layouts/navbar.ex:92 +#: lib/mv_web/components/layouts/navbar.ex:99 #, elixir-autogen, elixir-format msgid "Settings" msgstr "Einstellungen" @@ -542,14 +543,14 @@ msgstr "Zurück zur Mitgliederliste" msgid "Back to users list" msgstr "Zurück zur Benutzer*innen-Liste" -#: lib/mv_web/components/layouts/navbar.ex:27 #: lib/mv_web/components/layouts/navbar.ex:33 +#: lib/mv_web/components/layouts/navbar.ex:39 #, elixir-autogen, elixir-format msgid "Select language" msgstr "Sprache auswählen" -#: lib/mv_web/components/layouts/navbar.ex:40 -#: lib/mv_web/components/layouts/navbar.ex:60 +#: lib/mv_web/components/layouts/navbar.ex:46 +#: lib/mv_web/components/layouts/navbar.ex:66 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "Dunklen Modus umschalten" @@ -560,7 +561,7 @@ msgstr "Dunklen Modus umschalten" msgid "Search..." msgstr "Suchen..." -#: lib/mv_web/components/layouts/navbar.ex:21 +#: lib/mv_web/components/layouts/navbar.ex:27 #, elixir-autogen, elixir-format msgid "Users" msgstr "Benutzer*innen" @@ -653,7 +654,7 @@ msgstr "Benutzerdefinierten Feldwert speichern" msgid "Use this form to manage custom_field records in your database." msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten." -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:26 #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" @@ -753,6 +754,31 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Show in overview" msgstr "In der Mitglieder-Übersicht anzeigen" +#: lib/mv_web/live/global_settings_live.ex:51 +#, elixir-autogen, elixir-format +msgid "Association Name" +msgstr "Vereinsname" + +#: lib/mv_web/live/global_settings_live.ex:31 +#: lib/mv_web/live/global_settings_live.ex:41 +#, elixir-autogen, elixir-format, fuzzy +msgid "Club Settings" +msgstr "Vereinsdaten" + +#: lib/mv_web/live/global_settings_live.ex:43 +#, elixir-autogen, elixir-format +msgid "Manage global settings for the association." +msgstr "Passe übergreifende Einstellungen für den Verein an." + +#: lib/mv_web/live/global_settings_live.ex:56 +#, elixir-autogen, elixir-format, fuzzy +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: lib/mv_web/live/global_settings_live.ex:75 +#, elixir-autogen, elixir-format +msgid "Settings updated successfully" +msgstr "Einstellungen erfolgreich gespeichert" #~ #: lib/mv_web/live/custom_field_live/index.ex:97 #~ #, elixir-autogen, elixir-format diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 7cf507b..a5e9aa9 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -161,6 +161,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 +#: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format @@ -294,7 +295,7 @@ msgstr "" msgid "Immutable" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:94 +#: lib/mv_web/components/layouts/navbar.ex:102 #, elixir-autogen, elixir-format msgid "Logout" msgstr "" @@ -310,8 +311,8 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/components/layouts/navbar.ex:25 +#: lib/mv_web/live/member_live/index.ex:39 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -355,7 +356,7 @@ msgstr "" msgid "Password Authentication" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:89 +#: lib/mv_web/components/layouts/navbar.ex:95 #, elixir-autogen, elixir-format msgid "Profil" msgstr "" @@ -375,7 +376,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:92 +#: lib/mv_web/components/layouts/navbar.ex:99 #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -543,14 +544,14 @@ msgstr "" msgid "Back to users list" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:27 #: lib/mv_web/components/layouts/navbar.ex:33 +#: lib/mv_web/components/layouts/navbar.ex:39 #, elixir-autogen, elixir-format msgid "Select language" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:40 -#: lib/mv_web/components/layouts/navbar.ex:60 +#: lib/mv_web/components/layouts/navbar.ex:46 +#: lib/mv_web/components/layouts/navbar.ex:66 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "" @@ -561,7 +562,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:21 +#: lib/mv_web/components/layouts/navbar.ex:27 #, elixir-autogen, elixir-format msgid "Users" msgstr "" @@ -654,7 +655,7 @@ msgstr "" msgid "Use this form to manage custom_field records in your database." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:26 #, elixir-autogen, elixir-format msgid "Custom Fields" msgstr "" @@ -704,4 +705,28 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format msgid "Show in overview" +#: lib/mv_web/live/global_settings_live.ex:51 +#, elixir-autogen, elixir-format +msgid "Association Name" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:31 +#: lib/mv_web/live/global_settings_live.ex:41 +#, elixir-autogen, elixir-format +msgid "Club Settings" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:43 +#, elixir-autogen, elixir-format +msgid "Manage global settings for the association." +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:56 +#, elixir-autogen, elixir-format +msgid "Save Settings" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:75 +#, elixir-autogen, elixir-format +msgid "Settings updated successfully" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index ed38b0e..19be444 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -161,6 +161,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:66 #: lib/mv_web/live/custom_field_value_live/form.ex:74 +#: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 #: lib/mv_web/live/user_live/form.ex:234 #, elixir-autogen, elixir-format @@ -294,7 +295,7 @@ msgstr "" msgid "Immutable" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:94 +#: lib/mv_web/components/layouts/navbar.ex:102 #, elixir-autogen, elixir-format msgid "Logout" msgstr "" @@ -310,8 +311,8 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:19 -#: lib/mv_web/live/member_live/index.ex:57 +#: lib/mv_web/components/layouts/navbar.ex:25 +#: lib/mv_web/live/member_live/index.ex:39 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -355,7 +356,7 @@ msgstr "" msgid "Password Authentication" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:89 +#: lib/mv_web/components/layouts/navbar.ex:95 #, elixir-autogen, elixir-format msgid "Profil" msgstr "" @@ -375,7 +376,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:92 +#: lib/mv_web/components/layouts/navbar.ex:99 #, elixir-autogen, elixir-format msgid "Settings" msgstr "" @@ -543,14 +544,14 @@ msgstr "" msgid "Back to users list" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:27 #: lib/mv_web/components/layouts/navbar.ex:33 +#: lib/mv_web/components/layouts/navbar.ex:39 #, elixir-autogen, elixir-format, fuzzy msgid "Select language" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:40 -#: lib/mv_web/components/layouts/navbar.ex:60 +#: lib/mv_web/components/layouts/navbar.ex:46 +#: lib/mv_web/components/layouts/navbar.ex:66 #, elixir-autogen, elixir-format msgid "Toggle dark mode" msgstr "" @@ -561,7 +562,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:21 +#: lib/mv_web/components/layouts/navbar.ex:27 #, elixir-autogen, elixir-format, fuzzy msgid "Users" msgstr "" @@ -654,7 +655,7 @@ msgstr "" msgid "Use this form to manage custom_field records in your database." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex:20 +#: lib/mv_web/components/layouts/navbar.ex:26 #, elixir-autogen, elixir-format, fuzzy msgid "Custom Fields" msgstr "" @@ -753,6 +754,30 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format msgid "Show in overview" +#: lib/mv_web/live/global_settings_live.ex:51 +#, elixir-autogen, elixir-format +msgid "Association Name" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:31 +#: lib/mv_web/live/global_settings_live.ex:41 +#, elixir-autogen, elixir-format, fuzzy +msgid "Club Settings" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:43 +#, elixir-autogen, elixir-format +msgid "Manage global settings for the association." +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:56 +#, elixir-autogen, elixir-format, fuzzy +msgid "Save Settings" +msgstr "" + +#: lib/mv_web/live/global_settings_live.ex:75 +#, elixir-autogen, elixir-format +msgid "Settings updated successfully" msgstr "" #~ #: lib/mv_web/live/custom_field_live/index.ex:97 From cf354bcf2513d37a5f9b32d028b214ad697c7874 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 15:49:29 +0100 Subject: [PATCH 096/119] test updated --- test/membership/setting_test.exs | 8 +++----- test/mv_web/components/layouts/navbar_test.exs | 2 +- test/mv_web/controllers/page_controller_test.exs | 11 ++++++----- test/mv_web/live/global_settings_live_test.exs | 11 ++++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/membership/setting_test.exs b/test/membership/setting_test.exs index 46cf3b9..531ab88 100644 --- a/test/membership/setting_test.exs +++ b/test/membership/setting_test.exs @@ -44,10 +44,8 @@ defmodule Mv.Membership.SettingTest do # Helper function to extract error messages defp error_message(errors, field) do errors - |> Enum.find(fn error -> error.field == field end) - |> case do - nil -> "" - error -> List.first(error.message) || "" - end + |> Enum.filter(fn err -> Map.get(err, :field) == field end) + |> Enum.map(&Map.get(&1, :message, "")) + |> List.first() || "" end end diff --git a/test/mv_web/components/layouts/navbar_test.exs b/test/mv_web/components/layouts/navbar_test.exs index 6a50996..7836ee6 100644 --- a/test/mv_web/components/layouts/navbar_test.exs +++ b/test/mv_web/components/layouts/navbar_test.exs @@ -100,7 +100,7 @@ defmodule MvWeb.Layouts.NavbarTest do # Verify the link actually works by navigating to it {:ok, _view, settings_html} = live(conn, ~p"/settings") - assert settings_html =~ "Vereinsdaten" + assert settings_html =~ "Club Settings" end end end diff --git a/test/mv_web/controllers/page_controller_test.exs b/test/mv_web/controllers/page_controller_test.exs index ce3195b..1dfcf2b 100644 --- a/test/mv_web/controllers/page_controller_test.exs +++ b/test/mv_web/controllers/page_controller_test.exs @@ -1,10 +1,11 @@ defmodule MvWeb.PageControllerTest do - use MvWeb.ConnCase + use MvWeb.ConnCase, async: true - test "GET /", %{conn: conn} do - conn = conn_with_oidc_user(conn) + test "renders home template successfully with authenticated user", %{conn: conn} do + user = create_test_user(%{email: "test@example.com"}) + conn = conn_with_oidc_user(conn, user) + conn = get(conn, "/") - conn = get(conn, ~p"/") - assert html_response(conn, 200) =~ "Mitgliederverwaltung" + assert html_response(conn, 200) end end diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index f06deb1..6a739b5 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -11,16 +11,16 @@ defmodule MvWeb.GlobalSettingsLiveTest do end test "renders the global settings page", %{conn: conn} do - {:ok, view, html} = live(conn, ~p"/settings") + {:ok, _view, html} = live(conn, ~p"/settings") - assert html =~ "Vereinsdaten" + assert html =~ "Club Settings" assert html =~ "Settings" end test "displays current club name", %{conn: conn} do # Set initial club name {:ok, settings} = Membership.get_settings() - Membership.update_settings!(settings, %{club_name: "Test Club"}) + {:ok, _updated} = Membership.update_settings(settings, %{club_name: "Test Club"}) {:ok, _view, html} = live(conn, ~p"/settings") @@ -55,10 +55,11 @@ defmodule MvWeb.GlobalSettingsLiveTest do test "shows error when club_name is missing", %{conn: conn} do {:ok, view, _html} = live(conn, ~p"/settings") - # Submit form without club_name + # Submit form with club_name explicitly set to empty string + # (Phoenix forms will keep existing value if field is omitted) html = view - |> form("#settings-form", %{setting: %{}}) + |> form("#settings-form", %{setting: %{club_name: ""}}) |> render_submit() assert html =~ "must be present" From dfdf4c980b29eeddb55f5d7056f9d5c2def7b480 Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 27 Nov 2025 15:56:20 +0100 Subject: [PATCH 097/119] chore: updated env example --- .env.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 7559b0a..13154f3 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,9 @@ TOKEN_SIGNING_SECRET=changeme-run-mix-phx.gen.secret # Required: Hostname for URL generation PHX_HOST=localhost +# Recommended: Association settings +ASSOCIATION_NAME="Sportsclub XYZ" + # Optional: OIDC Configuration # These have defaults in docker-compose.prod.yml, only override if needed # OIDC_CLIENT_ID=mv From f9ff6d3d2dc7ae70968e75381a07976b5a3da206 Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 1 Dec 2025 10:54:12 +0100 Subject: [PATCH 098/119] fix: remove unused branch in seeds and fixed translations --- priv/gettext/de/LC_MESSAGES/default.po | 128 ++++++++++++------------ priv/gettext/default.pot | 80 ++++++++++++--- priv/gettext/en/LC_MESSAGES/default.po | 129 +++++++++++++------------ priv/repo/seeds.exs | 6 -- 4 files changed, 197 insertions(+), 146 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index f144198..e9214fc 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -16,7 +16,7 @@ msgid "Actions" msgstr "Aktionen" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "Bist du sicher?" @@ -35,14 +35,14 @@ msgid "City" msgstr "Stadt" #: lib/mv_web/live/member_live/index.html.heex:204 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:265 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "Bearbeite" @@ -88,7 +88,7 @@ msgid "New Member" msgstr "Neues Mitglied" #: lib/mv_web/live/member_live/index.html.heex:193 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "Anzeigen" @@ -162,7 +162,7 @@ msgstr "Mitglied speichern" #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:234 +#: lib/mv_web/live/user_live/form.ex:248 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "Speichern..." @@ -184,7 +184,7 @@ msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenscha msgid "Id" msgstr "ID" -#: lib/mv_web/live/member_live/index/formatter.ex:65 +#: lib/mv_web/live/member_live/index/formatter.ex:61 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -200,7 +200,7 @@ msgstr "Mitglied anzeigen" msgid "This is a member record from your database." msgstr "Dies ist ein Mitglied aus deiner Datenbank." -#: lib/mv_web/live/member_live/index/formatter.ex:64 +#: lib/mv_web/live/member_live/index/formatter.ex:60 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" @@ -259,7 +259,7 @@ msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:237 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "Abbrechen" @@ -311,7 +311,7 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -339,7 +339,7 @@ msgstr "Nicht gesetzt" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 -#: lib/mv_web/live/user_live/form.ex:210 +#: lib/mv_web/live/user_live/form.ex:224 #, elixir-autogen, elixir-format msgid "Note" msgstr "Hinweis" @@ -380,7 +380,7 @@ msgstr "Mitglied auswählen" msgid "Settings" msgstr "Einstellungen" -#: lib/mv_web/live/user_live/form.ex:235 +#: lib/mv_web/live/user_live/form.ex:249 #, elixir-autogen, elixir-format msgid "Save User" msgstr "Benutzer*in speichern" @@ -405,7 +405,7 @@ msgstr "Nicht unterstützter Wertetyp: %{type}" msgid "Use this form to manage user records in your database." msgstr "Verwenden Sie dieses Formular, um Benutzer*innen-Datensätze zu verwalten." -#: lib/mv_web/live/user_live/form.ex:252 +#: lib/mv_web/live/user_live/form.ex:266 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -433,7 +433,7 @@ msgstr "aufsteigend" msgid "descending" msgstr "absteigend" -#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/form.ex:265 #, elixir-autogen, elixir-format msgid "New" msgstr "Neue*r" @@ -701,59 +701,11 @@ msgstr "Obigen Text zur Bestätigung eingeben" msgid "To confirm deletion, please enter this text:" msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:" -#: lib/mv_web/live/user_live/form.ex:210 -#, elixir-autogen, elixir-format -msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." -msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem anderen Mitglied zu verknüpfen, ändern Sie bitte zuerst eine der E-Mail-Adressen." - -#: lib/mv_web/live/user_live/form.ex:185 -#, elixir-autogen, elixir-format -msgid "Available members" -msgstr "Verfügbare Mitglieder" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Member will be unlinked when you save. Cannot select new member until saved." -msgstr "Mitglied wird beim Speichern entverknüpft. Neues Mitglied kann erst nach dem Speichern ausgewählt werden." - -#: lib/mv_web/live/user_live/form.ex:226 -#, elixir-autogen, elixir-format -msgid "Save to confirm linking." -msgstr "Speichern, um die Verknüpfung zu bestätigen." - -#: lib/mv_web/live/user_live/form.ex:169 -#, elixir-autogen, elixir-format -msgid "Search for a member to link..." -msgstr "Nach einem Mitglied zum Verknüpfen suchen..." - -#: lib/mv_web/live/user_live/form.ex:173 -#, elixir-autogen, elixir-format -msgid "Search for member to link" -msgstr "Nach Mitglied zum Verknüpfen suchen" - -#: lib/mv_web/live/user_live/form.ex:223 -#, elixir-autogen, elixir-format -msgid "Selected" -msgstr "Ausgewählt" - -#: lib/mv_web/live/user_live/form.ex:143 -#, elixir-autogen, elixir-format -msgid "Unlink Member" -msgstr "Mitglied entverknüpfen" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Unlinking scheduled" -msgstr "Entverknüpfung geplant" - -#: lib/mv_web/live/user_live/form.ex:342 -#, elixir-autogen, elixir-format -msgid "Failed to link member: %{error}" -msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format msgid "Show in overview" msgstr "In der Mitglieder-Übersicht anzeigen" + #: lib/mv_web/live/global_settings_live.ex:51 #, elixir-autogen, elixir-format msgid "Association Name" @@ -780,6 +732,56 @@ msgstr "Einstellungen speichern" msgid "Settings updated successfully" msgstr "Einstellungen erfolgreich gespeichert" +#: lib/mv_web/live/user_live/form.ex:224 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem anderen Mitglied zu verknüpfen, ändern Sie bitte zuerst eine der E-Mail-Adressen." + +#: lib/mv_web/live/user_live/form.ex:192 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "Verfügbare Mitglieder" + +#: lib/mv_web/live/user_live/form.ex:357 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "Fehler beim Verlinken des Mitglieds: %{error}" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "Mitglied wird beim Speichern entverknüpft. Neues Mitglied kann erst nach dem Speichern ausgewählt werden." + +#: lib/mv_web/live/user_live/form.ex:240 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "Speichern, um die Verknüpfung zu bestätigen." + +#: lib/mv_web/live/user_live/form.ex:171 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "Nach einem Mitglied zum Verknüpfen suchen..." + +#: lib/mv_web/live/user_live/form.ex:175 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "Nach Mitglied zum Verknüpfen suchen" + +#: lib/mv_web/live/user_live/form.ex:237 +#, elixir-autogen, elixir-format +msgid "Selected" +msgstr "Ausgewählt" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "Mitglied entverknüpfen" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +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:" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index a5e9aa9..47fe4dd 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -17,7 +17,7 @@ msgid "Actions" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -36,14 +36,14 @@ msgid "City" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:204 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:265 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -89,7 +89,7 @@ msgid "New Member" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:193 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:234 +#: lib/mv_web/live/user_live/form.ex:248 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "" @@ -185,7 +185,7 @@ msgstr "" msgid "Id" msgstr "" -#: lib/mv_web/live/member_live/index/formatter.ex:65 +#: lib/mv_web/live/member_live/index/formatter.ex:61 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -201,7 +201,7 @@ msgstr "" msgid "This is a member record from your database." msgstr "" -#: lib/mv_web/live/member_live/index/formatter.ex:64 +#: lib/mv_web/live/member_live/index/formatter.ex:60 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" @@ -260,7 +260,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:237 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -340,7 +340,7 @@ msgstr "" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 -#: lib/mv_web/live/user_live/form.ex:210 +#: lib/mv_web/live/user_live/form.ex:224 #, elixir-autogen, elixir-format msgid "Note" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Settings" msgstr "" -#: lib/mv_web/live/user_live/form.ex:235 +#: lib/mv_web/live/user_live/form.ex:249 #, elixir-autogen, elixir-format msgid "Save User" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "Use this form to manage user records in your database." msgstr "" -#: lib/mv_web/live/user_live/form.ex:252 +#: lib/mv_web/live/user_live/form.ex:266 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -434,7 +434,7 @@ msgstr "" msgid "descending" msgstr "" -#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/form.ex:265 #, elixir-autogen, elixir-format msgid "New" msgstr "" @@ -705,6 +705,8 @@ msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format msgid "Show in overview" +msgstr "" + #: lib/mv_web/live/global_settings_live.ex:51 #, elixir-autogen, elixir-format msgid "Association Name" @@ -730,3 +732,53 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Settings updated successfully" msgstr "" + +#: lib/mv_web/live/user_live/form.ex:224 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:192 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:357 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:240 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:171 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:175 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:237 +#, elixir-autogen, elixir-format +msgid "Selected" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Unlinking scheduled" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 19be444..a9e59e8 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -17,7 +17,7 @@ msgid "Actions" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:202 -#: lib/mv_web/live/user_live/index.html.heex:65 +#: lib/mv_web/live/user_live/index.html.heex:72 #, elixir-autogen, elixir-format msgid "Are you sure?" msgstr "" @@ -36,14 +36,14 @@ msgid "City" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:204 -#: lib/mv_web/live/user_live/index.html.heex:67 +#: 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/user_live/form.ex:141 -#: lib/mv_web/live/user_live/index.html.heex:59 +#: lib/mv_web/live/user_live/form.ex:265 +#: lib/mv_web/live/user_live/index.html.heex:66 #, elixir-autogen, elixir-format msgid "Edit" msgstr "" @@ -89,7 +89,7 @@ msgid "New Member" msgstr "" #: lib/mv_web/live/member_live/index.html.heex:193 -#: lib/mv_web/live/user_live/index.html.heex:56 +#: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: lib/mv_web/live/custom_field_value_live/form.ex:74 #: lib/mv_web/live/global_settings_live.ex:55 #: lib/mv_web/live/member_live/form.ex:79 -#: lib/mv_web/live/user_live/form.ex:234 +#: lib/mv_web/live/user_live/form.ex:248 #, elixir-autogen, elixir-format msgid "Saving..." msgstr "" @@ -185,7 +185,7 @@ msgstr "" msgid "Id" msgstr "" -#: lib/mv_web/live/member_live/index/formatter.ex:65 +#: lib/mv_web/live/member_live/index/formatter.ex:61 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "No" @@ -201,7 +201,7 @@ msgstr "" msgid "This is a member record from your database." msgstr "" -#: lib/mv_web/live/member_live/index/formatter.ex:64 +#: lib/mv_web/live/member_live/index/formatter.ex:60 #: lib/mv_web/live/member_live/show.ex:53 #, elixir-autogen, elixir-format msgid "Yes" @@ -260,7 +260,7 @@ msgstr "" #: lib/mv_web/live/custom_field_live/index.ex:120 #: lib/mv_web/live/custom_field_value_live/form.ex:77 #: lib/mv_web/live/member_live/form.ex:82 -#: lib/mv_web/live/user_live/form.ex:237 +#: lib/mv_web/live/user_live/form.ex:251 #, elixir-autogen, elixir-format msgid "Cancel" msgstr "" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:39 +#: lib/mv_web/live/member_live/index.ex:57 #: lib/mv_web/live/member_live/index.html.heex:3 #, elixir-autogen, elixir-format msgid "Members" @@ -340,7 +340,7 @@ msgstr "" #: lib/mv_web/live/user_live/form.ex:107 #: lib/mv_web/live/user_live/form.ex:115 -#: lib/mv_web/live/user_live/form.ex:210 +#: lib/mv_web/live/user_live/form.ex:224 #, elixir-autogen, elixir-format, fuzzy msgid "Note" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Settings" msgstr "" -#: lib/mv_web/live/user_live/form.ex:235 +#: lib/mv_web/live/user_live/form.ex:249 #, elixir-autogen, elixir-format, fuzzy msgid "Save User" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "Use this form to manage user records in your database." msgstr "" -#: lib/mv_web/live/user_live/form.ex:252 +#: lib/mv_web/live/user_live/form.ex:266 #: lib/mv_web/live/user_live/show.ex:34 #, elixir-autogen, elixir-format msgid "User" @@ -434,7 +434,7 @@ msgstr "" msgid "descending" msgstr "" -#: lib/mv_web/live/user_live/form.ex:251 +#: lib/mv_web/live/user_live/form.ex:265 #, elixir-autogen, elixir-format msgid "New" msgstr "" @@ -702,58 +702,11 @@ msgstr "" msgid "To confirm deletion, please enter this text:" msgstr "" -#: lib/mv_web/live/user_live/form.ex:210 -#, elixir-autogen, elixir-format -msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:185 -#, elixir-autogen, elixir-format -msgid "Available members" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Member will be unlinked when you save. Cannot select new member until saved." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:226 -#, elixir-autogen, elixir-format -msgid "Save to confirm linking." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:169 -#, elixir-autogen, elixir-format -msgid "Search for a member to link..." -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:173 -#, elixir-autogen, elixir-format -msgid "Search for member to link" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:223 -#, elixir-autogen, elixir-format, fuzzy -msgid "Selected" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:143 -#, elixir-autogen, elixir-format -msgid "Unlink Member" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:152 -#, elixir-autogen, elixir-format -msgid "Unlinking scheduled" -msgstr "" - -#: lib/mv_web/live/user_live/form.ex:342 -#, elixir-autogen, elixir-format -msgid "Failed to link member: %{error}" -msgstr "" #: lib/mv_web/live/custom_field_live/form.ex:64 #, elixir-autogen, elixir-format msgid "Show in overview" +msgstr "" + #: lib/mv_web/live/global_settings_live.ex:51 #, elixir-autogen, elixir-format msgid "Association Name" @@ -780,6 +733,56 @@ msgstr "" msgid "Settings updated successfully" msgstr "" +#: lib/mv_web/live/user_live/form.ex:224 +#, elixir-autogen, elixir-format +msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:192 +#, elixir-autogen, elixir-format +msgid "Available members" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:357 +#, elixir-autogen, elixir-format +msgid "Failed to link member: %{error}" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +msgid "Member will be unlinked when you save. Cannot select new member until saved." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:240 +#, elixir-autogen, elixir-format +msgid "Save to confirm linking." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:171 +#, elixir-autogen, elixir-format +msgid "Search for a member to link..." +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:175 +#, elixir-autogen, elixir-format +msgid "Search for member to link" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:237 +#, elixir-autogen, elixir-format, fuzzy +msgid "Selected" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:143 +#, elixir-autogen, elixir-format +msgid "Unlink Member" +msgstr "" + +#: lib/mv_web/live/user_live/form.ex:152 +#, elixir-autogen, elixir-format +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:" diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 00cf657..542e559 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -333,12 +333,6 @@ case Membership.get_settings() do {:ok, _updated} = Membership.update_settings(existing_settings, %{club_name: default_club_name}) end - - {:ok, nil} -> - # Settings don't exist, create them - Mv.Membership.Setting - |> Ash.Changeset.for_create(:create, %{club_name: default_club_name}) - |> Ash.create!(domain: Mv.Membership) end IO.puts("✅ Seeds completed successfully!") From e2ace3d2a8b53fb87b67f083f1e83cdfaa782463 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 2 Dec 2025 10:02:58 +0100 Subject: [PATCH 099/119] 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 100/119] 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 101/119] 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 d10f2ecc90046b62841d9399c4efc4df8c1492fd Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 2 Dec 2025 08:45:18 +0100 Subject: [PATCH 102/119] 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 103/119] 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 104/119] 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 105/119] 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 106/119] 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 107/119] 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 108/119] 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) From c8968636a8235d92eec8e38de08f52cc23b9027f Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 2 Dec 2025 14:58:50 +0100 Subject: [PATCH 109/119] feat: remove birth_date field from Member resource Users who need birthday data can use custom fields instead. Closes #161 --- docs/database-schema-readme.md | 5 +- docs/database_schema.dbml | 4 +- docs/feature-roadmap.md | 2 +- lib/membership/member.ex | 11 +-- lib/mv/constants.ex | 1 - lib/mv_web/live/member_live/form.ex | 3 +- lib/mv_web/live/member_live/show.ex | 3 +- ...2145404_remove_birth_date_from_members.exs | 69 +++++++++++++++++++ priv/repo/seeds.exs | 6 -- test/membership/member_test.exs | 7 -- 10 files changed, 76 insertions(+), 35 deletions(-) create mode 100644 priv/repo/migrations/20251202145404_remove_birth_date_from_members.exs diff --git a/docs/database-schema-readme.md b/docs/database-schema-readme.md index d548b82..1644f2a 100644 --- a/docs/database-schema-readme.md +++ b/docs/database-schema-readme.md @@ -115,7 +115,6 @@ Member (1) → (N) Properties ### Member Constraints - First name and last name required (min 1 char) - Email unique, validated format (5-254 chars) -- Birth date cannot be in future - Join date cannot be in future - Exit date must be after join date - Phone: `+?[0-9\- ]{6,20}` @@ -169,7 +168,7 @@ Member (1) → (N) Properties ### Weighted Fields - **Weight A (highest):** first_name, last_name - **Weight B:** email, notes -- **Weight C:** birth_date, phone_number, city, street, house_number, postal_code +- **Weight C:** phone_number, city, street, house_number, postal_code - **Weight D (lowest):** join_date, exit_date ### Usage Example @@ -381,7 +380,7 @@ Install "DBML Language" extension to view/edit DBML files with: - tokens (jti, purpose, extra_data) **Personal Data (GDPR):** -- All member fields (name, email, birth_date, address) +- All member fields (name, email, address) - User email - Token subject diff --git a/docs/database_schema.dbml b/docs/database_schema.dbml index 33c0647..b620830 100644 --- a/docs/database_schema.dbml +++ b/docs/database_schema.dbml @@ -122,7 +122,6 @@ Table members { first_name text [not null, note: 'Member first name (min length: 1)'] last_name text [not null, note: 'Member last name (min length: 1)'] email text [not null, unique, note: 'Member email address (5-254 chars, validated)'] - birth_date date [null, note: 'Date of birth (cannot be in future)'] paid boolean [null, note: 'Payment status flag'] phone_number text [null, note: 'Contact phone number (format: +?[0-9\- ]{6,20})'] join_date date [null, note: 'Date when member joined club (cannot be in future)'] @@ -153,7 +152,7 @@ Table members { **Club Member Master Data** Core entity for membership management containing: - - Personal information (name, birth date, email) + - Personal information (name, email) - Contact details (phone, address) - Membership status (join/exit dates, payment status) - Additional notes @@ -183,7 +182,6 @@ Table members { **Validation Rules:** - first_name, last_name: min 1 character - email: 5-254 characters, valid email format - - birth_date: cannot be in future - join_date: cannot be in future - exit_date: must be after join_date (if both present) - phone_number: matches pattern ^\+?[0-9\- ]{6,20}$ diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md index 60432d0..609523c 100644 --- a/docs/feature-roadmap.md +++ b/docs/feature-roadmap.md @@ -100,10 +100,10 @@ **Closed Issues:** - [#194](https://git.local-it.org/local-it/mitgliederverwaltung/issues/194) - Custom Fields: Harden implementation (S) - [#197](https://git.local-it.org/local-it/mitgliederverwaltung/issues/197) - Custom Fields: Add option to show custom fields in member overview (M) +- [#161](https://git.local-it.org/local-it/mitgliederverwaltung/issues/161) - Remove birthday field from default configuration (S) - Closed 2025-12-02 **Open Issues:** - [#157](https://git.local-it.org/local-it/mitgliederverwaltung/issues/157) - Concept how custom fields are handled (M, High priority) [0/4 tasks] -- [#161](https://git.local-it.org/local-it/mitgliederverwaltung/issues/161) - Don't show birthday field for default configurations (S, Low priority) - [#153](https://git.local-it.org/local-it/mitgliederverwaltung/issues/153) - Sorting functionalities for custom fields (M, Low priority) **Missing Features:** diff --git a/lib/membership/member.ex b/lib/membership/member.ex index bcd505e..8d271d7 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -24,7 +24,7 @@ defmodule Mv.Membership.Member do - Email format validation (using EctoCommons.EmailValidator) - Phone number format: international format with 6-20 digits - Postal code format: exactly 5 digits (German format) - - Date validations: birth_date and join_date not in future, exit_date after join_date + - Date validations: join_date not in future, exit_date after join_date - Email uniqueness: prevents conflicts with unlinked users ## Full-Text Search @@ -284,11 +284,6 @@ defmodule Mv.Membership.Member do end end - # Birth date not in the future - validate compare(:birth_date, less_than_or_equal_to: &Date.utc_today/0), - where: [present(:birth_date)], - message: "cannot be in the future" - # Join date not in the future validate compare(:join_date, less_than_or_equal_to: &Date.utc_today/0), where: [present(:join_date)], @@ -351,10 +346,6 @@ defmodule Mv.Membership.Member do constraints min_length: 5, max_length: 254 end - attribute :birth_date, :date do - allow_nil? true - end - attribute :paid, :boolean do allow_nil? true end diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex index cd8d3a4..334bcc1 100644 --- a/lib/mv/constants.ex +++ b/lib/mv/constants.ex @@ -7,7 +7,6 @@ defmodule Mv.Constants do :first_name, :last_name, :email, - :birth_date, :paid, :phone_number, :join_date, diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex index e4c2e7e..97b13f6 100644 --- a/lib/mv_web/live/member_live/form.ex +++ b/lib/mv_web/live/member_live/form.ex @@ -14,7 +14,7 @@ defmodule MvWeb.MemberLive.Form do - first_name, last_name, email **Optional:** - - birth_date, phone_number, address fields (city, street, house_number, postal_code) + - phone_number, address fields (city, street, house_number, postal_code) - join_date, exit_date - paid status - notes @@ -45,7 +45,6 @@ defmodule MvWeb.MemberLive.Form do <.input field={@form[:first_name]} label={gettext("First Name")} required /> <.input field={@form[:last_name]} label={gettext("Last Name")} required /> <.input field={@form[:email]} label={gettext("Email")} required type="email" /> - <.input field={@form[:birth_date]} label={gettext("Birth Date")} type="date" /> <.input field={@form[:paid]} label={gettext("Paid")} type="checkbox" /> <.input field={@form[:phone_number]} label={gettext("Phone Number")} /> <.input field={@form[:join_date]} label={gettext("Join Date")} type="date" /> diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex index 7ec24fa..de46a3a 100644 --- a/lib/mv_web/live/member_live/show.ex +++ b/lib/mv_web/live/member_live/show.ex @@ -10,7 +10,7 @@ defmodule MvWeb.MemberLive.Show do - Return to member list ## Displayed Information - - Basic: name, email, dates (birth, join, exit) + - Basic: name, email, dates (join, exit) - Contact: phone number - Address: street, house number, postal code, city - Status: paid flag @@ -48,7 +48,6 @@ defmodule MvWeb.MemberLive.Show do <:item title={gettext("First Name")}>{@member.first_name} <:item title={gettext("Last Name")}>{@member.last_name} <:item title={gettext("Email")}>{@member.email} - <:item title={gettext("Birth Date")}>{@member.birth_date} <:item title={gettext("Paid")}> {if @member.paid, do: gettext("Yes"), else: gettext("No")} diff --git a/priv/repo/migrations/20251202145404_remove_birth_date_from_members.exs b/priv/repo/migrations/20251202145404_remove_birth_date_from_members.exs new file mode 100644 index 0000000..4a6cf3a --- /dev/null +++ b/priv/repo/migrations/20251202145404_remove_birth_date_from_members.exs @@ -0,0 +1,69 @@ +defmodule Mv.Repo.Migrations.RemoveBirthDateFromMembers do + @moduledoc """ + Removes the birth_date column from the members table. + + The birth_date field has been removed from the application because most users + don't record birthday data. Users who need this can use a custom field instead. + + This migration also updates the search_vector trigger to remove birth_date. + """ + + use Ecto.Migration + + def up do + # Update the trigger function to remove birth_date from search_vector + execute(""" + CREATE OR REPLACE FUNCTION members_search_vector_trigger() RETURNS trigger AS $$ + BEGIN + NEW.search_vector := + setweight(to_tsvector('simple', coalesce(NEW.first_name, '')), 'A') || + setweight(to_tsvector('simple', coalesce(NEW.last_name, '')), 'A') || + setweight(to_tsvector('simple', coalesce(NEW.email, '')), 'B') || + setweight(to_tsvector('simple', coalesce(NEW.phone_number, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.join_date::text, '')), 'D') || + setweight(to_tsvector('simple', coalesce(NEW.exit_date::text, '')), 'D') || + setweight(to_tsvector('simple', coalesce(NEW.notes, '')), 'B') || + setweight(to_tsvector('simple', coalesce(NEW.city, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.street, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.house_number::text, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.postal_code::text, '')), 'C'); + RETURN NEW; + END + $$ LANGUAGE plpgsql; + """) + + # Remove the birth_date column + alter table(:members) do + remove :birth_date + end + end + + def down do + # Add the birth_date column back + alter table(:members) do + add :birth_date, :date + end + + # Restore the trigger function with birth_date + execute(""" + CREATE OR REPLACE FUNCTION members_search_vector_trigger() RETURNS trigger AS $$ + BEGIN + NEW.search_vector := + setweight(to_tsvector('simple', coalesce(NEW.first_name, '')), 'A') || + setweight(to_tsvector('simple', coalesce(NEW.last_name, '')), 'A') || + setweight(to_tsvector('simple', coalesce(NEW.email, '')), 'B') || + setweight(to_tsvector('simple', coalesce(NEW.birth_date::text, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.phone_number, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.join_date::text, '')), 'D') || + setweight(to_tsvector('simple', coalesce(NEW.exit_date::text, '')), 'D') || + setweight(to_tsvector('simple', coalesce(NEW.notes, '')), 'B') || + setweight(to_tsvector('simple', coalesce(NEW.city, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.street, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.house_number::text, '')), 'C') || + setweight(to_tsvector('simple', coalesce(NEW.postal_code::text, '')), 'C'); + RETURN NEW; + END + $$ LANGUAGE plpgsql; + """) + end +end diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 542e559..bec9006 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -112,7 +112,6 @@ for member_attrs <- [ first_name: "Hans", last_name: "Müller", email: "hans.mueller@example.de", - birth_date: ~D[1985-06-15], join_date: ~D[2023-01-15], paid: true, phone_number: "+49301234567", @@ -125,7 +124,6 @@ for member_attrs <- [ first_name: "Greta", last_name: "Schmidt", email: "greta.schmidt@example.de", - birth_date: ~D[1990-03-22], join_date: ~D[2023-02-01], paid: false, phone_number: "+49309876543", @@ -139,7 +137,6 @@ for member_attrs <- [ first_name: "Friedrich", last_name: "Wagner", email: "friedrich.wagner@example.de", - birth_date: ~D[1978-11-08], join_date: ~D[2022-11-10], paid: true, phone_number: "+49301122334", @@ -151,7 +148,6 @@ for member_attrs <- [ first_name: "Marianne", last_name: "Wagner", email: "marianne.wagner@example.de", - birth_date: ~D[1978-11-08], join_date: ~D[2022-11-10], paid: true, phone_number: "+49301122334", @@ -186,7 +182,6 @@ linked_members = [ first_name: "Maria", last_name: "Weber", email: "maria.weber@example.de", - birth_date: ~D[1992-07-14], join_date: ~D[2023-03-15], paid: true, phone_number: "+49301357924", @@ -202,7 +197,6 @@ linked_members = [ first_name: "Thomas", last_name: "Klein", email: "thomas.klein@example.de", - birth_date: ~D[1988-12-03], join_date: ~D[2023-04-01], paid: false, phone_number: "+49302468135", diff --git a/test/membership/member_test.exs b/test/membership/member_test.exs index 7015d34..1bf594a 100644 --- a/test/membership/member_test.exs +++ b/test/membership/member_test.exs @@ -6,7 +6,6 @@ defmodule Mv.Membership.MemberTest do @valid_attrs %{ first_name: "John", last_name: "Doe", - birth_date: ~D[1990-01-01], paid: true, email: "john@example.com", phone_number: "+49123456789", @@ -43,12 +42,6 @@ defmodule Mv.Membership.MemberTest do assert error_message(errors, :email) =~ "is not a valid email" end - test "Birth date is optional but must not be in the future" do - attrs = Map.put(@valid_attrs, :birth_date, Date.utc_today() |> Date.add(1)) - assert {:error, %Ash.Error.Invalid{errors: errors}} = Membership.create_member(attrs) - assert error_message(errors, :birth_date) =~ "cannot be in the future" - end - test "Paid is optional but must be boolean if specified" do attrs = Map.put(@valid_attrs, :paid, nil) attrs2 = Map.put(@valid_attrs, :paid, "yes") From a67a91cffa336ef98b9cfcbdc492b6a962b769de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Tue, 2 Dec 2025 09:56:54 +0100 Subject: [PATCH 110/119] Mark required fields in UI --- lib/mv_web/components/core_components.ex | 72 ++++++++++++++++-------- lib/mv_web/live/member_live/form.ex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 54 ++++++++++-------- priv/gettext/default.pot | 54 ++++++++++-------- priv/gettext/en/LC_MESSAGES/default.po | 54 ++++++++++-------- 5 files changed, 142 insertions(+), 94 deletions(-) diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index ae50ecb..54a5a64 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -60,27 +60,29 @@ defmodule MvWeb.CoreComponents do id={@id} phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")} role="alert" - class={[ + class="z-50 toast toast-top toast-end" + {@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}

+ ]}> + <.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 @@ -186,7 +188,7 @@ defmodule MvWeb.CoreComponents do end) ~H""" -
+
<.error :for={msg <- @errors}>{msg} @@ -208,9 +214,15 @@ defmodule MvWeb.CoreComponents do def input(%{type: "select"} = assigns) do ~H""" -
+