diff --git a/apps/server/src/api-data/excel/excel.parser.ts b/apps/server/src/api-data/excel/excel.parser.ts index d5af1fac0..64ee6fe54 100644 --- a/apps/server/src/api-data/excel/excel.parser.ts +++ b/apps/server/src/api-data/excel/excel.parser.ts @@ -176,6 +176,7 @@ export const parseExcel = ( if (maybeTimeType === 'block') { // we leave this as a clue for the object filtering later on entry.type = SupportedEntry.Block; + entry.entries = []; } else if (maybeTimeType === '' || maybeTimeType === 'event' || isKnownTimerType(maybeTimeType)) { // @ts-expect-error -- we leave this as a clue for the object filtering later on entry.type = SupportedEntry.Event; diff --git a/apps/server/src/api-data/excel/excel.service.ts b/apps/server/src/api-data/excel/excel.service.ts index 2519b0599..92794c23a 100644 --- a/apps/server/src/api-data/excel/excel.service.ts +++ b/apps/server/src/api-data/excel/excel.service.ts @@ -50,13 +50,13 @@ export function generateRundownPreview(options: ImportMap): { rundown: Rundown; const parsedCustomFields = parseCustomFields(dataFromExcel); // we run the parsed data through an extra step to ensure the objects shape - const Rundown = parseRundown(dataFromExcel.rundown, parsedCustomFields); - if (Rundown.order.length === 0) { + const rundown = parseRundown(dataFromExcel.rundown, parsedCustomFields); + if (rundown.order.length === 0) { throw new Error(`Could not find data to import in the worksheet: ${options.worksheet}`); } // clear the data excelData = xlsx.utils.book_new(); - return { rundown: Rundown, customFields: parsedCustomFields }; + return { rundown, customFields: parsedCustomFields }; }