feat(drivers): group per class, class filter, sorting and deleting several drivers (1.89.14)
This commit is contained in:
1 parent
1b968bc275
commit
7d711bcd7c
13 files changed
+301
-37
No files matched your search
@@ -8,6 +8,17 @@ The application version is maintained in `package.json` and displayed in the adm
|
||||
|
||||
No changes recorded yet.
|
||||
|
||||
## 1.89.14
|
||||
|
||||
### Added
|
||||
|
||||
- Drivers: the list is grouped per class (fold open and closed), with a class filter, sorting by name, class, club, transponder or brand, and a count of drivers shown.
|
||||
- Drivers: tick several drivers (or all shown) and delete them in one go, after a confirm that names them.
|
||||
|
||||
### Changed
|
||||
|
||||
- Deleting a single driver now asks first.
|
||||
|
||||
## 1.89.13
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -17,6 +17,7 @@ Swedish version: [README.sv.md](README.sv.md) · Changes: [CHANGELOG.md](CHANGEL
|
||||
- [Audio and announcements](#audio-and-announcements)
|
||||
- [Overlays and OBS](#overlays-and-obs)
|
||||
- [Sponsor events with shared cars](#sponsor-events-with-shared-cars)
|
||||
- [Driver register](#driver-register)
|
||||
- [Data, backups and import/export](#data-backups-and-importexport)
|
||||
- [Security](#security)
|
||||
- [Video guides](#video-guides)
|
||||
@@ -300,6 +301,12 @@ The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus
|
||||
4. Run the heats on **Race Day** like a race (▶ Next, Start, Pause, Stop, count-down, start signal and calls). The car's transponder counts for whoever drives it in that heat, and the car is shown next to the driver's name (🚗 Rental 2) on the overlay, the OBS overlay and Race Day's live list.
|
||||
5. **Create finals** from qualifying; cars are drawn for the finals. The race overview and the results archive show the car per driver and heat.
|
||||
|
||||
### Driver register
|
||||
|
||||
- **Drivers** lists every driver grouped per class (folds open and closed; untick **Group by class** for one list).
|
||||
- **Search** on name, transponder, brand, club or country, **Class** to show just one class, and **Sort by** name, class, club, transponder or brand (↑/↓ reverses). Sort and grouping are remembered in the browser.
|
||||
- **Select** drivers with the boxes (or **Select all shown**) and **Delete selected**; a confirm names them first. Deleting, one or many, also removes the drivers from every heat, participant list and team.
|
||||
|
||||
### Data, backups and import/export
|
||||
|
||||
- **Storage:**
|
||||
|
||||
@@ -23,6 +23,7 @@ English version: [README.md](README.md) · Ändringar: [CHANGELOG.md](CHANGELOG.
|
||||
- [Ljud och utrop](#ljud-och-utrop)
|
||||
- [Overlays och OBS](#overlays-och-obs)
|
||||
- [Sponsorevent med delade bilar](#sponsorevent-med-delade-bilar)
|
||||
- [Förarregister](#förarregister)
|
||||
- [Data, backup och export/import](#data-backup-och-exportimport)
|
||||
- [Säkerhet](#säkerhet)
|
||||
- [Videoguider](#videoguider)
|
||||
@@ -313,6 +314,12 @@ Menyn **Overlay** har lägena leaderboard, speaker, resultat, TV och lag, plus e
|
||||
4. Kör heaten på **Race Day** som ett race (▶ Nästa, Start, Paus, Stopp, nedräkning, startsignal och utrop). Bilens transponder räknas för den som kör den i heatet, och bilen visas bredvid förarens namn (🚗 Hyrbil 2) i overlayn, OBS-overlayn och Race Days live-lista.
|
||||
5. **Skapa finaler** från kvalet; bilarna lottas i finalerna. Race-översikten och resultatarkivet visar bilen per förare och heat.
|
||||
|
||||
### Förarregister
|
||||
|
||||
- **Förare** listar alla förare grupperade per klass (grupperna fälls ut och ihop; bocka ur **Gruppera per klass** för en lista).
|
||||
- **Sök** på namn, transponder, märke, klubb eller land, **Klass** för att bara visa en klass och **Sortera på** namn, klass, klubb, transponder eller märke (↑/↓ vänder). Sortering och gruppering sparas i webbläsaren.
|
||||
- **Markera** förare med rutorna (eller **Markera alla som visas**) och **Radera markerade**; en bekräftelse visar namnen först. Radering, en eller flera, tar också bort förarna från alla heat, deltagarlistor och team.
|
||||
|
||||
### Data, backup och export/import
|
||||
|
||||
- **Lagring:**
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.13",
|
||||
"version": "1.89.14",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.13",
|
||||
"version": "1.89.14",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"better-sqlite3": "^12.11.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.13",
|
||||
"version": "1.89.14",
|
||||
"private": true,
|
||||
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
||||
"engines": {
|
||||
|
||||
+38
@@ -1975,6 +1975,25 @@ const TRANSLATIONS = {
|
||||
"drivers.create": "Skapa förare",
|
||||
"drivers.name_placeholder": "Förarnamn",
|
||||
"drivers.brand_placeholder": "Team / märke (valfritt)",
|
||||
"drivers.class_filter": "Klass",
|
||||
"drivers.all_classes": "Alla klasser",
|
||||
"drivers.no_class": "Utan klass",
|
||||
"drivers.sort_by": "Sortera på",
|
||||
"drivers.sort_name": "Namn",
|
||||
"drivers.sort_class": "Klass",
|
||||
"drivers.sort_club": "Klubb",
|
||||
"drivers.sort_transponder": "Transponder",
|
||||
"drivers.sort_brand": "Märke",
|
||||
"drivers.sort_dir": "Vänd sorteringen",
|
||||
"drivers.group_by_class": "Gruppera per klass",
|
||||
"drivers.count": "{shown} av {total} förare",
|
||||
"drivers.group_count": "{count} förare",
|
||||
"drivers.select_all": "Markera alla som visas",
|
||||
"drivers.select_driver": "Markera {name}",
|
||||
"drivers.delete_selected": "Radera markerade ({count})",
|
||||
"drivers.delete_confirm_one": "Radera {name}? Föraren tas bort från registret och från alla heat och deltagarlistor. Det går inte att ångra.",
|
||||
"drivers.delete_confirm_many": "Radera {count} förare? {names}\n\nDe tas bort från registret och från alla heat och deltagarlistor. Det går inte att ångra.",
|
||||
"drivers.none_found": "Inga förare matchar sökningen.",
|
||||
"drivers.brand_filter_placeholder": "Sök namn / transponder / märke / klubb / land",
|
||||
"drivers.transponder_placeholder": "Personlig transponder (valfritt)",
|
||||
"drivers.transponder_conflict_confirm": "Transpondern {tp} används redan av {name} ({class}). Spara ändå?",
|
||||
@@ -4252,6 +4271,25 @@ const TRANSLATIONS = {
|
||||
"drivers.create": "Create Driver",
|
||||
"drivers.name_placeholder": "Driver name",
|
||||
"drivers.brand_placeholder": "Team / brand (optional)",
|
||||
"drivers.class_filter": "Class",
|
||||
"drivers.all_classes": "All classes",
|
||||
"drivers.no_class": "No class",
|
||||
"drivers.sort_by": "Sort by",
|
||||
"drivers.sort_name": "Name",
|
||||
"drivers.sort_class": "Class",
|
||||
"drivers.sort_club": "Club",
|
||||
"drivers.sort_transponder": "Transponder",
|
||||
"drivers.sort_brand": "Brand",
|
||||
"drivers.sort_dir": "Reverse the sort",
|
||||
"drivers.group_by_class": "Group by class",
|
||||
"drivers.count": "{shown} of {total} drivers",
|
||||
"drivers.group_count": "{count} drivers",
|
||||
"drivers.select_all": "Select all shown",
|
||||
"drivers.select_driver": "Select {name}",
|
||||
"drivers.delete_selected": "Delete selected ({count})",
|
||||
"drivers.delete_confirm_one": "Delete {name}? The driver is removed from the register and from every heat and participant list. This can't be undone.",
|
||||
"drivers.delete_confirm_many": "Delete {count} drivers? {names}\n\nThey are removed from the register and from every heat and participant list. This can't be undone.",
|
||||
"drivers.none_found": "No drivers match the search.",
|
||||
"drivers.brand_filter_placeholder": "Search name / transponder / brand / club / country",
|
||||
"drivers.transponder_placeholder": "Personal transponder (optional)",
|
||||
"drivers.transponder_conflict_confirm": "Transponder {tp} is already used by {name} ({class}). Save anyway?",
|
||||
|
||||
+96
-33
@@ -1,4 +1,24 @@
|
||||
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js";
|
||||
import { filterDrivers, sortDrivers, groupDriversByClass, removeDrivers, DRIVER_SORT_KEYS } from "./driver_list_logic.js";
|
||||
|
||||
// The driver list's own view settings; kept for the browser tab (sort and grouping also in
|
||||
// localStorage), the selection only while the page is open.
|
||||
const DRIVER_LIST_PREFS_KEY = "rcDriverListPrefs";
|
||||
const driverList = (() => {
|
||||
let saved = {};
|
||||
try { saved = JSON.parse(localStorage.getItem(DRIVER_LIST_PREFS_KEY) || "{}") || {}; } catch { saved = {}; }
|
||||
return {
|
||||
sortKey: DRIVER_SORT_KEYS.includes(saved.sortKey) ? saved.sortKey : "name",
|
||||
sortDir: saved.sortDir === "desc" ? "desc" : "asc",
|
||||
grouped: saved.grouped !== false,
|
||||
classFilter: "",
|
||||
collapsed: new Set(),
|
||||
selected: new Set(),
|
||||
};
|
||||
})();
|
||||
const saveDriverListPrefs = () => {
|
||||
try { localStorage.setItem(DRIVER_LIST_PREFS_KEY, JSON.stringify({ sortKey: driverList.sortKey, sortDir: driverList.sortDir, grouped: driverList.grouped })); } catch { /* per-viewer convenience only */ }
|
||||
};
|
||||
import { isPracticeSessionType } from "./track_layouts_logic.js";
|
||||
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
||||
import { openHouseOfRcDriverImport, lookupHouseOfRcTransponders } from "./houseofrc_view.js";
|
||||
@@ -392,10 +412,15 @@ export function renderDriversView(deps) {
|
||||
testDriverVoice = () => {},
|
||||
} = deps;
|
||||
const classOptions = state.classes.map((c) => `<option value="${c.id}">${escapeHtml(c.name)}</option>`).join("");
|
||||
const driverSearch = driverBrandFilter().trim().toLowerCase();
|
||||
const filteredDrivers = state.drivers.filter((driver) => !driver.guestEventId && (
|
||||
!driverSearch || [driver.name, driver.speechName, driver.transponder, driver.brand, driver.club, driver.country].map((value) => String(value || "").toLowerCase()).some((value) => value.includes(driverSearch))
|
||||
));
|
||||
const registered = filterDrivers(state.drivers, "");
|
||||
const filteredDrivers = sortDrivers(
|
||||
filterDrivers(state.drivers, driverBrandFilter()).filter((driver) => !driverList.classFilter || String(driver.classId || "") === driverList.classFilter),
|
||||
{ key: driverList.sortKey, dir: driverList.sortDir, getClassName }
|
||||
);
|
||||
// A driver deleted elsewhere or filtered away is not "selected" for a bulk delete.
|
||||
const visibleIds = new Set(filteredDrivers.map((driver) => driver.id));
|
||||
[...driverList.selected].forEach((id) => { if (!visibleIds.has(id)) driverList.selected.delete(id); });
|
||||
const listClasses = groupDriversByClass(registered, getClassName);
|
||||
const editingDriver = state.drivers.find((driver) => driver.id === selectedDriverEditId()) || null;
|
||||
const profileGroups = getDriverProfileGroups(state);
|
||||
const profileOptions = profileGroups
|
||||
@@ -440,19 +465,36 @@ export function renderDriversView(deps) {
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-header"><h3>${t("drivers.title")}</h3><button class="btn" id="driversHouseOfRc" type="button" title="${escapeHtml(t("houseofrc.import_button_hint"))}">🏠 ${t("houseofrc.import_button")}</button></div>
|
||||
<div class="panel-body">
|
||||
<input id="driverBrandFilter" value="${escapeHtml(driverBrandFilter())}" placeholder="${t("drivers.brand_filter_placeholder")}" />
|
||||
<div class="panel-body driver-list-toolbar">
|
||||
<input id="driverBrandFilter" type="search" value="${escapeHtml(driverBrandFilter())}" placeholder="${t("drivers.brand_filter_placeholder")}" />
|
||||
<label>${t("drivers.class_filter")}<select id="driverClassFilter">
|
||||
<option value="">${t("drivers.all_classes")}</option>
|
||||
${listClasses.map((group) => `<option value="${escapeHtml(group.classId)}" ${group.classId === driverList.classFilter ? "selected" : ""}>${escapeHtml(group.name || t("drivers.no_class"))} (${group.drivers.length})</option>`).join("")}
|
||||
</select></label>
|
||||
<label>${t("drivers.sort_by")}<select id="driverSortKey">
|
||||
${DRIVER_SORT_KEYS.map((key) => `<option value="${key}" ${key === driverList.sortKey ? "selected" : ""}>${t(`drivers.sort_${key}`)}</option>`).join("")}
|
||||
</select></label>
|
||||
<button class="btn btn-mini" type="button" id="driverSortDir" title="${t("drivers.sort_dir")}">${driverList.sortDir === "desc" ? "↓ Ö–A" : "↑ A–Ö"}</button>
|
||||
<label class="toggle"><input type="checkbox" id="driverGrouped" ${driverList.grouped ? "checked" : ""} /><span>${t("drivers.group_by_class")}</span></label>
|
||||
<span class="driver-list-count">${t("drivers.count", { shown: filteredDrivers.length, total: registered.length })}</span>
|
||||
</div>
|
||||
<div class="panel-body driver-list-bulk">
|
||||
<label class="toggle"><input type="checkbox" id="driverSelectAll" ${filteredDrivers.length && filteredDrivers.every((d) => driverList.selected.has(d.id)) ? "checked" : ""} ${filteredDrivers.length ? "" : "disabled"} /><span>${t("drivers.select_all")}</span></label>
|
||||
<button class="btn btn-danger btn-mini" type="button" id="driverDeleteSelected" ${driverList.selected.size ? "" : "disabled"}>🗑 ${t("drivers.delete_selected", { count: driverList.selected.size })}</button>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
${renderTable(
|
||||
[t("table.name"), t("table.class"), t("drivers.club"), t("drivers.country"), t("table.brand"), t("table.transponder"), t("drivers.training_profile"), t("drivers.speech_name"), t("events.actions")],
|
||||
filteredDrivers.map(
|
||||
(d) => {
|
||||
${(() => {
|
||||
// Grouped per class, the class column would only repeat the group's heading.
|
||||
const showClass = !driverList.grouped;
|
||||
const table = (drivers) => renderTable(
|
||||
["", t("table.name"), ...(showClass ? [t("table.class")] : []), t("drivers.club"), t("drivers.country"), t("table.brand"), t("table.transponder"), t("drivers.training_profile"), t("drivers.speech_name"), t("events.actions")],
|
||||
drivers.map((d) => {
|
||||
const profile = profileGroups.find((item) => item.id === getDriverProfileId(d));
|
||||
return `
|
||||
<tr>
|
||||
<tr class="${driverList.selected.has(d.id) ? "is-selected" : ""}">
|
||||
<td><input type="checkbox" data-driver-select="${escapeHtml(d.id)}" ${driverList.selected.has(d.id) ? "checked" : ""} aria-label="${escapeHtml(t("drivers.select_driver", { name: d.name }))}" /></td>
|
||||
<td>${escapeHtml(d.name)}</td>
|
||||
<td>${escapeHtml(getClassName(d.classId))}</td>
|
||||
${showClass ? `<td>${escapeHtml(getClassName(d.classId))}</td>` : ""}
|
||||
<td>${escapeHtml(profile?.club || d.club || "-")}</td>
|
||||
<td>${escapeHtml(profile?.country || d.country || "-")}</td>
|
||||
<td>${escapeHtml(d.brand || "-")}</td>
|
||||
@@ -464,11 +506,17 @@ export function renderDriversView(deps) {
|
||||
<button id="driver-edit-${d.id}" class="btn">${t("common.edit")}</button>
|
||||
<button id="driver-delete-${d.id}" class="btn btn-danger">${t("common.delete")}</button>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
)
|
||||
)}
|
||||
</tr>`;
|
||||
})
|
||||
);
|
||||
if (!filteredDrivers.length) return `<p class="hint">${t("drivers.none_found")}</p>`;
|
||||
if (!driverList.grouped) return table(filteredDrivers);
|
||||
return groupDriversByClass(filteredDrivers, getClassName).map((group) => `
|
||||
<details class="driver-class-group" data-driver-group="${escapeHtml(group.classId)}" ${driverList.collapsed.has(group.classId) ? "" : "open"}>
|
||||
<summary><strong>${escapeHtml(group.name || t("drivers.no_class"))}</strong> <small>${t("drivers.group_count", { count: group.drivers.length })}</small></summary>
|
||||
${table(group.drivers)}
|
||||
</details>`).join("");
|
||||
})()}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -582,6 +630,34 @@ export function renderDriversView(deps) {
|
||||
if (driver) testDriverVoice({ spokenName: driver.speechName || driver.name, passSound: driver.passSound || "" });
|
||||
}));
|
||||
|
||||
const rerenderList = () => renderDriversView(deps);
|
||||
document.getElementById("driverClassFilter")?.addEventListener("change", (event) => { driverList.classFilter = event.currentTarget.value; rerenderList(); });
|
||||
document.getElementById("driverSortKey")?.addEventListener("change", (event) => { driverList.sortKey = event.currentTarget.value; saveDriverListPrefs(); rerenderList(); });
|
||||
document.getElementById("driverSortDir")?.addEventListener("click", () => { driverList.sortDir = driverList.sortDir === "desc" ? "asc" : "desc"; saveDriverListPrefs(); rerenderList(); });
|
||||
document.getElementById("driverGrouped")?.addEventListener("change", (event) => { driverList.grouped = event.currentTarget.checked; saveDriverListPrefs(); rerenderList(); });
|
||||
document.querySelectorAll(".driver-class-group").forEach((node) => node.addEventListener("toggle", () => {
|
||||
if (node.open) driverList.collapsed.delete(node.dataset.driverGroup); else driverList.collapsed.add(node.dataset.driverGroup);
|
||||
}));
|
||||
document.querySelectorAll("[data-driver-select]").forEach((box) => box.addEventListener("change", () => {
|
||||
if (box.checked) driverList.selected.add(box.dataset.driverSelect); else driverList.selected.delete(box.dataset.driverSelect);
|
||||
rerenderList();
|
||||
}));
|
||||
document.getElementById("driverSelectAll")?.addEventListener("change", (event) => {
|
||||
filteredDrivers.forEach((driver) => (event.currentTarget.checked ? driverList.selected.add(driver.id) : driverList.selected.delete(driver.id)));
|
||||
rerenderList();
|
||||
});
|
||||
document.getElementById("driverDeleteSelected")?.addEventListener("click", () => {
|
||||
const ids = [...driverList.selected];
|
||||
if (!ids.length) return;
|
||||
const names = state.drivers.filter((driver) => driverList.selected.has(driver.id)).map((driver) => driver.name);
|
||||
const preview = names.slice(0, 10).join(", ") + (names.length > 10 ? ` … (+${names.length - 10})` : "");
|
||||
if (!window.confirm(t("drivers.delete_confirm_many", { count: ids.length, names: preview }))) return;
|
||||
removeDrivers(state, ids);
|
||||
driverList.selected.clear();
|
||||
saveState();
|
||||
renderView();
|
||||
});
|
||||
|
||||
document.getElementById("driverBrandFilter")?.addEventListener("input", (event) => {
|
||||
const input = event.currentTarget;
|
||||
if (!(input instanceof HTMLInputElement)) {
|
||||
@@ -621,22 +697,9 @@ export function renderDriversView(deps) {
|
||||
});
|
||||
|
||||
document.getElementById(`driver-delete-${d.id}`)?.addEventListener("click", () => {
|
||||
state.drivers = state.drivers.filter((x) => x.id !== d.id);
|
||||
state.sessions.forEach((s) => {
|
||||
s.assignments = (s.assignments || []).filter((a) => a.driverId !== d.id);
|
||||
s.driverIds = (s.driverIds || []).filter((id) => id !== d.id);
|
||||
s.manualGridIds = (s.manualGridIds || []).filter((id) => id !== d.id);
|
||||
});
|
||||
// Otherwise a deleted driver stays a "member" of every team/participant list they
|
||||
// were ever added to, silently inflating team/participant counts forever.
|
||||
state.events.forEach((event) => {
|
||||
if (!event.raceConfig) return;
|
||||
event.raceConfig.driverIds = (event.raceConfig.driverIds || []).filter((id) => id !== d.id);
|
||||
event.raceConfig.teams = (event.raceConfig.teams || []).map((team) => ({
|
||||
...team,
|
||||
driverIds: (team.driverIds || []).filter((id) => id !== d.id),
|
||||
}));
|
||||
});
|
||||
if (!window.confirm(t("drivers.delete_confirm_one", { name: d.name }))) return;
|
||||
removeDrivers(state, [d.id]);
|
||||
driverList.selected.delete(d.id);
|
||||
saveState();
|
||||
renderView();
|
||||
});
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
// The driver list: search, sort, group per class, and removing drivers everywhere they are
|
||||
// referenced. Pure logic - the view is renderDriversView in core_views.js.
|
||||
|
||||
export const DRIVER_SORT_KEYS = ["name", "class", "club", "transponder", "brand"];
|
||||
|
||||
// Drivers matching the search (name, spoken name, transponder, brand, club, country). Guest
|
||||
// drivers that belong to one event are not part of the register.
|
||||
export function filterDrivers(drivers, search = "") {
|
||||
const needle = String(search || "").trim().toLowerCase();
|
||||
return (drivers || []).filter((driver) => !driver.guestEventId && (
|
||||
!needle || [driver.name, driver.speechName, driver.transponder, driver.brand, driver.club, driver.country]
|
||||
.some((value) => String(value || "").toLowerCase().includes(needle))
|
||||
));
|
||||
}
|
||||
|
||||
// Sorted by one column; empty values go last whatever the direction, ties by name.
|
||||
export function sortDrivers(drivers, { key = "name", dir = "asc", getClassName = () => "" } = {}) {
|
||||
const value = (driver) => String(key === "class" ? getClassName(driver.classId) : driver[key] || "").trim();
|
||||
const byName = (a, b) => String(a.name || "").localeCompare(String(b.name || ""), "sv", { numeric: true, sensitivity: "base" });
|
||||
const sign = dir === "desc" ? -1 : 1;
|
||||
return [...(drivers || [])].sort((a, b) => {
|
||||
const va = value(a);
|
||||
const vb = value(b);
|
||||
if (!va !== !vb) return va ? -1 : 1;
|
||||
return sign * va.localeCompare(vb, "sv", { numeric: true, sensitivity: "base" }) || byName(a, b);
|
||||
});
|
||||
}
|
||||
|
||||
// One group per class in the order the drivers come in; drivers without a class last.
|
||||
export function groupDriversByClass(drivers, getClassName = () => "") {
|
||||
const groups = new Map();
|
||||
(drivers || []).forEach((driver) => {
|
||||
const id = String(driver.classId || "");
|
||||
if (!groups.has(id)) groups.set(id, { classId: id, name: getClassName(id) || "", drivers: [] });
|
||||
groups.get(id).drivers.push(driver);
|
||||
});
|
||||
return [...groups.values()].sort((a, b) => (!a.name !== !b.name ? (a.name ? -1 : 1) : a.name.localeCompare(b.name, "sv", { numeric: true })));
|
||||
}
|
||||
|
||||
// Removes drivers from the register and from every heat, participant list and team, so a
|
||||
// deleted driver doesn't keep inflating counts. Returns how many were removed.
|
||||
export function removeDrivers(state, ids) {
|
||||
const gone = new Set((ids || []).map(String));
|
||||
const before = state.drivers.length;
|
||||
state.drivers = state.drivers.filter((driver) => !gone.has(String(driver.id)));
|
||||
const keep = (list) => (list || []).filter((id) => !gone.has(String(id)));
|
||||
state.sessions.forEach((session) => {
|
||||
session.assignments = (session.assignments || []).filter((item) => !gone.has(String(item.driverId)));
|
||||
session.driverIds = keep(session.driverIds);
|
||||
session.manualGridIds = keep(session.manualGridIds);
|
||||
});
|
||||
state.events.forEach((event) => {
|
||||
if (!event.raceConfig) return;
|
||||
event.raceConfig.driverIds = keep(event.raceConfig.driverIds);
|
||||
event.raceConfig.teams = (event.raceConfig.teams || []).map((team) => ({ ...team, driverIds: keep(team.driverIds) }));
|
||||
});
|
||||
return before - state.drivers.length;
|
||||
}
|
||||
@@ -5041,3 +5041,13 @@ body[data-theme="light"] .overlay-race-driver .overlay-pit-badge.is-done { color
|
||||
body[data-theme="light"] .overlay-split-chip { color: #075985; }
|
||||
body[data-theme="light"] .overlay-pit-badge.is-done { color: #7a4a00; }
|
||||
.race-overview-heat-actions { display: inline-flex; gap: 4px; margin-left: 8px; vertical-align: middle; }
|
||||
.driver-list-toolbar { display: flex; flex-wrap: wrap; gap: 10px 14px; align-items: flex-end; }
|
||||
.driver-list-toolbar #driverBrandFilter { flex: 1 1 220px; }
|
||||
.driver-list-toolbar label:not(.toggle) { display: grid; gap: 4px; font-size: 0.85rem; color: var(--muted); }
|
||||
.driver-list-count { color: var(--muted); font-size: 0.85rem; margin-left: auto; }
|
||||
.driver-list-bulk { display: flex; flex-wrap: wrap; gap: 12px; align-items: center; padding-top: 0; }
|
||||
.driver-class-group { margin-bottom: 10px; }
|
||||
.driver-class-group > summary { cursor: pointer; padding: 6px 0; }
|
||||
tr.is-selected td { background: color-mix(in srgb, var(--danger) 12%, transparent); }
|
||||
.driver-list-toolbar label.toggle, .driver-list-bulk label.toggle { display: inline-flex; align-items: center; gap: 8px; white-space: nowrap; width: auto; }
|
||||
.driver-list-toolbar label.toggle input, .driver-list-bulk label.toggle input { width: auto; margin: 0; }
|
||||
@@ -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 } });
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
|
||||
@@ -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, []);
|
||||
});
|
||||
@@ -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";
|
||||
Reference in new issue
Block a user