refactor: align property names between block and event

apps/client/src/features/rundown/entry-editor/BlockEditor.tsx

@@ -62,7 +62,6 @@ export default function BlockEditor({ block }: BlockEditorProps) {
 
   const isEditor = window.location.pathname.includes('editor');
   const planOffset = typeof block.targetDuration !== 'number' ? null : block.targetDuration - block.duration;
-  console.log('targetDuration:', block.targetDuration);
 
   return (
     <div className={style.content}>
@@ -75,13 +74,13 @@ export default function BlockEditor({ block }: BlockEditorProps) {
             }
             <Editor.Label>First event start</Editor.Label>
             <TextLikeInput className={style.textLikeInput}>
-              {millisToString(block.startTime, { fallback: timerPlaceholder })}
+              {millisToString(block.timeStart, { fallback: timerPlaceholder })}
             </TextLikeInput>
           </div>
           <div>
-            <Editor.Label htmlFor='endTime'>Last event end</Editor.Label>
+            <Editor.Label>Last event end</Editor.Label>
             <TextLikeInput className={style.textLikeInput}>
-              {millisToString(block.endTime, { fallback: timerPlaceholder })}
+              {millisToString(block.timeEnd, { fallback: timerPlaceholder })}
             </TextLikeInput>
           </div>
           <div>

apps/client/src/features/rundown/rundown-block/RundownBlock.tsx

@@ -132,11 +132,11 @@ export default function RundownBlock({ data, hasCursor, collapsed, onCollapse }:
         <div className={style.metaRow}>
           <div className={style.metaEntry}>
             <div>Start</div>
-            <div>{formatTime(data.startTime)}</div>
+            <div>{formatTime(data.timeStart)}</div>
           </div>
           <div className={style.metaEntry}>
             <div>End</div>
-            <div>{formatTime(data.endTime)}</div>
+            <div>{formatTime(data.timeEnd)}</div>
           </div>
           <div className={style.metaEntry}>
             <div>Duration</div>

apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts

@@ -585,8 +585,8 @@ describe('processRundown()', () => {
         '1': {
           type: SupportedEntry.Block,
           entries: ['100', '200', '300'],
-          startTime: 100,
+          timeStart: 100,
-          endTime: 400,
+          timeEnd: 400,
           duration: 300,
           isFirstLinked: false,
         },
@@ -625,8 +625,8 @@ describe('processRundown()', () => {
         '1': {
           type: SupportedEntry.Block,
           entries: ['101', '102', '103'],
-          startTime: 100,
+          timeStart: 100,
-          endTime: 400,
+          timeEnd: 400,
           duration: 300,
           isFirstLinked: false,
         },
@@ -636,8 +636,8 @@ describe('processRundown()', () => {
         '2': {
           type: SupportedEntry.Block,
           entries: ['201', '202', '203'],
-          startTime: 500,
+          timeStart: 500,
-          endTime: 800,
+          timeEnd: 800,
           duration: 300,
           isFirstLinked: false,
         },
@@ -647,8 +647,8 @@ describe('processRundown()', () => {
         '3': {
           type: SupportedEntry.Block,
           entries: ['301', '302', '303'],
-          startTime: 900,
+          timeStart: 900,
-          endTime: 1200,
+          timeEnd: 1200,
           duration: 300,
           isFirstLinked: false,
         },

apps/server/src/api-data/rundown/rundown.dao.ts

@@ -747,8 +747,8 @@ export function processRundown(
 
       // update block metadata
       processedEntry.duration = totalBlockDuration;
-      processedEntry.startTime = blockStartTime;
+      processedEntry.timeStart = blockStartTime;
-      processedEntry.endTime = blockEndTime;
+      processedEntry.timeEnd = blockEndTime;
       processedEntry.isFirstLinked = isFirstLinked;
       processedEntry.entries = blockEvents;
     }

apps/server/src/api-data/rundown/rundown.utils.ts

@@ -162,8 +162,8 @@ export function createBlock(patch?: Partial<OntimeBlock>): OntimeBlock {
     colour: makeString(patch.colour, ''),
     custom: patch.custom ?? {},
     revision: 0,
-    startTime: null,
+    timeStart: null,
-    endTime: null,
+    timeEnd: null,
     duration: 0,
     isFirstLinked: false,
   };

apps/server/src/models/demoProject.ts

@@ -49,8 +49,8 @@ export const demoDb: DatabaseModel = {
           targetDuration: null,
           colour: 'hotpink',
           revision: 0,
-          startTime: null,
+          timeStart: null,
-          endTime: null,
+          timeEnd: null,
           duration: 0,
           isFirstLinked: false,
           custom: {
@@ -216,8 +216,8 @@ export const demoDb: DatabaseModel = {
           targetDuration: null,
           custom: {},
           revision: 0,
-          startTime: null,
+          timeStart: null,
-          endTime: null,
+          timeEnd: null,
           duration: 0,
           isFirstLinked: false,
         },
@@ -379,8 +379,8 @@ export const demoDb: DatabaseModel = {
           targetDuration: null,
           custom: {},
           revision: 0,
-          startTime: null,
+          timeStart: null,
-          endTime: null,
+          timeEnd: null,
           duration: 0,
           isFirstLinked: false,
         },

apps/server/src/models/eventsDefinition.ts

@@ -51,8 +51,8 @@ export const block: Omit<OntimeBlock, 'id'> = {
   custom: {},
   // !==== RUNTIME METADATA ====! //
   revision: 0, // calculated at runtime
-  startTime: null, // calculated at runtime
+  timeStart: null, // calculated at runtime
-  endTime: null, // calculated at runtime
+  timeEnd: null, // calculated at runtime
   duration: 0, // calculated at runtime
   isFirstLinked: false, // calculated at runtime
 };

apps/server/test-db/db.json

@@ -172,8 +172,8 @@
           "skip": false,
           "custom": {},
           "revision": 0,
-          "startTime": null,
+          "timeStart": null,
-          "endTime": null,
+          "timeEnd": null,
           "duration": 0,
           "isFirstLinked": false
         },
@@ -327,8 +327,8 @@
           "skip": false,
           "custom": {},
           "revision": 0,
-          "startTime": null,
+          "timeStart": null,
-          "endTime": null,
+          "timeEnd": null,
           "duration": 0,
           "isFirstLinked": false,
           "numEvents": 0

e2e/tests/fixtures/e2e-test-db.json

@@ -190,8 +190,8 @@
           "skip": false,
           "custom": {},
           "revision": 0,
-          "startTime": null,
+          "timeStart": null,
-          "endTime": null,
+          "timeEnd": null,
           "duration": 0,
           "isFirstLinked": false
         },
@@ -345,8 +345,8 @@
           "skip": false,
           "custom": {},
           "revision": 0,
-          "startTime": null,
+          "timeStart": null,
-          "endTime": null,
+          "timeEnd": null,
           "duration": 0,
           "isFirstLinked": false
         },

packages/types/src/definitions/core/OntimeEvent.type.ts

@@ -30,8 +30,8 @@ export type OntimeBlock = OntimeBaseEvent & {
   custom: EntryCustomFields;
   // !==== RUNTIME METADATA ====! //
   revision: number;
-  startTime: MaybeNumber; // calculated at runtime
+  timeStart: MaybeNumber; // calculated at runtime
-  endTime: MaybeNumber; // calculated at runtime
+  timeEnd: MaybeNumber; // calculated at runtime
   duration: number; // calculated at runtime
   isFirstLinked: boolean; // calculated at runtime, whether the first event is linked
 };