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

Fix: rearrange playing event (#1640)

Browse Source 
* creat failing test

* find and pass index of eventNow in case it moved

* fix cache invalidate edits should also recalculate timer

* use coluor as test indicator

* fixed empty cue guard

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

---------

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>
This commit is contained in:
Alex Christoffer Rasmussen
2025-06-17 15:59:23 +02:00
committed by GitHub
parent fb93063b47
commit 4e561cf01f
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-data/rundown/rundown.service.ts
+4 -3
View File
@@ -8,6 +8,7 @@ import {
isOntimeDelay,
isOntimeEvent,
OntimeEntry,
OntimeEvent,
PatchWithId,
Rundown,
} from 'ontime-types';
@@ -84,7 +85,7 @@ export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
}
// we dont allow the user to change the cue to empty string
if (isOntimeEvent(patch) && patch?.cue === '') {
if ((patch as Partial<OntimeEvent>)?.cue === '') {
throw new Error('Cue value invalid');
}
@@ -107,7 +108,7 @@ export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
updateRuntimeOnChange(rundownMetadata);
// notify timer and external services of change
notifyChanges(rundownMetadata, revision, { timer: [entry.id], external: true });
notifyChanges(rundownMetadata, revision, { timer: didInvalidate ? true : [entry.id], external: true });
});
return entry;
@@ -171,7 +172,7 @@ export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntr
updateRuntimeOnChange(rundownMetadata);
// notify timer and external services of change
notifyChanges(rundownMetadata, revision, { timer: changedIds, external: true });
notifyChanges(rundownMetadata, revision, { timer: batchDidInvalidate ? true : changedIds, external: true });
});
return rundownResult;
apps/server/src/stores/runtimeState.ts
+3 -2
View File
@@ -379,8 +379,9 @@ export function updateLoaded(event?: PlayableEvent): string | undefined {
export function updateAll(rundown: Rundown, timedEventsOrder: EntryId[]) {
const timedEvents = filterTimedEvents(rundown, timedEventsOrder);
// TODO(remove public): we dont need to make the timedEvents object, we pass primitives and let the functions handle it
loadNow(timedEvents);
loadNext(timedEvents);
const eventNowIndex = timedEventsOrder.findIndex((id) => id === runtimeState.eventNow?.id);
loadNow(timedEvents, eventNowIndex >= 0 ? eventNowIndex : undefined);
loadNext(timedEvents, eventNowIndex >= 0 ? eventNowIndex : undefined);
updateLoaded(runtimeState.eventNow ?? undefined);
loadBlock(rundown);
}