chore: rename time-to-end to count-to-end

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

@@ -471,7 +471,7 @@ describe('test event validator', () => {
         note: expect.any(String),
         timeStart: expect.any(Number),
         timeEnd: expect.any(Number),
-        isTimeToEnd: expect.any(Boolean),
+        countToEnd: expect.any(Boolean),
         isPublic: expect.any(Boolean),
         skip: expect.any(Boolean),
         revision: expect.any(Number),
@@ -775,7 +775,7 @@ describe('getCustomFieldData()', () => {
       duration: 'duration',
       cue: 'cue',
       title: 'title',
-      isTimeToEnd: 'time to end',
+      countToEnd: 'count to end',
       isPublic: 'public',
       skip: 'skip',
       note: 'notes',
@@ -826,7 +826,7 @@ describe('getCustomFieldData()', () => {
       duration: 'duration',
       cue: 'cue',
       title: 'title',
-      isTimeToEnd: 'time to end',
+      countToEnd: 'count to end',
       isPublic: 'public',
       skip: 'skip',
       note: 'notes',
@@ -886,7 +886,7 @@ describe('parseExcel()', () => {
         'Title',
         'End Action',
         'Timer type',
-        'Time to end',
+        'Count to end',
         'Public',
         'Skip',
         'Notes',
@@ -909,7 +909,7 @@ describe('parseExcel()', () => {
         'Guest Welcome',
         '',
         '',
-        'x', // <-- time to end
+        'x', // <-- count to end
         'x', // <-- public
         '',
         'Ballyhoo',
@@ -932,7 +932,7 @@ describe('parseExcel()', () => {
         'A song from the hearth',
         'load-next',
         'clock',
-        'x', // <-- time to end
+        'x', // <-- count to end
         '', // <-- public
         'x',
         'Rainbow chase',
@@ -977,7 +977,7 @@ describe('parseExcel()', () => {
         timerType: 'count-down',
         endAction: 'none',
         isPublic: true,
-        isTimeToEnd: true,
+        countToEnd: true,
         skip: false,
         note: 'Ballyhoo',
         custom: {
@@ -1001,7 +1001,7 @@ describe('parseExcel()', () => {
         timeEnd: 30600000,
         title: 'A song from the hearth',
         timerType: 'clock',
-        isTimeToEnd: true,
+        countToEnd: true,
         endAction: 'load-next',
         isPublic: false,
         skip: true,

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

@@ -532,7 +532,7 @@ describe('parseRundown() migrations', () => {
     expect(result.rundown[0]).toMatchObject({
       id: '1',
       timerType: TimerType.CountDown,
-      isTimeToEnd: true,
+      countToEnd: true,
     });
   });
 
@@ -542,7 +542,7 @@ describe('parseRundown() migrations', () => {
     expect(result.rundown[0]).toMatchObject({
       id: '1',
       timerType: TimerType.CountDown,
-      isTimeToEnd: false,
+      countToEnd: false,
     });
   });
 });

apps/server/src/utils/parser.ts

@@ -110,7 +110,7 @@ export const parseExcel = (
   // options: booleans
   let isPublicIndex: number | null = null;
   let skipIndex: number | null = null;
-  let isTimeToEndIndex: number | null = null;
+  let countToEndIndex: number | null = null;
 
   let linkStartIndex: number | null = null;
 
@@ -160,9 +160,9 @@ export const parseExcel = (
         titleIndex = col;
         rundownMetadata['title'] = { row, col };
       },
-      [importMap.isTimeToEnd]: (row: number, col: number) => {
-        isTimeToEndIndex = col;
-        rundownMetadata['isTimeToEnd'] = { row, col };
+      [importMap.countToEnd]: (row: number, col: number) => {
+        countToEndIndex = col;
+        rundownMetadata['countToEnd'] = { row, col };
       },
       [importMap.isPublic]: (row: number, col: number) => {
         isPublicIndex = col;
@@ -231,8 +231,8 @@ export const parseExcel = (
         event.duration = parseExcelDate(column);
       } else if (j === cueIndex) {
         event.cue = makeString(column, '');
-      } else if (j === isTimeToEndIndex) {
-        event.isTimeToEnd = parseBooleanString(column);
+      } else if (j === countToEndIndex) {
+        event.countToEnd = parseBooleanString(column);
       } else if (j === isPublicIndex) {
         event.isPublic = parseBooleanString(column);
       } else if (j === skipIndex) {
@@ -379,7 +379,7 @@ export function createPatch(originalEvent: OntimeEvent, patchEvent: Partial<Onti
     linkStart: validateLinkStart(patchEvent.linkStart),
     endAction: validateEndAction(patchEvent.endAction, originalEvent.endAction),
     timerType: validateTimerType(patchEvent.timerType, originalEvent.timerType),
-    isTimeToEnd: typeof patchEvent.isTimeToEnd === 'boolean' ? patchEvent.isTimeToEnd : originalEvent.isTimeToEnd,
+    countToEnd: typeof patchEvent.countToEnd === 'boolean' ? patchEvent.countToEnd : originalEvent.countToEnd,
     isPublic: typeof patchEvent.isPublic === 'boolean' ? patchEvent.isPublic : originalEvent.isPublic,
     skip: typeof patchEvent.skip === 'boolean' ? patchEvent.skip : originalEvent.skip,
     note: makeString(patchEvent.note, originalEvent.note),

apps/server/src/utils/parserFunctions.ts

@@ -349,13 +349,13 @@ export function sanitiseCustomFields(data: object): CustomFields {
 }
 
 /**
- * Time to end was moved from a TimerType to a standalone boolean
+ * Time to end was moved from a TimerType to a standalone boolean named count to end
  * Released as part of v3.10.0
  */
 function migrateTimeToEnd(event: any): OntimeEvent {
   if (event.timerType === 'time-to-end') {
     event.timerType = TimerType.CountDown;
-    event.isTimeToEnd = true;
+    event.countToEnd = true;
   }
   return event;
 }