cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-22 15:39:11 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: show upcoming events

Browse Source
This commit is contained in:
Carlos Valente
2024-08-31 10:15:13 +02:00
committed by Carlos Valente
parent db8ed93d41
commit 980ae7a7c5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/viewers/timeline/timeline.utils.ts
+3 -4
View File
@@ -126,13 +126,12 @@ export function getUpcomingEvents(events: OntimeRundown, selectedId: MaybeString
return { now: null, next: null, followedBy: null }; return { now: null, next: null, followedBy: null };
} }
const now = selectedId ? getEventWithId(events, selectedId) : getFirstEvent(events)?.firstEvent; let now = selectedId ? getEventWithId(events, selectedId) : null;
if (!isOntimeEvent(now)) { if (!isOntimeEvent(now)) {
return { now: null, next: null, followedBy: null }; now = null;
} }
const next = getNextEvent(events, now.id)?.nextEvent; const next = now ? getNextEvent(events, now.id)?.nextEvent : getFirstEvent(events).firstEvent;
const followedBy = next ? getNextEvent(events, next.id)?.nextEvent : null; const followedBy = next ? getNextEvent(events, next.id)?.nextEvent : null;
// Return the titles, handling nulls appropriately // Return the titles, handling nulls appropriately