feat(drivers): group per class, class filter, sorting and deleting several drivers (1.89.14)

This commit is contained in:
larssand committed 2026-11-12 22:54:25 +01:00
1 parent 1b968bc275
commit 7d711bcd7c
13 files changed
+301 -37

No files matched your search

+19 -1
View File
@@ -53,8 +53,26 @@ export async function runDriversPageSmoke({ evaluate, navigate, savedState, wait
await waitFor(async () => (await evaluate(`window.__spoken.join(" | ")`)).includes("Kiddo"), "the unsaved nickname is read out");
assert.equal((await savedState()).drivers.some((driver) => driver.name === "New Kid"), false, "testing doesn't save the driver");
console.log("PASS Test pronunciation reads the spoken name (also an unsaved one) through race audio");
// Class filter, grouping and selecting several drivers for one delete.
const before = await savedState();
const classId = before.classes[0]?.id || "";
await patchState({ drivers: [...before.drivers, { id: "dp_bulk1", name: "DP Bulk One", classId, transponder: "8550101" }, { id: "dp_bulk2", name: "DP Bulk Two", classId, transponder: "8550102" }] });
await navigate("drivers", "driverForm");
await evaluate(`(() => { const input = document.getElementById("driverBrandFilter"); input.value = "DP Bulk"; input.dispatchEvent(new Event("input", { bubbles: true })); return true; })()`);
await waitFor(async () => (await evaluate(`document.querySelectorAll("[data-driver-select]").length`)) === 2, "two drivers match the search");
assert.equal(await evaluate(`document.querySelectorAll(".driver-class-group").length >= 1`), true, "grouped per class by default");
await evaluate(`(() => { const select = document.getElementById("driverClassFilter"); select.value = ${JSON.stringify(classId)}; select.dispatchEvent(new Event("change", { bubbles: true })); return true; })()`);
assert.equal(await evaluate(`document.querySelectorAll("[data-driver-select]").length`), 2, "the class filter keeps the class's drivers");
await evaluate(`(() => { const all = document.getElementById("driverSelectAll"); all.checked = true; all.dispatchEvent(new Event("change", { bubbles: true })); return true; })()`);
assert.match(await evaluate(`document.getElementById("driverDeleteSelected").textContent`), /\(2\)/);
await evaluate(`window.__realConfirm = window.confirm; window.__confirms = []; window.confirm = (message) => { window.__confirms.push(message); return true; }; document.getElementById("driverDeleteSelected").click(); true`);
await waitFor(async () => !(await savedState()).drivers.some((driver) => driver.id.startsWith("dp_bulk")), "both selected drivers deleted");
assert.match(await evaluate(`window.__confirms[0] || ""`), /DP Bulk One/, "the confirm names the drivers");
await evaluate(`window.confirm = window.__realConfirm; const select = document.getElementById("driverClassFilter"); select.value = ""; select.dispatchEvent(new Event("change", { bubbles: true })); true`);
console.log("PASS the driver list filters on class, groups per class and deletes several selected drivers after a confirm");
} finally {
const current = await savedState();
await patchState({ drivers: current.drivers.filter((driver) => driver.id !== "dp_anders"), settings: { ...current.settings, raceAudio: seeded.settings.raceAudio, ttsEngine: seeded.settings.ttsEngine } });
await patchState({ drivers: current.drivers.filter((driver) => driver.id !== "dp_anders" && !driver.id.startsWith("dp_bulk")), settings: { ...current.settings, raceAudio: seeded.settings.raceAudio, ttsEngine: seeded.settings.ttsEngine } });
}
}
+2
View File
@@ -70,6 +70,8 @@ export async function runTeamMembershipSmoke({ evaluate, navigate, savedState, w
console.log("PASS moving a driver onto a different team's roster removes them from their previous team, with a warning shown before saving");
await navigate("drivers", "driverForm");
// Deleting asks first; answer yes here (the native dialog would block the run).
await evaluate("window.confirm = () => true; true");
await click("driver-delete-" + driverB.id);
await waitFor(async () => !(await savedState()).drivers.some((driver) => driver.id === driverB.id), "driver B deleted");
const afterDelete = (await findEvent(raceEvent.id)).raceConfig.teams.find((team) => team.name === "Membership Team B");
+49
View File
@@ -0,0 +1,49 @@
import test from "node:test";
import assert from "node:assert/strict";
import { filterDrivers, sortDrivers, groupDriversByClass, removeDrivers } from "../src/driver_list_logic.js";
const classes = { c2: "2WD", c4: "4WD" };
const getClassName = (id) => classes[id] || "";
const drivers = [
{ id: "a", name: "Roy", classId: "c4", club: "RW", transponder: "300" },
{ id: "b", name: "anders", classId: "c2", club: "", transponder: "100" },
{ id: "c", name: "Eddie", classId: "c2", club: "Östersund", transponder: "" },
{ id: "d", name: "Pia", classId: "", club: "RW", transponder: "200" },
{ id: "g", name: "Guest", classId: "c2", guestEventId: "e1" },
];
test("search matches name, transponder and club, case-insensitively; event guests are not listed", () => {
assert.deepEqual(filterDrivers(drivers, "").map((d) => d.id), ["a", "b", "c", "d"]);
assert.deepEqual(filterDrivers(drivers, "ANDERS").map((d) => d.id), ["b"]);
assert.deepEqual(filterDrivers(drivers, "rw").map((d) => d.id), ["a", "d"]);
assert.deepEqual(filterDrivers(drivers, "200").map((d) => d.id), ["d"]);
});
test("sorting by any column, either way, with empty values last", () => {
const list = filterDrivers(drivers);
assert.deepEqual(sortDrivers(list, { key: "name" }).map((d) => d.name), ["anders", "Eddie", "Pia", "Roy"]);
assert.deepEqual(sortDrivers(list, { key: "name", dir: "desc" }).map((d) => d.name), ["Roy", "Pia", "Eddie", "anders"]);
assert.deepEqual(sortDrivers(list, { key: "transponder" }).map((d) => d.id), ["b", "d", "a", "c"]);
assert.deepEqual(sortDrivers(list, { key: "transponder", dir: "desc" }).map((d) => d.id), ["a", "d", "b", "c"], "no transponder stays last");
assert.deepEqual(sortDrivers(list, { key: "class", getClassName }).map((d) => d.id), ["b", "c", "a", "d"]);
});
test("groups per class keep the sort inside each group; no class comes last", () => {
const groups = groupDriversByClass(sortDrivers(filterDrivers(drivers), { key: "name" }), getClassName);
assert.deepEqual(groups.map((g) => [g.name, g.drivers.map((d) => d.id)]), [["2WD", ["b", "c"]], ["4WD", ["a"]], ["", ["d"]]]);
});
test("deleting several drivers removes them from heats, participant lists and teams too", () => {
const state = {
drivers: drivers.map((d) => ({ ...d })),
sessions: [{ driverIds: ["a", "b", "c"], manualGridIds: ["b", "a"], assignments: [{ driverId: "b" }, { driverId: "c" }] }],
events: [{ raceConfig: { driverIds: ["a", "b"], teams: [{ name: "T", driverIds: ["b", "d"] }] } }, { name: "practice" }],
};
assert.equal(removeDrivers(state, ["b", "d"]), 2);
assert.deepEqual(state.drivers.map((d) => d.id), ["a", "c", "g"]);
assert.deepEqual(state.sessions[0].driverIds, ["a", "c"]);
assert.deepEqual(state.sessions[0].manualGridIds, ["a"]);
assert.deepEqual(state.sessions[0].assignments, [{ driverId: "c" }]);
assert.deepEqual(state.events[0].raceConfig.driverIds, ["a"]);
assert.deepEqual(state.events[0].raceConfig.teams[0].driverIds, []);
});
+1
View File
@@ -53,3 +53,4 @@ import "./list_sorting.test.js";
import "./sync_status.test.js";
import "./decoder_diagnostics.test.js";
import "./pdf_render.test.js";
import "./driver_list.test.js";