fix(timetable): make ?day query the source of truth with validation and fallback

Per Phase A finding A6 — the previous three-watcher Pinia-store design had no validation. Landing on /events/{e}/timetable?day=DOES_NOT_EXIST quietly set store.activeDayId to that bogus value and showed an empty page. Cross-org sub-event IDs were silently accepted (backend OrganisationScope returned an empty perf list, so the UI looked broken without telling the user). New design (Session 4 follow-up Step 5): - src/composables/timetable/useActiveDay.ts (NEW) - The URL `?day` is the source of truth; Pinia does NOT hold this value. - `activeDayId` is a computed: queryDay if it appears in `validIds`, else the first valid id, else null when the list is empty. - One corrective watcher (immediate:true, flush:'post') quietly rewrites the URL when `?day` is missing or invalid; runs after Vue settles and after validIds has been recomputed from a fresh fetch. - `setActiveDay(id)` is the user-driven entry point — calls replace(). - Cross-org IDs are blocked transparently: OrganisationScope keeps them out of validIds, so they fail the .includes() check and fall back. - src/stores/useTimetableStore.ts - Removed `activeDayId` state and `setActiveDay()` action; the store docstring now documents that day-state lives at the URL. - src/pages/events/[id]/timetable/index.vue - Replaced the three watchers + onMounted bootstrap with one `useActiveDay({ queryDay, validIds, replace })` call. The day-change side-effect watcher (clear drag, deselect performance) stays. - VTabs binds dayIdRef + setActiveDay directly. - tests/unit/pages/timetableDaySync.test.ts (NEW, 9 tests) - Valid ?day=X → activeDayId=X, no URL rewrite. - Missing / invalid / cross-org ?day → fallback + URL replaced once. - Empty validIds → activeDayId=null, URL untouched. - setActiveDay(id) → calls replace. - setActiveDay(null) → no-op. - External URL change (browser back) → activeDayId follows. - validIds populated AFTER mount → fallback fires correctly. - tests/unit/stores/useTimetableStore.test.ts: assert that activeDayId and setActiveDay are GONE from the store surface. Test count: 324 → 333. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-09 03:37:31 +02:00
parent 8d1cb39172
commit e99acbde95
5 changed files with 274 additions and 31 deletions
--- a/apps/app/src/composables/timetable/useActiveDay.ts
+++ b/apps/app/src/composables/timetable/useActiveDay.ts
@@ -0,0 +1,71 @@
+import { computed, watch } from 'vue'
+import type { Ref } from 'vue'
+
+/**
+ * `?day` query param ↔ active sub-event id binding for the timetable page.
+ *
+ * The URL is the source of truth. The store does NOT hold this value.
+ *
+ * Behaviour (RFC v0.2 §6.2 / Session 4 follow-up Step 5):
+ *  - If `?day=X` is in `validIds`         → activeDayId = X.
+ *  - If `?day=X` is missing or invalid    → activeDayId = first valid id,
+ *                                           and the URL is silently rewritten
+ *                                           via `replace({day: firstValidId})`.
+ *  - If `validIds` is empty (event has    → activeDayId = null.
+ *    no sub-events / data still loading)
+ *
+ * Cross-org sub-event IDs are blocked transparently: `OrganisationScope`
+ * on the backend never returns them, so they fail `validIds.includes(...)`
+ * and fall back to the first valid id from the user's own organisation.
+ */
+export interface UseActiveDayDeps {
+
+  /** Reactive read of `route.query.day`. Must coerce array → string outside. */
+  queryDay: Ref<string | null>
+
+  /** Reactive list of sub-event IDs the user is allowed to see for this event. */
+  validIds: Ref<string[]>
+
+  /** `router.replace` wrapper that updates ONLY the `day` query param. */
+  replace: (dayId: string) => void
+}
+
+export interface UseActiveDayReturn {
+  activeDayId: Ref<string | null>
+  setActiveDay: (id: string | null) => void
+}
+
+export function useActiveDay(deps: UseActiveDayDeps): UseActiveDayReturn {
+  const activeDayId = computed<string | null>(() => {
+    const ids = deps.validIds.value
+    if (ids.length === 0)
+      return null
+    const q = deps.queryDay.value
+    if (q && ids.includes(q))
+      return q
+
+    return ids[0]
+  })
+
+  // Single corrective watcher — quietly rewrites the URL when the query param
+  // is missing or invalid. immediate:true so a mount with `?day=null` (or
+  // an invalid value) corrects the URL on first paint instead of waiting
+  // for the next user interaction. flush:'post' so it runs after Vue settles
+  // and after validIds has been recomputed from a fresh fetch.
+  watch([() => deps.queryDay.value, () => deps.validIds.value], ([q, ids]) => {
+    if (ids.length === 0)
+      return
+    if (q === null || !ids.includes(q))
+      deps.replace(ids[0])
+  }, { flush: 'post', immediate: true })
+
+  function setActiveDay(id: string | null): void {
+    if (id === null)
+      return
+    if (id === deps.queryDay.value)
+      return
+    deps.replace(id)
+  }
+
+  return { activeDayId, setActiveDay }
+}
--- a/apps/app/src/pages/events/[id]/timetable/index.vue
+++ b/apps/app/src/pages/events/[id]/timetable/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import EventTabsNav from '@/components/events/EventTabsNav.vue'
 import AddPerformanceDialog from '@/components/timetable/AddPerformanceDialog.vue'
 import EmptyDayState from '@/components/timetable/EmptyDayState.vue'
@@ -14,6 +14,7 @@ import Wachtrij from '@/components/timetable/Wachtrij.vue'
 import { useEventChildren, useEventDetail } from '@/composables/api/useEvents'
 import { useTimetable } from '@/composables/api/useTimetable'
 import { useTimetableMutations } from '@/composables/api/useTimetableMutations'
+import { useActiveDay } from '@/composables/timetable/useActiveDay'
 import { useDragOrClick } from '@/composables/timetable/useDragOrClick'
 import { useTimetableKeyboard } from '@/composables/timetable/useTimetableKeyboard'
 import { generateIdempotencyKey } from '@/lib/idempotencyKey'
@@ -59,22 +60,31 @@ const dayOptions = computed(() => {
  return (subEvents.value ?? []).map(c => ({ id: c.id, name: c.name, start_date: null }))
 })

-const dayIdRef = computed<string | null>(() => store.activeDayId)
+// `?day` is the source of truth — Pinia derives from it, never owns it.
+// Behaviour fully delegated to useActiveDay (RFC §6.2 / Session 4 follow-up
+// Step 5). Cross-org IDs are blocked transparently: OrganisationScope never
+// returns them, so they fail validIds.includes(…) and fall back.

-watch(() => route.query.day, raw => {
-  const value = typeof raw === 'string' ? raw : null
-  if (value && value !== store.activeDayId)
-    store.setActiveDay(value)
-}, { immediate: true })
+const validSubEventIds = computed(() => dayOptions.value.map(o => o.id))

-watch(dayOptions, opts => {
-  if (!store.activeDayId && opts.length > 0)
-    store.setActiveDay(opts[0].id)
+const queryDay = computed<string | null>(() => {
+  const v = route.query.day
+
+  return typeof v === 'string' && v.length > 0 ? v : null
 })

-watch(() => store.activeDayId, id => {
-  if (id && id !== route.query.day)
-    router.replace({ query: { ...route.query, day: id } })
+const { activeDayId: dayIdRef, setActiveDay } = useActiveDay({
+  queryDay,
+  validIds: validSubEventIds,
+  replace: id => {
+    void router.replace({ query: { ...route.query, day: id } })
+  },
+})
+
+// Side effects on day-change: clear drag snapshot + deselect.
+watch(dayIdRef, () => {
+  store.endDrag()
+  store.selectPerformance(null)
 })

 const tt = useTimetable(orgId, eventId, dayIdRef)
@@ -377,11 +387,8 @@ const { announce } = useTimetableKeyboard({
  },
 })

-onMounted(() => {
-  // Fire watch immediately to bind ?day → store.
-  if (typeof route.query.day === 'string')
-    store.setActiveDay(route.query.day)
-})
+// `?day` source-of-truth is wired via the dayIdRef computed + the
+// corrective watcher above; no onMounted bootstrap needed.
 </script>

 <template>
@@ -390,9 +397,9 @@ onMounted(() => {
      <div class="tt-page">
        <div class="tt-page__toolbar">
          <VTabs
-            :model-value="store.activeDayId"
+            :model-value="dayIdRef"
            density="compact"
-            @update:model-value="v => store.setActiveDay(typeof v === 'string' ? v : null)"
+            @update:model-value="v => setActiveDay(typeof v === 'string' ? v : null)"
          >
            <VTab
              v-for="d in dayOptions"
--- a/apps/app/src/stores/useTimetableStore.ts
+++ b/apps/app/src/stores/useTimetableStore.ts
@@ -15,14 +15,17 @@ import type {
 * cache via useTimetable.ts — this store carries only the bits that
 * multiple components on the canvas need to share:
 *
- *   - Active sub-event id (synced ↔ ?day query)
 *   - Selected performance id (drives popover anchor + keyboard focus)
 *   - In-flight drag state + origin snapshot for rollback (RFC D7)
 *   - Status filter (chips above wachtrij + canvas dimming)
 *   - Free-text search (wachtrij filter)
+ *
+ * Active sub-event ("day") is intentionally NOT held here — the URL
+ * `?day` query param is the source of truth, derived in the page entry
+ * via a computed against the validated sub-event list. Keeping it out
+ * of Pinia avoids the desync class of bug between URL and store.
 */
 export const useTimetableStore = defineStore('timetable', () => {
-  const activeDayId = ref<string | null>(null)
  const selectedPerformanceId = ref<string | null>(null)

  // Drag state — set by usePointerDrag handlers, consumed by mutation
@@ -51,10 +54,6 @@ export const useTimetableStore = defineStore('timetable', () => {

  const searchQuery = ref('')

-  function setActiveDay(id: string | null): void {
-    activeDayId.value = id
-  }
-
  function selectPerformance(id: string | null): void {
    selectedPerformanceId.value = id
  }
@@ -97,7 +96,6 @@ export const useTimetableStore = defineStore('timetable', () => {
  const isDragging = computed(() => dragPerformanceId.value !== null)

  return {
-    activeDayId,
    selectedPerformanceId,
    dragPerformanceId,
    dragOriginSnapshot,
@@ -105,7 +103,6 @@ export const useTimetableStore = defineStore('timetable', () => {
    statusFilter,
    searchQuery,
    isDragging,
-    setActiveDay,
    selectPerformance,
    startDrag,
    updateDragGhost,