diff --git a/CHANGELOG.md b/CHANGELOG.md index 71d9147..74df997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,14 +12,8 @@ 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 883ca30..e55a06d 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -27,33 +27,6 @@ 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 629987e..5669a19 100644 --- a/docs/development-progress-log.md +++ b/docs/development-progress-log.md @@ -1327,33 +1327,6 @@ 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 @@ -1586,8 +1559,8 @@ This project demonstrates a modern Phoenix application built with: --- -**Document Version:** 1.3 -**Last Updated:** 2025-12-02 +**Document Version:** 1.2 +**Last Updated:** 2025-11-27 **Maintainer:** Development Team **Status:** Living Document (update as project evolves) diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md index 60432d0..2313fd7 100644 --- a/docs/feature-roadmap.md +++ b/docs/feature-roadmap.md @@ -65,7 +65,6 @@ - ✅ 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/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex index ae50ecb..b8fe0fc 100644 --- a/lib/mv_web/components/core_components.ex +++ b/lib/mv_web/components/core_components.ex @@ -42,11 +42,7 @@ 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, :success, :warning], - doc: "used for styling and flash lookup" - + attr :kind, :atom, values: [:info, :error], 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" @@ -60,27 +56,25 @@ defmodule MvWeb.CoreComponents do id={@id} phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")} role="alert" - class={[ - "alert w-80 sm:w-96 max-w-80 sm:max-w-96 text-wrap", - @kind == :info && "alert-info", - @kind == :error && "alert-error", - @kind == :success && "bg-green-500 text-white", - @kind == :warning && "bg-blue-100 text-blue-800 border border-blue-300" - ]} + 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" /> - <.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" /> +
+

{@title}

+

{msg}

+
+
+
-
-
""" end diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 487a01f..b7f7568 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -65,9 +65,7 @@ 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 4d444b9..c301592 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -18,7 +18,6 @@ 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) @@ -74,7 +73,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, MapSet.new()) + |> assign(:selected_members, []) |> assign(:custom_fields_visible, custom_fields_visible) |> assign(:member_fields_visible, get_visible_member_fields(settings)) @@ -108,10 +107,10 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_event("select_member", %{"id" => id}, socket) do selected = - if MapSet.member?(socket.assigns.selected_members, id) do - MapSet.delete(socket.assigns.selected_members, id) + if id in socket.assigns.selected_members do + List.delete(socket.assigns.selected_members, id) else - MapSet.put(socket.assigns.selected_members, id) + [id | socket.assigns.selected_members] end {:noreply, assign(socket, :selected_members, selected)} @@ -119,11 +118,13 @@ defmodule MvWeb.MemberLive.Index do @impl true def handle_event("select_all", _params, socket) do - all_ids = socket.assigns.members |> Enum.map(& &1.id) |> MapSet.new() + members = socket.assigns.members + + all_ids = Enum.map(members, & &1.id) selected = - if MapSet.equal?(socket.assigns.selected_members, all_ids) do - MapSet.new() + if Enum.sort(socket.assigns.selected_members) == Enum.sort(all_ids) do + [] else all_ids end @@ -131,52 +132,6 @@ 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 - - # 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) - - email_count = length(formatted_emails) - - cond do - MapSet.size(selected_ids) == 0 -> - {:noreply, put_flash(socket, :error, gettext("No members selected"))} - - email_count == 0 -> - {:noreply, put_flash(socket, :error, gettext("No email addresses found"))} - - true -> - # RFC 5322 uses comma as separator for email address lists - email_string = Enum.join(formatted_emails, ", ") - - socket = - socket - |> push_event("copy_to_clipboard", %{text: email_string}) - |> put_flash( - :success, - ngettext( - "Copied %{count} email address to clipboard", - "Copied %{count} email addresses to clipboard", - email_count, - count: email_count - ) - ) - |> put_flash( - :warning, - gettext("Tip: Paste email addresses into the BCC field for privacy compliance") - ) - - {:noreply, socket} - end - end - # ----------------------------------------------------------------- # Handle Infos from Child Components # ----------------------------------------------------------------- @@ -779,24 +734,6 @@ defmodule MvWeb.MemberLive.Index do 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 - # Gets the list of member fields that should be visible in the overview. # # Reads the visibility configuration from Settings and returns only the fields diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index 55b0a20..594f2d8 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -2,24 +2,6 @@ <.header> {gettext("Members")} <:actions> - <.button - :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, &MapSet.member?(@selected_members, &1.id))}) - - <.button - :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" /> - {gettext("Open in email program")} - <.button variant="primary" navigate={~p"/members/new"}> <.icon name="hero-plus" /> {gettext("New Member")} @@ -51,7 +33,7 @@ type="checkbox" name="select_all" phx-click="select_all" - checked={MapSet.equal?(@selected_members, @members |> Enum.map(& &1.id) |> MapSet.new())} + checked={Enum.sort(@selected_members) == Enum.map(@members, & &1.id) |> Enum.sort()} aria-label={gettext("Select all members")} role="checkbox" /> @@ -63,7 +45,7 @@ name={member.id} phx-click="select_member" phx-value-id={member.id} - checked={MapSet.member?(@selected_members, member.id)} + checked={member.id in @selected_members} phx-capture-click phx-stop-propagation aria-label={gettext("Select member")} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 770cc09..e9214fc 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:360 +#: 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:220 +#: lib/mv_web/live/member_live/index.html.heex:202 #: 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:82 -#: lib/mv_web/components/layouts.ex:94 +#: lib/mv_web/components/layouts.ex:80 +#: lib/mv_web/components/layouts.ex:92 #, 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:166 +#: 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:222 +#: lib/mv_web/live/member_live/index.html.heex:204 #: 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:214 +#: lib/mv_web/live/member_live/index.html.heex:196 #: 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:98 +#: 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:200 +#: 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" @@ -82,28 +82,28 @@ msgstr "Beitrittsdatum" msgid "Last Name" msgstr "Nachname" -#: lib/mv_web/live/member_live/index.html.heex:24 +#: lib/mv_web/live/member_live/index.html.heex:6 #, elixir-autogen, elixir-format msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:211 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "Anzeigen" -#: lib/mv_web/components/layouts.ex:89 +#: lib/mv_web/components/layouts.ex:87 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "Etwas ist schiefgelaufen!" -#: lib/mv_web/components/layouts.ex:77 +#: lib/mv_web/components/layouts.ex:75 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "Keine Internetverbindung gefunden" -#: lib/mv_web/components/core_components.ex:78 +#: lib/mv_web/components/core_components.ex:74 #, 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:132 +#: 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:183 +#: 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:149 +#: 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" @@ -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:115 +#: 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" @@ -311,7 +311,7 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:58 +#: 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" @@ -365,12 +365,12 @@ msgstr "Profil" msgid "Required" msgstr "Erforderlich" -#: lib/mv_web/live/member_live/index.html.heex:55 +#: 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:69 +#: lib/mv_web/live/member_live/index.html.heex:51 #, 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:33 +#: lib/mv_web/live/member_live/index.html.heex:15 #, 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:81 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "First name" msgstr "Vorname" @@ -782,44 +782,7 @@ msgstr "Mitglied entverknüpfen" msgid "Unlinking scheduled" msgstr "Entverknüpfung geplant" -#: 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" -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:142 -#, elixir-autogen, elixir-format -msgid "No email addresses found" -msgstr "Keine E-Mail-Adressen gefunden" - -#: 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" +#~ #: 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 682b780..47fe4dd 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -11,37 +11,37 @@ msgid "" msgstr "" -#: lib/mv_web/components/core_components.ex:360 +#: lib/mv_web/components/core_components.ex:356 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:220 +#: lib/mv_web/live/member_live/index.html.heex:202 #: 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:82 -#: lib/mv_web/components/layouts.ex:94 +#: lib/mv_web/components/layouts.ex:80 +#: lib/mv_web/components/layouts.ex:92 #, 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:166 +#: 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:222 +#: lib/mv_web/live/member_live/index.html.heex:204 #: 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:214 +#: lib/mv_web/live/member_live/index.html.heex:196 #: 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:98 +#: 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:200 +#: 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" @@ -83,28 +83,28 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:24 +#: lib/mv_web/live/member_live/index.html.heex:6 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:211 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" -#: lib/mv_web/components/layouts.ex:89 +#: lib/mv_web/components/layouts.ex:87 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "" -#: lib/mv_web/components/layouts.ex:77 +#: lib/mv_web/components/layouts.ex:75 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "" -#: lib/mv_web/components/core_components.ex:78 +#: lib/mv_web/components/core_components.ex:74 #, 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:132 +#: 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:183 +#: 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:149 +#: 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" @@ -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:115 +#: 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" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:58 +#: 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" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:55 +#: 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:69 +#: lib/mv_web/live/member_live/index.html.heex:51 #, 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:33 +#: lib/mv_web/live/member_live/index.html.heex:15 #, 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:81 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "First name" msgstr "" @@ -782,45 +782,3 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Unlinking scheduled" msgstr "" - -#: 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" -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:142 -#, elixir-autogen, elixir-format -msgid "No email addresses found" -msgstr "" - -#: 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 a3fdfa4..a9e59e8 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:360 +#: lib/mv_web/components/core_components.ex:356 #, elixir-autogen, elixir-format msgid "Actions" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:220 +#: lib/mv_web/live/member_live/index.html.heex:202 #: 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:82 -#: lib/mv_web/components/layouts.ex:94 +#: lib/mv_web/components/layouts.ex:80 +#: lib/mv_web/components/layouts.ex:92 #, 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:166 +#: 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:222 +#: lib/mv_web/live/member_live/index.html.heex:204 #: 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:214 +#: lib/mv_web/live/member_live/index.html.heex:196 #: 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:98 +#: 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:200 +#: 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" @@ -83,28 +83,28 @@ msgstr "" msgid "Last Name" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:24 +#: lib/mv_web/live/member_live/index.html.heex:6 #, elixir-autogen, elixir-format msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:211 +#: lib/mv_web/live/member_live/index.html.heex:193 #: lib/mv_web/live/user_live/index.html.heex:63 #, elixir-autogen, elixir-format msgid "Show" msgstr "" -#: lib/mv_web/components/layouts.ex:89 +#: lib/mv_web/components/layouts.ex:87 #, elixir-autogen, elixir-format msgid "Something went wrong!" msgstr "" -#: lib/mv_web/components/layouts.ex:77 +#: lib/mv_web/components/layouts.ex:75 #, elixir-autogen, elixir-format msgid "We can't find the internet" msgstr "" -#: lib/mv_web/components/core_components.ex:78 +#: lib/mv_web/components/core_components.ex:74 #, 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:132 +#: 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:183 +#: 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:149 +#: 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" @@ -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:115 +#: 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" @@ -312,7 +312,7 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:25 -#: lib/mv_web/live/member_live/index.ex:58 +#: 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" @@ -366,12 +366,12 @@ msgstr "" msgid "Required" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:55 +#: 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:69 +#: lib/mv_web/live/member_live/index.html.heex:51 #, 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:33 +#: lib/mv_web/live/member_live/index.html.heex:15 #, 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:81 +#: lib/mv_web/live/member_live/index.html.heex:63 #, elixir-autogen, elixir-format, fuzzy msgid "First name" msgstr "" @@ -783,44 +783,7 @@ msgstr "" msgid "Unlinking scheduled" msgstr "" -#: 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" -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:142 -#, elixir-autogen, elixir-format -msgid "No email addresses found" -msgstr "" - -#: 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 "" +#~ #: 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/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index e3ad5bb..0668202 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -249,224 +249,4 @@ 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 member is deleted before copy", %{ - 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() - - # Delete the member from the database - Ash.destroy!(member1) - - # 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 - - 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