From 8b625c3d646f6e9b331db37cdc201e3dc4a84031 Mon Sep 17 00:00:00 2001 From: larssand Date: Mon, 2 Nov 2026 08:48:37 +0100 Subject: [PATCH] fix(race-setup): ask before deleting a race or a session (1.54.1) --- CHANGELOG.md | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- src/app.js | 4 ++++ src/event_manager_controller.js | 1 + src/event_workspace_controller.js | 3 +++ tests/browser_day_schedule.js | 10 ++++++++++ 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5283a44..388d359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.54.1 - 2026-11-02 + +### Fixed + +- Deleting a race (✕ in Race Setup) or a session (⋯ → Delete) now asks first, naming it and how many sessions with laps go with it. It used to delete at once, so a stray click could remove a whole race. + ## 1.54.0 - 2026-11-02 ### Changed diff --git a/package-lock.json b/package-lock.json index 5dcac5f..c5cde1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.54.0", + "version": "1.54.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.54.0", + "version": "1.54.1", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 889cec6..3e6445d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.54.0", + "version": "1.54.1", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index fe44bac..fd78fad 100644 --- a/src/app.js +++ b/src/app.js @@ -2228,6 +2228,8 @@ const TRANSLATIONS = { "events.session_max_cars_hint": "Sätt gräns om just den sessionen bara ska ha ett visst antal bilar.", "events.edit_session_help": "Ändra sessionens namn, typ, tid och seed-/startinställningar här.", "events.set_active": "Sätt aktiv", + "events.delete_race_confirm": "Ta bort racet \"{name}\"?\n\nDet tar bort {sessions} sessioner, varav {run} med körda varv. Det går inte att ångra.", + "events.delete_session_confirm": "Ta bort \"{name}\"? Heatets varv och resultat försvinner också. Det går inte att ångra.", "events.more_actions": "Fler val: utskrift, export, grid, ta bort", "events.step_practice": "Träning / seedning", "events.step_qual_round": "Kval omgång {round}", @@ -4185,6 +4187,8 @@ const TRANSLATIONS = { "events.session_max_cars_hint": "Set a limit if this session should only allow a certain number of cars.", "events.edit_session_help": "Edit the session name, type, timing and seed/start settings here.", "events.set_active": "Set Active", + "events.delete_race_confirm": "Delete the race \"{name}\"?\n\nThis deletes {sessions} sessions, {run} of them with laps run. It cannot be undone.", + "events.delete_session_confirm": "Delete \"{name}\"? Its laps and result are deleted too. It cannot be undone.", "events.more_actions": "More: print, export, grid, delete", "events.step_practice": "Practice / seeding", "events.step_qual_round": "Qualifying round {round}", diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js index ade5da3..01cea9a 100644 --- a/src/event_manager_controller.js +++ b/src/event_manager_controller.js @@ -371,6 +371,7 @@ export function renderEventManagerView(context) { })); document.getElementById(`session-delete-${s.id}`)?.addEventListener("click", () => { + if (!window.confirm(t("events.delete_session_confirm", { name: s.name }))) return; state.sessions = state.sessions.filter((x) => x.id !== s.id); delete state.resultsBySession[s.id]; if (state.activeSessionId === s.id) { diff --git a/src/event_workspace_controller.js b/src/event_workspace_controller.js index cd2c345..9d00832 100644 --- a/src/event_workspace_controller.js +++ b/src/event_workspace_controller.js @@ -292,6 +292,9 @@ export function renderEventWorkspaceView(context) { document.getElementById(`event-delete-${e.id}`)?.addEventListener("click", () => { const sessionIds = getSessionsForEvent(e.id).map((s) => s.id); + // Deleting takes every heat and lap with it, and the row is gone at once: always ask. + const run = sessionIds.filter((id) => (state.resultsBySession[id]?.passings || []).length).length; + if (!window.confirm(t("events.delete_race_confirm", { name: e.name, sessions: sessionIds.length, run }))) return; state.events = state.events.filter((x) => x.id !== e.id); state.sessions = state.sessions.filter((x) => x.eventId !== e.id); sessionIds.forEach((id) => delete state.resultsBySession[id]); diff --git a/tests/browser_day_schedule.js b/tests/browser_day_schedule.js index 580d9ea..245edca 100644 --- a/tests/browser_day_schedule.js +++ b/tests/browser_day_schedule.js @@ -101,6 +101,16 @@ export async function runDayScheduleSmoke({ evaluate, navigate, savedState, wait await evaluate(`document.getElementById("dayToggleDone").click()`); await waitFor(async () => (await rowIds()).includes("ds_4wd_q1"), "and shown again on request"); console.log("PASS today's schedule folds run heats into one line and marks the next heat"); + + // Deleting a race always asks first (the harness answers OK). + await patchState({ events: [...(await savedState()).events, { id: "ds_delete_me", name: "DS Delete Me", date: today, mode: "race", raceConfig: {} }] }); + await navigate("race_setup", "raceWizardStepForm"); + const asked = dialogs.length; + await evaluate(`document.getElementById("event-delete-ds_delete_me").click()`); + await waitFor(async () => !(await savedState()).events.some((event) => event.id === "ds_delete_me"), "the race is deleted after OK"); + assert.equal(dialogs.length, asked + 1, "a question was asked"); + assert.match(dialogs.at(-1).message, /DS Delete Me/); + console.log("PASS deleting a race asks first"); } finally { const current = await savedState(); await patchState({