Add multi-theme tagging to endgames in the admin

#11: endgames can carry multiple themes (endgame tags) chosen from a
searchable, autocompleting picker with inline creation. Tags are staged
in the form and saved atomically, so they work on both New and Edit.

Tag names are trimmed and case-insensitively unique per category. Admin
Show and Index display themes, and the seeds ship a starter vocabulary.

The theme picker has its own form: LiveView requires phx-change inputs to
live inside a form, and a separate theme form keeps Enter from
submitting the endgame form.
This commit is contained in:
2026-11-01 22:22:09 +01:00
parent be23f1d7f8
commit 645f65f2a3
13 changed files with 403 additions and 150 deletions
+5 -18
View File
@@ -49,9 +49,10 @@ defmodule Chesstrainer.Endgames do
{:error, %Ecto.Changeset{}}
"""
def create_endgame(attrs) do
def create_endgame(attrs, tags \\ []) do
%Endgame{}
|> Endgame.changeset(attrs)
|> Ecto.Changeset.put_assoc(:tags, tags)
|> Repo.insert()
end
@@ -67,12 +68,14 @@ defmodule Chesstrainer.Endgames do
{:error, %Ecto.Changeset{}}
"""
def update_endgame(%Endgame{} = endgame, attrs) do
def update_endgame(%Endgame{} = endgame, attrs, tags \\ []) do
# ignore fen on update
attrs = Map.delete(attrs, "fen")
endgame
|> Repo.preload(:tags)
|> Endgame.changeset(attrs)
|> Ecto.Changeset.put_assoc(:tags, tags)
|> Repo.update()
end
@@ -120,20 +123,4 @@ defmodule Chesstrainer.Endgames do
{:ok, Repo.get!(Endgame, id)}
end
def add_tag(endgame, tag) do
endgame
|> Repo.preload(:tags)
|> Ecto.Changeset.change()
|> Ecto.Changeset.put_assoc(:tags, [tag | endgame.tags])
|> Repo.update()
end
def remove_tag(endgame, tag) do
endgame
|> Repo.preload(:tags)
|> Ecto.Changeset.change()
|> Ecto.Changeset.put_assoc(:tags, endgame.tags -- [tag])
|> Repo.update()
end
end
+44 -11
View File
@@ -105,19 +105,52 @@ defmodule Chesstrainer.Tags do
def search("", _category), do: []
def search(query, category) when is_binary(query) do
pattern = "%#{query}%"
case String.trim(query) do
"" ->
[]
Tag
|> where([t], ilike(t.name, ^pattern) and t.category == ^category)
|> order_by([t], asc: t.name)
|> limit(20)
|> Repo.all()
end
query ->
pattern = "%#{query}%"
def get_or_create(name, category) when is_binary(name) do
case Repo.get_by(Tag, name: name, category: category) do
nil -> create_tag(%{name: name, category: category})
tag -> {:ok, tag}
Tag
|> where([t], ilike(t.name, ^pattern) and t.category == ^category)
|> order_by([t], asc: t.name)
|> limit(20)
|> Repo.all()
end
end
@doc """
Finds a tag by name (trimmed and case-insensitive) for a category, creating it
if it does not exist.
"""
def get_or_create(name, category) when is_binary(name) do
name = String.trim(name)
if name == "" do
{:error, :blank_name}
else
case find_by_name(name, category) do
nil -> create_tag(%{name: name, category: category})
tag -> {:ok, tag}
end
end
end
defp find_by_name(name, category) do
downcased = String.downcase(name)
Repo.one(
from t in Tag,
where: t.category == ^category and fragment("lower(?)", t.name) == ^downcased,
limit: 1
)
end
@doc """
Returns the names of the given tags, sorted.
"""
def names(tags) when is_list(tags) do
tags |> Enum.map(& &1.name) |> Enum.sort()
end
end
+6 -1
View File
@@ -13,7 +13,12 @@ defmodule Chesstrainer.Tags.Tag do
def changeset(tag, attrs) do
tag
|> cast(attrs, [:name, :category])
|> update_change(:name, fn
name when is_binary(name) -> String.trim(name)
name -> name
end)
|> validate_required([:name, :category])
|> unique_constraint(:name)
|> validate_length(:name, min: 1, max: 60)
|> unique_constraint(:name, name: :tags_name_category_lower_index, message: "already exists")
end
end
+118 -80
View File
@@ -16,51 +16,65 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
<:subtitle>Use this form to manage endgame records in your database.</:subtitle>
</.header>
<div class="field mb-6">
<label class="label">
<span class="label-text">Themes</span>
</label>
<div class="flex flex-wrap gap-2 mb-2">
<%= for tag <- @selected_tags do %>
<span class="badge badge-primary gap-1">
{tag.name}
<button
type="button"
phx-click="remove_tag"
phx-value-id={tag.id}
aria-label={"Remove #{tag.name}"}
>
×
</button>
</span>
<% end %>
</div>
<form
id="theme-form"
phx-change="search_tags"
phx-submit="create_tag_from_search"
>
<input
type="text"
name="tag_search"
value={@tag_query}
phx-debounce="200"
autocomplete="off"
placeholder="Search or create a theme…"
class="input input-bordered w-full"
/>
<ul class="menu bg-base-100 rounded-box mt-2">
<%= for tag <- @tag_results do %>
<li>
<button type="button" phx-click="add_tag" phx-value-id={tag.id}>{tag.name}</button>
</li>
<% end %>
<%= if @can_create do %>
<li>
<button type="button" phx-click="create_tag" phx-value-name={@tag_query}>
Create theme "{String.trim(@tag_query)}"
</button>
</li>
<% end %>
</ul>
</form>
</div>
<.form for={@form} id="endgame-form" phx-change="validate" phx-submit="save">
<.input field={@form[:fen]} type="text" label="Fen" disabled={@live_action == :edit} />
<.input field={@form[:color]} type="text" label="Color" disabled />
<.input field={@form[:key]} type="text" label="Key" />
<.input field={@form[:rating]} type="number" label="Rating" />
<!-- ✅ TAG SELECTOR -->
<div class="field">
<label>Tags</label>
<!-- Search box -->
<input
type="text"
name="tag_search"
value={@tag_query}
phx-change="search_tags"
autocomplete="off"
/>
<!-- Search results -->
<ul class="tag-results">
<%= for tag <- @tag_results do %>
<li phx-click="add_tag" phx-value-id={tag.id}>
{tag.name}
</li>
<% end %>
<%= if @tag_query != "" and @tag_results == [] do %>
<li phx-click="create_tag" phx-value-name={@tag_query}>
Create tag "{@tag_query}"
</li>
<% end %>
</ul>
<!-- Selected tags -->
<div class="selected-tags">
<%= for tag <- @endgame.tags do %>
<span class="tag">
{tag.name}
<button type="button" phx-click="remove_tag" phx-value-id={tag.id}>×</button>
</span>
<% end %>
</div>
</div>
<.input field={@form[:message]} type="textarea" label="Message" />
<.input field={@form[:notes]} type="textarea" label="Notes" />
<.input
@@ -94,14 +108,15 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
defp return_to(_), do: "index"
defp apply_action(socket, :edit, %{"id" => id}) do
endgame = Endgames.get_endgame!(id)
endgame = Endgames.get_endgame!(id) |> Repo.preload(:tags)
socket
|> assign(:page_title, "Edit Endgame")
|> assign(:endgame, endgame)
|> assign(:selected_tags, endgame.tags)
|> assign(:tag_query, "")
|> assign(:tag_results, [])
|> assign(:endgame, Repo.preload(endgame, :tags))
|> assign(:can_create, false)
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
end
@@ -111,67 +126,46 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
socket
|> assign(:page_title, "New Endgame")
|> assign(:endgame, endgame)
|> assign(:selected_tags, [])
|> assign(:tag_query, "")
|> assign(:tag_results, [])
|> assign(:endgame, Repo.preload(endgame, :tags))
|> assign(:can_create, false)
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
end
@impl true
def handle_event("search_tags", %{"tag_search" => query}, socket) do
tags = Tags.search(query, "endgame")
{:noreply,
socket
|> assign(:tag_query, query)
|> assign(:tag_results, tags)}
{:noreply, assign_search(socket, query)}
end
def handle_event("add_tag", %{"id" => id}, socket) do
tag = Tags.get_tag!(id)
{:ok, endgame} = Endgames.add_tag(socket.assigns.endgame, tag)
{:noreply,
socket
|> assign(:endgame, Repo.preload(endgame, :tags))
|> assign(:tag_query, "")
|> assign(:tag_results, [])}
{:noreply, socket |> add_selected_tag(tag) |> clear_search()}
end
def handle_event("create_tag", %{"name" => name}, socket) do
{:ok, tag} = Tags.get_or_create(name, "endgame")
{:ok, endgame} = Endgames.add_tag(socket.assigns.endgame, tag)
{:noreply, create_theme(socket, name)}
end
{:noreply,
socket
|> assign(:endgame, Repo.preload(endgame, :tags))
|> assign(:tag_query, "")
|> assign(:tag_results, [])}
def handle_event("create_tag_from_search", %{"tag_search" => name}, socket) do
{:noreply, create_theme(socket, name)}
end
def handle_event("remove_tag", %{"id" => id}, socket) do
tag = Tags.get_tag!(id)
{:ok, endgame} = Endgames.remove_tag(socket.assigns.endgame, tag)
{:noreply,
socket
|> assign(:endgame, Repo.preload(endgame, :tags))}
selected = Enum.reject(socket.assigns.selected_tags, &(Integer.to_string(&1.id) == id))
{:noreply, assign(socket, :selected_tags, selected)}
end
def handle_event("validate", %{"endgame" => endgame_params}, socket) do
# Compute color from the incoming FEN
color = FEN.color_from_fen(endgame_params["fen"])
fen = endgame_params["fen"] || socket.assigns.endgame.fen
color = FEN.color_from_fen(fen)
# Update the struct
endgame = %{socket.assigns.endgame | color: color}
# Build the changeset *from the updated struct*
changeset =
endgame
|> Endgames.change_endgame()
socket.assigns.endgame
|> Endgames.change_endgame(endgame_params)
|> Ecto.Changeset.put_change(:color, color)
{:noreply, assign(socket, endgame: endgame, form: to_form(changeset, action: :validate))}
{:noreply, assign(socket, form: to_form(changeset, action: :validate))}
end
def handle_event("save", %{"endgame" => endgame_params}, socket) do
@@ -179,7 +173,11 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
end
defp save_endgame(socket, :edit, endgame_params) do
case Endgames.update_endgame(socket.assigns.endgame, endgame_params) do
case Endgames.update_endgame(
socket.assigns.endgame,
endgame_params,
socket.assigns.selected_tags
) do
{:ok, endgame} ->
{:noreply,
socket
@@ -195,7 +193,7 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
color = FEN.color_from_fen(endgame_params["fen"])
params = Map.put(endgame_params, "color", color)
case Endgames.create_endgame(params) do
case Endgames.create_endgame(params, socket.assigns.selected_tags) do
{:ok, endgame} ->
{:noreply,
socket
@@ -207,6 +205,46 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
end
end
defp assign_search(socket, query) do
trimmed = String.trim(query)
results = Tags.search(query, "endgame")
can_create =
trimmed != "" and
not Enum.any?(results, &(String.downcase(&1.name) == String.downcase(trimmed)))
socket
|> assign(:tag_query, query)
|> assign(:tag_results, results)
|> assign(:can_create, can_create)
end
defp create_theme(socket, name) do
if String.trim(name) == "" do
socket
else
case Tags.get_or_create(name, "endgame") do
{:ok, tag} -> socket |> add_selected_tag(tag) |> clear_search()
{:error, _reason} -> put_flash(socket, :error, "Could not create that theme.")
end
end
end
defp clear_search(socket) do
socket
|> assign(:tag_query, "")
|> assign(:tag_results, [])
|> assign(:can_create, false)
end
defp add_selected_tag(socket, tag) do
if Enum.any?(socket.assigns.selected_tags, &(&1.id == tag.id)) do
socket
else
assign(socket, :selected_tags, socket.assigns.selected_tags ++ [tag])
end
end
defp return_path("index", _endgame), do: ~p"/admin/endgames"
defp return_path("show", endgame), do: ~p"/admin/endgames/#{endgame}"
end
@@ -2,6 +2,8 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
use ChesstrainerWeb, :live_view
alias Chesstrainer.Endgames
alias Chesstrainer.Repo
alias Chesstrainer.Tags
@impl true
def render(assigns) do
@@ -28,6 +30,9 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
<:col :let={{_id, endgame}} label="Message">{endgame.message}</:col>
<:col :let={{_id, endgame}} label="Notes">{endgame.notes}</:col>
<:col :let={{_id, endgame}} label="Result">{endgame.result}</:col>
<:col :let={{_id, endgame}} label="Themes">
{Enum.join(Tags.names(endgame.tags), ", ")}
</:col>
<:col :let={{_id, endgame}} label="Attempted">{endgame.times_attempted}</:col>
<:col :let={{_id, endgame}} label="Solved">{endgame.times_solved}</:col>
<:action :let={{_id, endgame}}>
@@ -67,6 +72,6 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
end
defp list_endgames() do
Endgames.list_endgames()
Endgames.list_endgames() |> Repo.preload(:tags)
end
end
@@ -3,6 +3,8 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
alias Chesstrainer.Endgames
alias Chesstrainer.Game
alias Chesstrainer.Repo
alias Chesstrainer.Tags
import ChesstrainerWeb.Board.BoardComponent
@@ -50,6 +52,7 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
<:item title="Message">{@endgame.message}</:item>
<:item title="Notes">{@endgame.notes}</:item>
<:item title="Result">{@endgame.result}</:item>
<:item title="Themes">{Enum.join(Tags.names(@endgame.tags), ", ")}</:item>
<:item title="Attempted">{@endgame.times_attempted}</:item>
<:item title="Solved">{@endgame.times_solved}</:item>
</.list>
@@ -62,6 +65,6 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
{:ok,
socket
|> assign(:page_title, "Show Endgame")
|> assign(:endgame, Endgames.get_endgame!(id))}
|> assign(:endgame, Endgames.get_endgame!(id) |> Repo.preload(:tags))}
end
end