From a91b2ebb1e619961994517a36d1c997f5cf51683 Mon Sep 17 00:00:00 2001 From: carla Date: Fri, 26 Sep 2025 11:10:14 +0200 Subject: [PATCH 01/11] 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 0a9d129..db0bcf3 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) @@ -66,32 +71,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 @@ -108,8 +88,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 aa7a820..4072a51 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 673746f045edf8eba5c9daa4369c6b848b35efb7 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:36 +0200 Subject: [PATCH 02/11] 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 db0bcf3..6a7daab 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -170,6 +170,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 @@ -180,31 +195,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 1cce972a90e377bcdf631a468e814933fd9d77ea Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:52 +0200 Subject: [PATCH 03/11] 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 b8b573c..a119a51 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -55,7 +55,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 = %{ @@ -74,6 +73,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 20269bef60491260b31d0d00aeee157b6ad9c2de Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:23:33 +0200 Subject: [PATCH 04/11] chore: updated translation --- priv/gettext/de/LC_MESSAGES/auth.po | 4 +-- priv/gettext/de/LC_MESSAGES/default.po | 43 ++++++++++++++++---------- priv/gettext/default.pot | 36 ++++++++++++--------- priv/gettext/en/LC_MESSAGES/auth.po | 4 +-- priv/gettext/en/LC_MESSAGES/default.po | 41 +++++++++++++++--------- 5 files changed, 78 insertions(+), 50 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po index 0f2202d..661c269 100644 --- a/priv/gettext/de/LC_MESSAGES/auth.po +++ b/priv/gettext/de/LC_MESSAGES/auth.po @@ -62,5 +62,5 @@ 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" +#~ 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 1a7cf7e..14ca2d4 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +54,7 @@ msgid "Edit Member" msgstr "Mitglied bearbeiten" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -70,7 +70,7 @@ msgid "First Name" msgstr "Vorname" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -87,7 +87,7 @@ msgstr "Nachname" msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +127,7 @@ msgid "Exit Date" msgstr "Austrittsdatum" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -146,14 +146,14 @@ msgid "Paid" msgstr "Bezahlt" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -173,7 +173,7 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -318,13 +318,12 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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" @@ -553,7 +554,17 @@ msgstr "Passwort setzen" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "Benutzer wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen." -#: lib/mv_web/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" -msgstr "oder" +msgid "Click to sort" +msgstr "Klicke um zu sortieren" + +#: lib/mv_web/live/member_live/index.html.heex:53 +#, elixir-autogen, elixir-format, fuzzy +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 a9bfb08..58a0182 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +128,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -147,14 +147,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -174,7 +174,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -319,13 +319,12 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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,7 +555,12 @@ msgstr "" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "" -#: lib/mv_web/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" +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 1e4e801..59ce742 100644 --- a/priv/gettext/en/LC_MESSAGES/auth.po +++ b/priv/gettext/en/LC_MESSAGES/auth.po @@ -59,5 +59,5 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -msgid "Sign in with Rauthy" -msgstr "Sign in with Vereinscloud" +#~ 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 2f09378..6311138 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +128,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -147,14 +147,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -174,7 +174,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -319,13 +319,12 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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,7 +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/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" +msgid "Click to sort" msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:53 +#, elixir-autogen, elixir-format, fuzzy +msgid "First name" +msgstr "" + +#~ #: lib/mv_web/auth_overrides.ex:30 +#~ #, elixir-autogen, elixir-format +#~ msgid "or" +#~ msgstr "" From 78cbd3cf8088ee5f4dbc7083402e59b1f561b0fb Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:46:03 +0200 Subject: [PATCH 05/11] 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 6a7daab..4c8a1af 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 # ----------------------------------------------------------------- @@ -131,6 +104,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 7d2b719ca24a9cd1875bb0f2f2f381c9eed154e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Thu, 21 Aug 2025 14:18:01 +0200 Subject: [PATCH 06/11] Fix error when deleting members --- Justfile | 4 ++-- lib/mv_web/live/member_live/index.ex | 3 ++- test/mv_web/member_live/index_test.exs | 28 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Justfile b/Justfile index 1874b67..b28dbdc 100644 --- a/Justfile +++ b/Justfile @@ -35,8 +35,8 @@ audit: mix deps.audit mix hex.audit -test: install-dependencies start-database - mix test +test *args: install-dependencies start-database + mix test {{args}} format: mix format diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex index 0a9d129..47a36ef 100644 --- a/lib/mv_web/live/member_live/index.ex +++ b/lib/mv_web/live/member_live/index.ex @@ -50,7 +50,8 @@ defmodule MvWeb.MemberLive.Index do member = Ash.get!(Mv.Membership.Member, id) Ash.destroy!(member) - {:noreply, stream_delete(socket, :members, member)} + updated_members = Enum.reject(socket.assigns.members, &(&1.id == id)) + {:noreply, assign(socket, :members, updated_members)} end # Selects one member in the list of members diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs index b8b573c..240e15e 100644 --- a/test/mv_web/member_live/index_test.exs +++ b/test/mv_web/member_live/index_test.exs @@ -1,6 +1,7 @@ defmodule MvWeb.MemberLive.IndexTest do use MvWeb.ConnCase, async: true import Phoenix.LiveViewTest + require Ash.Query test "shows translated title in German", %{conn: conn} do conn = conn_with_oidc_user(conn) @@ -85,4 +86,31 @@ defmodule MvWeb.MemberLive.IndexTest do assert state.socket.assigns.query == "Friedrich" assert is_list(state.socket.assigns.members) end + + test "can delete a member without error", %{conn: conn} do + # Create a test member first + {:ok, member} = + Mv.Membership.create_member(%{ + first_name: "Test", + last_name: "User", + email: "test@example.com" + }) + + conn = conn_with_oidc_user(conn) + {:ok, index_view, _html} = live(conn, "/members") + + # Verify the member is displayed + assert has_element?(index_view, "#members", "Test User") + + # Click the delete link for this member + index_view + |> element("a", "Delete") + |> render_click() + + # Verify the member is no longer displayed + refute has_element?(index_view, "#members", "Test User") + + # Verify the member was actually deleted from the database + assert not (Mv.Membership.Member |> Ash.Query.filter(id == ^member.id) |> Ash.exists?()) + end end From e280a28b8ed51916ea9549d64cec0d353aa75b43 Mon Sep 17 00:00:00 2001 From: carla Date: Fri, 26 Sep 2025 11:10:14 +0200 Subject: [PATCH 07/11] 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 aa7a820..4072a51 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 10df5f8bb929db7a77411f1f90abae9ab10826e4 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:36 +0200 Subject: [PATCH 08/11] 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 a15a46037f423a4ffb8c6c6e9cca1459d81eafc7 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:19:52 +0200 Subject: [PATCH 09/11] 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 bc5715e63ed67863088dec62fd4b8bf95fcfef12 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:23:33 +0200 Subject: [PATCH 10/11] chore: updated translation --- priv/gettext/de/LC_MESSAGES/auth.po | 4 +-- priv/gettext/de/LC_MESSAGES/default.po | 43 ++++++++++++++++---------- priv/gettext/default.pot | 36 ++++++++++++--------- priv/gettext/en/LC_MESSAGES/auth.po | 4 +-- priv/gettext/en/LC_MESSAGES/default.po | 41 +++++++++++++++--------- 5 files changed, 78 insertions(+), 50 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po index 0f2202d..661c269 100644 --- a/priv/gettext/de/LC_MESSAGES/auth.po +++ b/priv/gettext/de/LC_MESSAGES/auth.po @@ -62,5 +62,5 @@ 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" +#~ 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 1a7cf7e..14ca2d4 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +54,7 @@ msgid "Edit Member" msgstr "Mitglied bearbeiten" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -70,7 +70,7 @@ msgid "First Name" msgstr "Vorname" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -87,7 +87,7 @@ msgstr "Nachname" msgid "New Member" msgstr "Neues Mitglied" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +127,7 @@ msgid "Exit Date" msgstr "Austrittsdatum" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -146,14 +146,14 @@ msgid "Paid" msgstr "Bezahlt" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -173,7 +173,7 @@ msgid "Saving..." msgstr "Speichern..." #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -318,13 +318,12 @@ msgid "Member" msgstr "Mitglied" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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" @@ -553,7 +554,17 @@ msgstr "Passwort setzen" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "Benutzer wird ohne Passwort erstellt. Aktivieren Sie 'Passwort setzen', um eines hinzuzufügen." -#: lib/mv_web/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" -msgstr "oder" +msgid "Click to sort" +msgstr "Klicke um zu sortieren" + +#: lib/mv_web/live/member_live/index.html.heex:53 +#, elixir-autogen, elixir-format, fuzzy +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 a9bfb08..58a0182 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +128,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -147,14 +147,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -174,7 +174,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -319,13 +319,12 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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,7 +555,12 @@ msgstr "" msgid "User will be created without a password. Check 'Set Password' to add one." msgstr "" -#: lib/mv_web/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" +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 1e4e801..59ce742 100644 --- a/priv/gettext/en/LC_MESSAGES/auth.po +++ b/priv/gettext/en/LC_MESSAGES/auth.po @@ -59,5 +59,5 @@ msgstr "" msgid "Your password has successfully been reset" msgstr "" -msgid "Sign in with Rauthy" -msgstr "Sign in with Vereinscloud" +#~ 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 2f09378..6311138 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:77 +#: 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:62 +#: 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:79 +#: 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:71 +#: 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,7 +55,7 @@ msgid "Edit Member" msgstr "" #: lib/mv_web/live/member_live/form.ex:18 -#: lib/mv_web/live/member_live/index.html.heex:58 +#: 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 @@ -71,7 +71,7 @@ msgid "First Name" msgstr "" #: lib/mv_web/live/member_live/form.ex:22 -#: lib/mv_web/live/member_live/index.html.heex:64 +#: 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" @@ -88,7 +88,7 @@ msgstr "" msgid "New Member" msgstr "" -#: lib/mv_web/live/member_live/index.html.heex:68 +#: 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,7 +128,7 @@ msgid "Exit Date" msgstr "" #: lib/mv_web/live/member_live/form.ex:27 -#: lib/mv_web/live/member_live/index.html.heex:60 +#: 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" @@ -147,14 +147,14 @@ msgid "Paid" msgstr "" #: lib/mv_web/live/member_live/form.ex:21 -#: lib/mv_web/live/member_live/index.html.heex:63 +#: 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:61 +#: 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" @@ -174,7 +174,7 @@ msgid "Saving..." msgstr "" #: lib/mv_web/live/member_live/form.ex:26 -#: lib/mv_web/live/member_live/index.html.heex:59 +#: 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" @@ -319,13 +319,12 @@ msgid "Member" msgstr "" #: lib/mv_web/components/layouts/navbar.ex:14 -#: lib/mv_web/live/member_live/index.ex:12 +#: 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:50 #: 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,7 +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/auth_overrides.ex:30 +#: lib/mv_web/live/components/sort_header_component.ex:60 #, elixir-autogen, elixir-format -msgid "or" +msgid "Click to sort" msgstr "" + +#: lib/mv_web/live/member_live/index.html.heex:53 +#, elixir-autogen, elixir-format, fuzzy +msgid "First name" +msgstr "" + +#~ #: lib/mv_web/auth_overrides.ex:30 +#~ #, elixir-autogen, elixir-format +#~ msgid "or" +#~ msgstr "" From e8d440f74fac02f0fac71140e4cc5f3fa35d4259 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 30 Sep 2025 16:46:03 +0200 Subject: [PATCH 11/11] 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 # -----------------------------------------------------------------