From d231860f14415d4a3c63b8b4f2d22a3fa3492416 Mon Sep 17 00:00:00 2001 From: Owen Date: Mon, 2 Nov 2026 10:21:22 +0100 Subject: [PATCH] Search, filter and group the admin endgames list The admin list now groups endgames under collapsible Key headers and can be filtered by Theme (search + tappable chips) and Key. Group counts and filtering run in SQL, and a group's endgames are fetched only when it is expanded, so the list stays fast as the dataset grows. - Add Endgames.list_keys/0, list_key_groups/1 and list_endgames_for_key/2. - Add the shared ChesstrainerWeb.EndgameList filter bar and grouped list component (to be reused by the player picker). - Rework EndgameLive.Index around server-side group state. Closes #15 --- lib/chesstrainer/endgames.ex | 55 +++++ .../components/endgame_list.ex | 118 ++++++++++ .../live/endgame_live/index.ex | 217 +++++++++++++++--- test/chesstrainer/endgames_test.exs | 55 +++++ .../live/endgame_live/index_test.exs | 54 ++++- 5 files changed, 458 insertions(+), 41 deletions(-) create mode 100644 lib/chesstrainer_web/components/endgame_list.ex diff --git a/lib/chesstrainer/endgames.ex b/lib/chesstrainer/endgames.ex index c7832a1..c965751 100644 --- a/lib/chesstrainer/endgames.ex +++ b/lib/chesstrainer/endgames.ex @@ -21,6 +21,61 @@ defmodule Chesstrainer.Endgames do Repo.all(Endgame) end + @doc """ + Returns the distinct Keys across all endgames, sorted. + """ + def list_keys do + Repo.all(from e in Endgame, distinct: true, select: e.key, order_by: [asc: e.key]) + end + + @doc """ + Returns `{key, count}` groups for endgames matching the filters, sorted by key. + + Filters is a map with optional `:themes` (a list of theme ids; an endgame must + carry any one of them) and `:key` (an exact Key). + """ + def list_key_groups(filters \\ %{}) do + Endgame + |> apply_filters(filters) + |> group_by([e], e.key) + |> select([e], {e.key, count(e.id)}) + |> order_by([e], asc: e.key) + |> Repo.all() + end + + @doc """ + Returns the endgames for one Key, matching the filters, with themes preloaded. + """ + def list_endgames_for_key(key, filters \\ %{}) do + Endgame + |> apply_filters(filters) + |> where([e], e.key == ^key) + |> preload(:themes) + |> order_by([e], asc: e.fen) + |> Repo.all() + end + + defp apply_filters(query, filters) do + query + |> filter_themes(Map.get(filters, :themes, [])) + |> filter_key(Map.get(filters, :key)) + end + + defp filter_themes(query, []), do: query + + defp filter_themes(query, theme_ids) do + endgame_ids = + from(t in "endgames_themes", + where: t.theme_id in ^theme_ids, + select: t.endgame_id + ) + + where(query, [e], e.id in subquery(endgame_ids)) + end + + defp filter_key(query, key) when key in [nil, ""], do: query + defp filter_key(query, key), do: where(query, [e], e.key == ^key) + @doc """ Gets a single endgame. diff --git a/lib/chesstrainer_web/components/endgame_list.ex b/lib/chesstrainer_web/components/endgame_list.ex new file mode 100644 index 0000000..120d7e9 --- /dev/null +++ b/lib/chesstrainer_web/components/endgame_list.ex @@ -0,0 +1,118 @@ +defmodule ChesstrainerWeb.EndgameList do + @moduledoc """ + Shared, server-rendered filter bar and Key-grouped endgame list. + + The parent LiveView owns the filter/group state (see `ChesstrainerWeb.EndgameLive.Index`) + and handles the `search_themes`, `add_theme`, `remove_theme`, `filter_key`, + `clear_filters` and `toggle_group` events. Groups are rendered collapsed; the + parent fetches a group's endgames only when it is expanded. + """ + + use ChesstrainerWeb, :html + + attr :selected_themes, :list, required: true + attr :theme_query, :string, required: true + attr :theme_results, :list, required: true + attr :keys, :list, required: true + attr :selected_key, :string, default: nil + + def filter_bar(assigns) do + ~H""" +
+
+ + {theme.name} + + +
+ +
+
+ + + +
+ +
+ +
+
+ + +
+ """ + end + + attr :groups, :list, required: true + slot :header, required: true + slot :row, required: true + + def grouped_list(assigns) do + ~H""" +
+
String.replace(group.key, " ", "-")}> + + + + + {render_slot(@header)} + + + <%= for endgame <- group.endgames do %> + {render_slot(@row, endgame)} + <% end %> + +
+
+
+ """ + end +end diff --git a/lib/chesstrainer_web/live/endgame_live/index.ex b/lib/chesstrainer_web/live/endgame_live/index.ex index 708e686..a5d7af0 100644 --- a/lib/chesstrainer_web/live/endgame_live/index.ex +++ b/lib/chesstrainer_web/live/endgame_live/index.ex @@ -2,9 +2,10 @@ defmodule ChesstrainerWeb.EndgameLive.Index do use ChesstrainerWeb, :live_view alias Chesstrainer.Endgames - alias Chesstrainer.Repo alias Chesstrainer.Themes + import ChesstrainerWeb.EndgameList + @impl true def render(assigns) do ~H""" @@ -18,39 +19,88 @@ defmodule ChesstrainerWeb.EndgameLive.Index do - <.table - id="endgames" - rows={@streams.endgames} - row_click={fn {_id, endgame} -> JS.navigate(~p"/admin/endgames/#{endgame}") end} - > - <:col :let={{_id, endgame}} label="Fen">{endgame.fen} - <:col :let={{_id, endgame}} label="Color">{endgame.color} - <:col :let={{_id, endgame}} label="Key">{endgame.key} - <:col :let={{_id, endgame}} label="Rating">{endgame.rating} - <:col :let={{_id, endgame}} label="Message">{endgame.message} - <:col :let={{_id, endgame}} label="Notes">{endgame.notes} - <:col :let={{_id, endgame}} label="Result">{endgame.result} - <:col :let={{_id, endgame}} label="Themes"> - {Enum.join(Themes.names(endgame.themes), ", ")} - - <:col :let={{_id, endgame}} label="Attempted">{endgame.times_attempted} - <:col :let={{_id, endgame}} label="Solved">{endgame.times_solved} - <:action :let={{_id, endgame}}> -
- <.link navigate={~p"/admin/endgames/#{endgame}"}>Show -
- <.link navigate={~p"/endgames/#{endgame}/play"}>Play - <.link navigate={~p"/admin/endgames/#{endgame}/edit"}>Edit - - <:action :let={{id, endgame}}> - <.link - phx-click={JS.push("delete", value: %{id: endgame.id}) |> hide("##{id}")} - data-confirm="Are you sure?" - > - Delete - - - + <.filter_bar + selected_themes={@selected_themes} + theme_query={@theme_query} + theme_results={@theme_results} + keys={@keys} + selected_key={@selected_key} + /> + + <.grouped_list :if={@groups != []} groups={@groups}> + <:header> + + Fen + Color + Key + Rating + Message + Notes + Result + Themes + Attempted + Solved + Actions + + + + <:row :let={endgame}> + endgame.id}> + + {endgame.fen} + + + {endgame.color} + + + {endgame.key} + + + {endgame.rating} + + + {endgame.message} + + + {endgame.notes} + + + {endgame.result} + + + + + + None + + + {endgame.times_attempted} + + + {endgame.times_solved} + + +
+ <.link navigate={~p"/admin/endgames/#{endgame}"}>Show + <.link navigate={~p"/endgames/#{endgame}/play"}>Play + <.link navigate={~p"/admin/endgames/#{endgame}/edit"}>Edit + <.link + phx-click={JS.push("delete", value: %{id: endgame.id})} + data-confirm="Are you sure?" + > + Delete + +
+ + + + + +

+ No endgames match these filters. +

""" end @@ -60,18 +110,109 @@ defmodule ChesstrainerWeb.EndgameLive.Index do {:ok, socket |> assign(:page_title, "Listing Endgames") - |> stream(:endgames, list_endgames())} + |> assign(:selected_themes, []) + |> assign(:theme_query, "") + |> assign(:theme_results, []) + |> assign(:selected_key, nil) + |> assign(:keys, Endgames.list_keys()) + |> assign(:groups, build_groups(%{}))} end @impl true + def handle_event("search_themes", %{"theme_search" => query}, socket) do + results = if String.trim(query) == "", do: [], else: Themes.search(query, "endgame") + + {:noreply, assign(socket, theme_query: query, theme_results: results)} + end + + def handle_event("add_theme", %{"id" => id}, socket) do + theme = Themes.get_theme!(id) + + selected = + if Enum.any?(socket.assigns.selected_themes, &(&1.id == theme.id)) do + socket.assigns.selected_themes + else + socket.assigns.selected_themes ++ [theme] + end + + {:noreply, + socket + |> assign(:selected_themes, selected) + |> clear_theme_search() + |> refresh_groups()} + end + + def handle_event("remove_theme", %{"id" => id}, socket) do + selected = Enum.reject(socket.assigns.selected_themes, &(Integer.to_string(&1.id) == id)) + + {:noreply, socket |> assign(:selected_themes, selected) |> refresh_groups()} + end + + def handle_event("filter_key", %{"key" => key}, socket) do + {:noreply, + socket + |> assign(:selected_key, if(key == "", do: nil, else: key)) + |> refresh_groups()} + end + + def handle_event("clear_filters", _params, socket) do + {:noreply, + socket + |> assign(:selected_themes, []) + |> assign(:selected_key, nil) + |> clear_theme_search() + |> refresh_groups()} + end + + def handle_event("toggle_group", %{"key" => key}, socket) do + groups = + Enum.map(socket.assigns.groups, fn group -> + cond do + group.key != key -> + group + + group.expanded -> + %{group | expanded: false, endgames: nil} + + true -> + endgames = Endgames.list_endgames_for_key(key, current_filters(socket.assigns)) + %{group | expanded: true, endgames: endgames} + end + end) + + {:noreply, assign(socket, :groups, groups)} + end + def handle_event("delete", %{"id" => id}, socket) do endgame = Endgames.get_endgame!(id) {:ok, _} = Endgames.delete_endgame(endgame) - {:noreply, stream_delete(socket, :endgames, endgame)} + {:noreply, refresh_groups(socket)} end - defp list_endgames() do - Endgames.list_endgames() |> Repo.preload(:themes) + defp refresh_groups(socket) do + filters = current_filters(socket.assigns) + + socket + |> assign(:keys, Endgames.list_keys()) + |> assign(:groups, build_groups(filters)) + end + + defp build_groups(filters) do + Enum.map( + Endgames.list_key_groups(filters), + fn {key, count} -> %{key: key, count: count, expanded: false, endgames: nil} end + ) + end + + defp current_filters(assigns) do + %{ + themes: Enum.map(assigns.selected_themes, & &1.id), + key: assigns.selected_key + } + end + + defp clear_theme_search(socket) do + assign(socket, theme_query: "", theme_results: []) end end diff --git a/test/chesstrainer/endgames_test.exs b/test/chesstrainer/endgames_test.exs index 471dc54..eb2b5bb 100644 --- a/test/chesstrainer/endgames_test.exs +++ b/test/chesstrainer/endgames_test.exs @@ -5,6 +5,16 @@ defmodule Chesstrainer.EndgamesTest do alias Chesstrainer.Endgames.Endgame alias Chesstrainer.Themes + @kr "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1" + @kr_other "8/8/4k3/8/8/3K1R2/8/8 w - - 0 1" + @kq "8/8/3k4/8/8/3K1Q2/8/8 w - - 0 1" + + defp create_endgame!(fen, themes \\ []) do + attrs = %{fen: fen, color: :white, result: :win, rating: 1500} + {:ok, endgame} = Endgames.create_endgame(attrs, themes) + endgame + end + describe "create_endgame/1 FEN validation" do test "accepts a standard valid FEN and derives its key" do attrs = %{ @@ -139,4 +149,49 @@ defmodule Chesstrainer.EndgamesTest do assert updated.key == "KPPP v KPP" end end + + describe "listing and filtering" do + test "list_keys/0 returns the distinct keys sorted" do + create_endgame!(@kr) + create_endgame!(@kr_other) + create_endgame!(@kq) + + assert Endgames.list_keys() == ["KQ v K", "KR v K"] + end + + test "list_key_groups/1 groups by key and counts" do + create_endgame!(@kr) + create_endgame!(@kr_other) + create_endgame!(@kq) + + assert Endgames.list_key_groups() == [{"KQ v K", 1}, {"KR v K", 2}] + end + + test "list_endgames_for_key/2 returns only that key with themes preloaded" do + {:ok, lucena} = Themes.create_theme(%{name: "Lucena", category: :endgame}) + create_endgame!(@kr, [lucena]) + create_endgame!(@kq) + + assert [endgame] = Endgames.list_endgames_for_key("KR v K") + assert endgame.fen == @kr + assert Enum.map(endgame.themes, & &1.name) == ["Lucena"] + end + + test "list_key_groups/1 filters by theme" do + {:ok, lucena} = Themes.create_theme(%{name: "Lucena", category: :endgame}) + {:ok, philidor} = Themes.create_theme(%{name: "Philidor", category: :endgame}) + + create_endgame!(@kr, [lucena]) + create_endgame!(@kq, [philidor]) + + assert Endgames.list_key_groups(%{themes: [lucena.id]}) == [{"KR v K", 1}] + end + + test "list_key_groups/1 filters by key" do + create_endgame!(@kr) + create_endgame!(@kq) + + assert Endgames.list_key_groups(%{key: "KQ v K"}) == [{"KQ v K", 1}] + end + end end diff --git a/test/chesstrainer_web/live/endgame_live/index_test.exs b/test/chesstrainer_web/live/endgame_live/index_test.exs index 5c7b2d4..f8f16c7 100644 --- a/test/chesstrainer_web/live/endgame_live/index_test.exs +++ b/test/chesstrainer_web/live/endgame_live/index_test.exs @@ -7,13 +7,61 @@ defmodule ChesstrainerWeb.EndgameLive.IndexTest do alias Chesstrainer.Endgames - test "lists an endgame's themes", %{conn: conn} do + test "groups endgames by Key with a count", %{conn: conn} do + endgame_fixture() + endgame_fixture() + + {:ok, view, _html} = live(conn, ~p"/admin/endgames") + + assert has_element?(view, "#key-group-K-v-K") + assert has_element?(view, "#key-group-K-v-K .badge", "2") + end + + test "lazy-loads a group's endgames when expanded", %{conn: conn} do theme = theme_fixture(%{name: "Lucena"}) endgame = endgame_fixture() - {:ok, _endgame} = Endgames.update_endgame(endgame, %{}, [theme]) + {:ok, _} = Endgames.update_endgame(endgame, %{}, [theme]) - {:ok, _view, html} = live(conn, ~p"/admin/endgames") + {:ok, view, html} = live(conn, ~p"/admin/endgames") + # collapsed: the endgame row (and its themes) are not rendered yet + refute html =~ endgame.fen + refute html =~ "Lucena" + + view |> element("#key-group-K-v-K button") |> render_click() + + html = render(view) + assert html =~ endgame.fen assert html =~ "Lucena" end + + test "filters by theme", %{conn: conn} do + lucena = theme_fixture(%{name: "Lucena"}) + philidor = theme_fixture(%{name: "Philidor"}) + + kr = endgame_fixture(fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1") + kq = endgame_fixture(fen: "8/8/3k4/8/8/3K1Q2/8/8 w - - 0 1") + {:ok, _} = Endgames.update_endgame(kr, %{}, [lucena]) + {:ok, _} = Endgames.update_endgame(kq, %{}, [philidor]) + + {:ok, view, _html} = live(conn, ~p"/admin/endgames") + + view |> form("#theme-filter-form", %{theme_search: "Luc"}) |> render_change() + view |> element("button", "Lucena") |> render_click() + + assert has_element?(view, "#key-group-KR-v-K") + refute has_element?(view, "#key-group-KQ-v-K") + end + + test "filters by Key", %{conn: conn} do + endgame_fixture(fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1") + endgame_fixture(fen: "8/8/3k4/8/8/3K1Q2/8/8 w - - 0 1") + + {:ok, view, _html} = live(conn, ~p"/admin/endgames") + + view |> form("#key-filter-form", %{key: "KQ v K"}) |> render_change() + + assert has_element?(view, "#key-group-KQ-v-K") + refute has_element?(view, "#key-group-KR-v-K") + end end