Set event when navigating to/from the results page.

lgarron · lgarron · commit ac7836c91e0a · 2026-01-13T13:10:31.000-08:00
diff --git a/src/timer.cubing.net/app/TimerApp.ts b/src/timer.cubing.net/app/TimerApp.ts
@@ -53,7 +53,7 @@ export class TimerApp {
     this.session.startSync(this.onSyncChange.bind(this));
 
     this.scrambleView = new ScrambleView(this);
-    this.statsView = new StatsView();
+    this.statsView = new StatsView(() => this.currentEvent);
     this.domElement = <HTMLElement>document.getElementById("timer-app");
 
     this.enableOffline();
diff --git a/src/timer.cubing.net/results.html b/src/timer.cubing.net/results.html
@@ -35,7 +35,7 @@
 
 <body>
   <p>
-    <a href="./">Back to timer!</a><br><br>
+    <a href="./" id="back-to-timer">Back to timer!</a><br><br>
     <button id="export">Export all events</button>
     <button id="export-to-cstimer">Export event to CSTimer (incomplete)</button>
     <button id="export-to-qqtimer">Export event to QQTimer format</button>
diff --git a/src/timer.cubing.net/ui/StatsView.ts b/src/timer.cubing.net/ui/StatsView.ts
@@ -1,5 +1,6 @@
 /** biome-ignore-all lint/complexity/useLiteralKeys: Known Biome limitation. */
 
+import type { EventID } from "../app/events";
 import type { AttemptDataWithIDAndRev } from "../results/AttemptData";
 // import {ScrambleID} from "./scramble-worker"
 import { trForAttempt } from "./results-table";
@@ -22,7 +23,7 @@ export class StatsView {
   private statsDropdown: HTMLSelectElement;
   private elems: { [s: string]: HTMLOptionElement };
   private sidebarElems: { [s: string]: HTMLOptionElement };
-  constructor() {
+  constructor(getCurrentEvent: () => EventID) {
     this.statsDropdown = <HTMLSelectElement>(
       document.getElementById("stats-dropdown")
     );
@@ -81,12 +82,10 @@ export class StatsView {
     );
     for (const resultsLink of [...resultsLinks]) {
       resultsLink.addEventListener("click", (e: Event) => {
+        const url = new URL(resultsLink.href);
+        url.searchParams.set("event", getCurrentEvent());
+        window.location.href = url.toString();
         e.preventDefault();
-        window.location.href = resultsLink.href;
-        // Don't set event for now.
-        // const url = new URL(resultsLink.href);
-        // url.searchParams.set("event", getCurrentEvent())
-        // window.location.href = url.toString();
       });
     }
   }
diff --git a/src/timer.cubing.net/ui/results-page.ts b/src/timer.cubing.net/ui/results-page.ts
@@ -82,8 +82,16 @@ function addEventIDOptions(): void {
   }
 }
 
+function backURL(event: EventID): URL {
+  const url = new URL("../", import.meta.url);
+  url.searchParams.set("event", event);
+  return url;
+}
+
 export async function showData(): Promise<void> {
-  const eventId = getEventID();
+  const eventID = getEventID();
+  document.querySelector<HTMLAnchorElement>("#back-to-timer")!.href =
+    backURL(eventID).toString();
   const rangeSelector = getRangeSelector();
 
   const tableBody = document.querySelector("#results tbody") as HTMLBodyElement;
@@ -96,7 +104,7 @@ export async function showData(): Promise<void> {
       unfilteredAttempts = (
         await session.mostRecentAttempts(
           MAX_NUM_RECENT_ATTEMPTS,
-          eventId as EventID,
+          eventID as EventID,
           rangeSelector === "most-recent",
         )
       ).docs;
@@ -108,15 +116,15 @@ export async function showData(): Promise<void> {
       unfilteredAttempts = await session.extremeTimes(
         MAX_NUM_RECENT_ATTEMPTS,
         rangeSelector === "worst",
-        eventId as EventID,
+        eventID as EventID,
       );
       break;
     }
     default:
       throw new Error("unexpected range selector");
   }
   const attempts = unfilteredAttempts.filter(
-    (attempt: AttemptData) => attempt.event === eventId,
+    (attempt: AttemptData) => attempt.event === eventID,
   );
   for (const attempt of attempts) {
     if (!attempt.totalResultMs) {
