refactor: maintain flat orders

apps/server/src/utils/__tests__/parserFunctions.test.ts

@@ -54,6 +54,7 @@ describe('parseRundown()', () => {
       id: '',
       title: '',
       order: ['1', '2', '3', '4'],
+      flatOrder: ['1', '2', '3', '4'],
       entries: {
         '1': { id: '1', type: SupportedEvent.Event, title: 'test', skip: false } as OntimeEvent, // OK
         '2': { id: '1', type: SupportedEvent.Block, title: 'test 2', skip: false } as OntimeBlock, // duplicate ID
@@ -84,6 +85,7 @@ describe('parseRundown()', () => {
       id: '',
       title: '',
       order: ['1', '2'],
+      flatOrder: ['1', '2'],
       entries: {
         // @ts-expect-error -- testing external data which could be incorrect
         '1': { id: '1', type: SupportedEvent.Event, cue: 101 } as OntimeEvent,
@@ -110,6 +112,7 @@ describe('parseRundown()', () => {
       id: '',
       title: '',
       order: ['1', '1'],
+      flatOrder: ['1', '1'],
       entries: {
         '1': { id: '1', type: SupportedEvent.Event } as OntimeEvent,
         '2': { id: '2', type: SupportedEvent.Event } as OntimeEvent,
@@ -127,6 +130,7 @@ describe('parseRundown()', () => {
       id: 'test',
       title: '',
       order: ['1', '2'],
+      flatOrder: ['1', '2'],
       entries: {
         '1': { id: '1', type: SupportedEvent.Event } as OntimeEvent,
         '2': { id: '2', type: SupportedEvent.Event } as OntimeEvent,
@@ -155,6 +159,7 @@ describe('parseRundown()', () => {
       id: 'test',
       title: '',
       order: ['1', '2', '3', '4'],
+      flatOrder: ['1', '2', '3', '4'],
       entries: {
         '1': { id: '1', type: SupportedEvent.Event } as OntimeEvent,
         '2': { id: '2', type: SupportedEvent.Event } as OntimeEvent,
@@ -173,6 +178,7 @@ describe('parseRundown()', () => {
       id: 'test',
       title: '',
       order: ['1', '2', '3', '4'],
+      flatOrder: ['1', '2', '3', '4'],
       entries: {
         '1': { id: '1', type: SupportedEvent.Event } as OntimeEvent,
         '2': { id: '2', type: SupportedEvent.Event } as OntimeEvent,
@@ -191,6 +197,7 @@ describe('parseRundown()', () => {
       id: 'test',
       title: '',
       order: ['block'],
+      flatOrder: ['block'],
       entries: {
         block: makeOntimeBlock({ id: 'block', events: ['1', '2'] }),
         '1': makeOntimeEvent({ id: '1' }),

apps/server/src/utils/parser.ts

@@ -109,6 +109,7 @@ export const parseExcel = (
     id: generateId(),
     title: sheetName,
     order: [],
+    flatOrder: [],
     entries: {},
     revision: 0,
   };
@@ -326,6 +327,7 @@ export const parseExcel = (
       event.timerType = TimerType.CountDown;
     }
     rundown.order.push(id);
+    rundown.flatOrder.push(id);
     rundown.entries[id] = event;
   });
 

apps/server/src/utils/parserFunctions.ts

@@ -74,6 +74,7 @@ export function parseRundown(
     title: rundown.title ?? '',
     entries: {},
     order: [],
+    flatOrder: [],
     revision: rundown.revision ?? 1,
   };
 
@@ -95,6 +96,7 @@ export function parseRundown(
 
     const id = entryId;
     let newEvent: OntimeEvent | OntimeDelay | OntimeBlock | null;
+    const nestedEntryIds: string[] = [];
 
     if (isOntimeEvent(event)) {
       newEvent = createEvent(event, eventIndex);
@@ -139,6 +141,7 @@ export function parseRundown(
           eventIndex += 1;
 
           if (newNestedEvent) {
+            nestedEntryIds.push(nestedEventId);
             parsedRundown.entries[nestedEventId] = newNestedEvent;
           }
         }
@@ -162,6 +165,8 @@ export function parseRundown(
     if (newEvent) {
       parsedRundown.entries[id] = newEvent;
       parsedRundown.order.push(id);
+      parsedRundown.flatOrder.push(id);
+      parsedRundown.flatOrder.push(...nestedEntryIds);
     }
   }