mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 03:32:06 +00:00
Group and filter the player endgame picker
The player-facing /endgames list now groups endgames under collapsible Key headers and supports the same Theme/Key filtering as the admin list, showing each endgame's Themes. The filter/group state is shared with the admin list via ChesstrainerWeb.EndgameList. Closes #14
This commit is contained in:
@@ -10,6 +10,115 @@ defmodule ChesstrainerWeb.EndgameList do
|
||||
|
||||
use ChesstrainerWeb, :html
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
alias Chesstrainer.Themes
|
||||
|
||||
@doc """
|
||||
Initialises the filter/group assigns for a filtered, Key-grouped endgame list.
|
||||
"""
|
||||
def init_state(socket) do
|
||||
socket
|
||||
|> assign(:selected_themes, [])
|
||||
|> assign(:theme_query, "")
|
||||
|> assign(:theme_results, [])
|
||||
|> assign(:selected_key, nil)
|
||||
|> assign(:keys, Endgames.list_keys())
|
||||
|> assign(:groups, build_groups(%{}))
|
||||
end
|
||||
|
||||
@doc """
|
||||
Handles the filter/group events shared by the admin and player lists.
|
||||
"""
|
||||
def handle_filter_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_filter_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()}
|
||||
end
|
||||
|
||||
def handle_filter_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()}
|
||||
end
|
||||
|
||||
def handle_filter_event("filter_key", %{"key" => key}, socket) do
|
||||
{:noreply,
|
||||
socket
|
||||
|> assign(:selected_key, if(key == "", do: nil, else: key))
|
||||
|> refresh()}
|
||||
end
|
||||
|
||||
def handle_filter_event("clear_filters", _params, socket) do
|
||||
{:noreply,
|
||||
socket
|
||||
|> assign(:selected_themes, [])
|
||||
|> assign(:selected_key, nil)
|
||||
|> clear_theme_search()
|
||||
|> refresh()}
|
||||
end
|
||||
|
||||
def handle_filter_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_filter_event(_event, _params, socket), do: {:noreply, socket}
|
||||
|
||||
@doc """
|
||||
Rebuilds the Key list and groups from the current filters.
|
||||
"""
|
||||
def refresh(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: [])
|
||||
|
||||
attr :selected_themes, :list, required: true
|
||||
attr :theme_query, :string, required: true
|
||||
attr :theme_results, :list, required: true
|
||||
|
||||
@@ -2,7 +2,6 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
|
||||
use ChesstrainerWeb, :live_view
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
alias Chesstrainer.Themes
|
||||
|
||||
import ChesstrainerWeb.EndgameList
|
||||
|
||||
@@ -110,109 +109,18 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
|
||||
{:ok,
|
||||
socket
|
||||
|> assign(:page_title, "Listing Endgames")
|
||||
|> assign(:selected_themes, [])
|
||||
|> assign(:theme_query, "")
|
||||
|> assign(:theme_results, [])
|
||||
|> assign(:selected_key, nil)
|
||||
|> assign(:keys, Endgames.list_keys())
|
||||
|> assign(:groups, build_groups(%{}))}
|
||||
|> init_state()}
|
||||
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, refresh_groups(socket)}
|
||||
{:noreply, refresh(socket)}
|
||||
end
|
||||
|
||||
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: [])
|
||||
def handle_event(event, params, socket) do
|
||||
handle_filter_event(event, params, socket)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
defmodule ChesstrainerWeb.EndgameLive.PlayerIndex do
|
||||
use ChesstrainerWeb, :live_view
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
import ChesstrainerWeb.EndgameList
|
||||
|
||||
@impl true
|
||||
def render(assigns) do
|
||||
@@ -12,18 +12,54 @@ defmodule ChesstrainerWeb.EndgameLive.PlayerIndex do
|
||||
<:subtitle>Pick an endgame to play.</:subtitle>
|
||||
</.header>
|
||||
|
||||
<.table
|
||||
id="player-endgames"
|
||||
rows={@streams.endgames}
|
||||
>
|
||||
<:col :let={{_id, endgame}} label="Key">{endgame.key}</:col>
|
||||
<:col :let={{_id, endgame}} label="Color">{endgame.color}</:col>
|
||||
<:col :let={{_id, endgame}} label="Result">{endgame.result}</:col>
|
||||
<:col :let={{_id, endgame}} label="Rating">{endgame.rating}</:col>
|
||||
<:action :let={{_id, endgame}}>
|
||||
<.link navigate={~p"/endgames/#{endgame}/play"}>Play</.link>
|
||||
</:action>
|
||||
</.table>
|
||||
<.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>
|
||||
<tr>
|
||||
<th>Color</th>
|
||||
<th>Result</th>
|
||||
<th>Rating</th>
|
||||
<th>Themes</th>
|
||||
<th><span class="sr-only">Actions</span></th>
|
||||
</tr>
|
||||
</:header>
|
||||
|
||||
<:row :let={endgame}>
|
||||
<tr id={"endgame-" <> endgame.id}>
|
||||
<td phx-click={JS.navigate(~p"/endgames/#{endgame}/play")} class="hover:cursor-pointer">
|
||||
{endgame.color}
|
||||
</td>
|
||||
<td phx-click={JS.navigate(~p"/endgames/#{endgame}/play")} class="hover:cursor-pointer">
|
||||
{endgame.result}
|
||||
</td>
|
||||
<td phx-click={JS.navigate(~p"/endgames/#{endgame}/play")} class="hover:cursor-pointer">
|
||||
{endgame.rating}
|
||||
</td>
|
||||
<td>
|
||||
<span :for={theme <- endgame.themes} class="badge badge-sm">
|
||||
<button type="button" phx-click="add_theme" phx-value-id={theme.id}>
|
||||
{theme.name}
|
||||
</button>
|
||||
</span>
|
||||
<span :if={endgame.themes == []} class="text-base-content/50">None</span>
|
||||
</td>
|
||||
<td class="w-0 font-semibold">
|
||||
<.link navigate={~p"/endgames/#{endgame}/play"}>Play</.link>
|
||||
</td>
|
||||
</tr>
|
||||
</:row>
|
||||
</.grouped_list>
|
||||
|
||||
<p :if={@groups == []} class="text-base-content/70">
|
||||
No endgames match these filters.
|
||||
</p>
|
||||
</Layouts.app>
|
||||
"""
|
||||
end
|
||||
@@ -33,6 +69,11 @@ defmodule ChesstrainerWeb.EndgameLive.PlayerIndex do
|
||||
{:ok,
|
||||
socket
|
||||
|> assign(:page_title, "Endgames")
|
||||
|> stream(:endgames, Endgames.list_endgames())}
|
||||
|> init_state()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_event(event, params, socket) do
|
||||
handle_filter_event(event, params, socket)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,18 +3,46 @@ defmodule ChesstrainerWeb.EndgameLive.PlayerIndexTest do
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Chesstrainer.EndgamesFixtures
|
||||
import Chesstrainer.ThemesFixtures
|
||||
|
||||
test "lists endgames with a play link per row", %{conn: conn} do
|
||||
alias Chesstrainer.Endgames
|
||||
|
||||
test "groups endgames by Key and shows themes on expand", %{conn: conn} do
|
||||
theme = theme_fixture(%{name: "Lucena"})
|
||||
endgame = endgame_fixture()
|
||||
other = endgame_fixture()
|
||||
{:ok, _} = Endgames.update_endgame(endgame, %{}, [theme])
|
||||
|
||||
{:ok, _view, html} = live(conn, ~p"/endgames")
|
||||
{:ok, view, html} = live(conn, ~p"/endgames")
|
||||
|
||||
assert html =~ "Endgames"
|
||||
assert html =~ endgame.key
|
||||
assert html =~ other.key
|
||||
assert has_element?(view, "#key-group-K-v-K")
|
||||
refute html =~ "Lucena"
|
||||
|
||||
view |> element("#key-group-K-v-K button") |> render_click()
|
||||
|
||||
html = render(view)
|
||||
assert html =~ ~p"/endgames/#{endgame}/play"
|
||||
assert html =~ ~p"/endgames/#{other}/play"
|
||||
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"/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 "navigating to a play page renders the board", %{conn: conn} do
|
||||
|
||||
Reference in New Issue
Block a user