refactor: block event xlsx import (#1623)

apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts

@@ -96,6 +96,7 @@ describe('makeTable()', () => {
           "Is Public? (x)",
           "Skip?",
           "lighting",
+          "Type",
         ],
         [
           "00:00:00",
@@ -109,6 +110,7 @@ describe('makeTable()', () => {
           "x",
           "",
           "",
+          "",
         ],
       ]
     `);

apps/client/src/views/cuesheet/cuesheet.utils.ts

@@ -59,6 +59,7 @@ export const makeTable = (headerData: ProjectData, rundown: OntimeRundown, custo
     'isPublic',
     'skip',
     ...customFieldKeys,
+    'type',
   ];
 
   const fieldTitles = [
@@ -73,6 +74,7 @@ export const makeTable = (headerData: ProjectData, rundown: OntimeRundown, custo
     'Is Public? (x)',
     'Skip?',
     ...customFieldLabels,
+    'Type',
   ];
 
   // add header row to data

apps/server/src/utils/parser.ts

@@ -215,7 +215,7 @@ export const parseExcel = (
         const maybeTimeType = makeString(column, '');
         if (maybeTimeType === 'block') {
           event.type = SupportedEvent.Block;
-        } else if (maybeTimeType === '' || isKnownTimerType(maybeTimeType)) {
+        } else if (maybeTimeType === '' || maybeTimeType === 'event' || isKnownTimerType(maybeTimeType)) {
           event.type = SupportedEvent.Event;
           event.timerType = validateTimerType(maybeTimeType);
         } else {