cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-09-01 20:39:18 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

release test fixes (#496)

Browse Source 
* refactor: handle missing type

* fix: prevent stale data on cancel delay
This commit is contained in:
Carlos Valente
2023-08-24 22:53:23 +02:00
committed by GitHub
parent 1d4dc3a26f
commit af99882919
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/services/rundown-service/delayedRundown.utils.ts
+2 -1
View File
@@ -132,12 +132,13 @@ export async function cachedDelete(eventId: string) {
} }
let updatedRundown = DataProvider.getRundown(); let updatedRundown = DataProvider.getRundown();
const eventBack = { ...updatedRundown[eventIndex] };
updatedRundown = deleteAtIndex(eventIndex, updatedRundown); updatedRundown = deleteAtIndex(eventIndex, updatedRundown);
if (eventId !== delayedRundown[eventIndex].id) { if (eventId !== delayedRundown[eventIndex].id) {
invalidateFromError(); invalidateFromError();
} else { } else {
delayedRundown = deleteAtIndex(eventIndex, delayedRundown); delayedRundown = deleteAtIndex(eventIndex, delayedRundown);
if (isOntimeDelay(updatedRundown[eventIndex]) || isOntimeBlock(updatedRundown[eventIndex])) { if (isOntimeDelay(eventBack) || isOntimeBlock(eventBack)) {
// for events, we do not have to worry // for events, we do not have to worry
// the following event, would have taken the place of the deleted event by now // the following event, would have taken the place of the deleted event by now
delayedRundown = calculateRuntimeDelaysFromIndex(eventIndex, delayedRundown); delayedRundown = calculateRuntimeDelaysFromIndex(eventIndex, delayedRundown);
e2e/tests/features/203-delay-block.spec.ts
+1
View File
@@ -47,6 +47,7 @@ test('delay blocks add time to events', async ({ page }) => {
// cancel delay // cancel delay
await page.getByRole('button', { name: 'Cancel' }).click(); await page.getByRole('button', { name: 'Cancel' }).click();
await expect(page.getByTestId('panel-rundown').getByTestId('time-input-timeStart')).toHaveValue('00:08:00'); await expect(page.getByTestId('panel-rundown').getByTestId('time-input-timeStart')).toHaveValue('00:08:00');
await expect(page.getByText('+10 minNew start: 00:18:00')).toHaveCount(0);
}); });
test('delays are show correctly', async ({ page }) => { test('delays are show correctly', async ({ page }) => {
packages/types/src/utils/guards.ts
+3 -3
View File
@@ -2,13 +2,13 @@ import { OntimeRundownEntry } from '../definitions/core/Rundown.type.js';
import { OntimeBlock, OntimeDelay, OntimeEvent, SupportedEvent } from '../definitions/core/OntimeEvent.type.js'; import { OntimeBlock, OntimeDelay, OntimeEvent, SupportedEvent } from '../definitions/core/OntimeEvent.type.js';
export function isOntimeEvent(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeEvent { export function isOntimeEvent(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeEvent {
return event.type === SupportedEvent.Event; return event?.type === SupportedEvent.Event;
} }
export function isOntimeDelay(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeDelay { export function isOntimeDelay(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeDelay {
return event.type === SupportedEvent.Delay; return event?.type === SupportedEvent.Delay;
} }
export function isOntimeBlock(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeBlock { export function isOntimeBlock(event: OntimeRundownEntry | Partial<OntimeRundownEntry>): event is OntimeBlock {
return event.type === SupportedEvent.Block; return event?.type === SupportedEvent.Block;
} }