From 8723bcbd332de072869723fab932275154c96f45 Mon Sep 17 00:00:00 2001
From: Shobhit Nagpal <74096450+Shobhit-Nagpal@users.noreply.github.com>
Date: Mon, 2 Jun 2025 10:26:46 +0530
Subject: [PATCH] refactor: block event xlsx import (#1623)

---
 apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts | 2 ++
 apps/client/src/views/cuesheet/cuesheet.utils.ts                | 2 ++
 apps/server/src/utils/parser.ts                                 | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts b/apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts
index d83eec7e4..6e458c62c 100644
--- a/apps/client/src/views/cuesheet/__tests__/cuesheet.utils.test.ts
+++ b/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",
           "",
           "",
+          "",
         ],
       ]
     `);
diff --git a/apps/client/src/views/cuesheet/cuesheet.utils.ts b/apps/client/src/views/cuesheet/cuesheet.utils.ts
index 90537169f..75cce4af8 100644
--- a/apps/client/src/views/cuesheet/cuesheet.utils.ts
+++ b/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
diff --git a/apps/server/src/utils/parser.ts b/apps/server/src/utils/parser.ts
index b4eec3048..937255e87 100644
--- a/apps/server/src/utils/parser.ts
+++ b/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 {