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

fix: parse nested events in rundown

Browse Source
This commit is contained in:
Carlos Valente
2025-07-14 09:08:29 +02:00
parent 6f9e13948d
commit 1e5081f4a2
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-data/rundown/__tests__/rundown.parser.test.ts
+11 -10
View File
@@ -1,7 +1,7 @@
import { SupportedEntry, OntimeEvent, OntimeBlock, Rundown, CustomFields } from 'ontime-types';
import { defaultRundown } from '../../../models/dataModel.js';
import { makeOntimeBlock, makeOntimeEvent } from '../__mocks__/rundown.mocks.js';
import { makeOntimeBlock, makeOntimeEvent, makeOntimeMilestone } from '../__mocks__/rundown.mocks.js';
import { parseRundowns, parseRundown, handleCustomField, addToCustomAssignment } from '../rundown.parser.js';
@@ -241,7 +241,7 @@ describe('parseRundown()', () => {
expect((parsedRundown.entries['21'] as OntimeEvent).custom).not.toHaveProperty('lighting');
});
it('parses data in blocks', () => {
it('parses data in groups', () => {
const rundown = {
id: 'test',
title: '',
@@ -254,20 +254,21 @@ describe('parseRundown()', () => {
title: 'block-title',
note: 'block-note',
colour: 'red',
entries: ['1', '2'],
entries: ['1', '2', '3'],
}),
'1': makeOntimeEvent({ id: '1' }),
'1': makeOntimeEvent({ id: '1', parent: 'block' }),
'2': makeOntimeMilestone({ id: '2', parent: 'block' }),
},
revision: 1,
} as Rundown;
const parsedRundown = parseRundown(rundown, {});
expect(parsedRundown.order.length).toEqual(1);
expect(parsedRundown.entries.block).toMatchObject({
title: 'block-title',
note: 'block-note',
colour: 'red',
entries: ['1'],
expect(parsedRundown.order).toStrictEqual(['block']);
expect(parsedRundown.flatOrder).toStrictEqual(['block', '1', '2']);
expect(parsedRundown.entries).toMatchObject({
block: { id: 'block', type: SupportedEntry.Block, entries: ['1', '2'] },
'1': { id: '1', type: SupportedEntry.Event },
'2': { id: '2', type: SupportedEntry.Milestone },
});
});