chore: rename blocks to groups

apps/server/src/api-data/db/__tests__/db.parser.test.ts

@@ -46,7 +46,7 @@ describe('test parseDatabaseModel() with demo project (valid)', () => {
     // remove time-related fields from the comparison
     // these are not calculated in the parser
     Object.values(filteredDemoProject.rundowns.default.entries).forEach((entry: any) => {
-      if (entry.type === SupportedEntry.Block) {
+      if (entry.type === SupportedEntry.Group) {
         delete entry.timeStart;
         delete entry.timeEnd;
         delete entry.duration;
@@ -54,7 +54,7 @@ describe('test parseDatabaseModel() with demo project (valid)', () => {
       }
     });
     Object.values(data.rundowns.default.entries).forEach((entry: any) => {
-      if (entry.type === SupportedEntry.Block) {
+      if (entry.type === SupportedEntry.Group) {
         delete entry.timeStart;
         delete entry.timeEnd;
         delete entry.duration;

apps/server/src/api-data/db/migration/db.migration.v3.ts

@@ -5,7 +5,7 @@ import {
   EndAction,
   EntryCustomFields,
   NormalisedAutomation,
-  OntimeBlock,
+  OntimeGroup,
   OntimeEntry,
   ProjectData,
   ProjectRundowns,
@@ -317,7 +317,8 @@ export function migrateAutomations(jsonData: object): AutomationSettings | undef
  *  - add parent
  *
  * - block:
- *  - add all the new blocks of the block that is now a group
+ *  - rename to group
+ *  - create group data
  */
 export function migrateRundown(
   jsonData: object,
@@ -392,13 +393,13 @@ export function migrateRundown(
         });
       } else if (entry.type === 'block') {
         if (parent) {
-          (newRundown.entries[parent] as OntimeBlock).entries = [...children];
+          (newRundown.entries[parent] as OntimeGroup).entries = [...children];
           children = [];
         }
         parent = entry.id;
         append({
           id: entry.id,
-          type: SupportedEntry.Block,
+          type: SupportedEntry.Group,
           title: entry.title,
           note: '', // leave blank
           entries: [], // leave empty
@@ -418,7 +419,7 @@ export function migrateRundown(
     }
 
     if (parent) {
-      (newRundown.entries[parent] as OntimeBlock).entries = [...children];
+      (newRundown.entries[parent] as OntimeGroup).entries = [...children];
       children = [];
     }
 

apps/server/src/api-data/db/migration/migration.test.ts

@@ -48,7 +48,7 @@ describe('v3 to v4', () => {
         dayOffset: 0,
         gap: 0,
       },
-      { id: 'block0', type: 'block', title: 'BLOCK 0' },
+      { id: 'group0', type: 'block', title: 'GROUP 0' },
       {
         id: 'event2',
         type: SupportedEntry.Event,
@@ -107,7 +107,7 @@ describe('v3 to v4', () => {
         dayOffset: 0,
         gap: 0,
       },
-      { id: 'block1', type: 'block', title: 'BLOCK 1' },
+      { id: 'group1', type: 'block', title: 'GROUP 1' },
       { id: 'delay', type: 'delay', duration: 1000 },
     ],
     project: {
@@ -268,8 +268,8 @@ describe('v3 to v4', () => {
     const expectedRundown: Rundown = {
       id: 'default',
       title: 'Default',
-      order: ['event1', 'block0', 'block1'],
-      flatOrder: ['event1', 'block0', 'event2', 'event3', 'block1', 'delay'],
+      order: ['event1', 'group0', 'group1'],
+      flatOrder: ['event1', 'group0', 'event2', 'event3', 'group1', 'delay'],
       entries: {
         event1: {
           id: 'event1',
@@ -298,10 +298,10 @@ describe('v3 to v4', () => {
           dayOffset: 0,
           gap: 0,
         },
-        block0: {
-          id: 'block0',
-          type: SupportedEntry.Block,
-          title: 'BLOCK 0',
+        group0: {
+          id: 'group0',
+          type: SupportedEntry.Group,
+          title: 'GROUP 0',
           colour: '',
           custom: {},
           duration: 0,
@@ -337,7 +337,7 @@ describe('v3 to v4', () => {
           },
           triggers: [{ id: 'testTrig', title: 'Test trigger', trigger: TimerLifeCycle.onStart, automationId: '1' }],
           flag: false,
-          parent: 'block0',
+          parent: 'group0',
           revision: -1,
           delay: 0,
           dayOffset: 0,
@@ -368,16 +368,16 @@ describe('v3 to v4', () => {
           },
           triggers: [{ id: 'testTrig', title: 'Test trigger', trigger: TimerLifeCycle.onStart, automationId: '1' }],
           flag: false,
-          parent: 'block0',
+          parent: 'group0',
           revision: -1,
           delay: 0,
           dayOffset: 0,
           gap: 0,
         },
-        block1: {
-          id: 'block1',
-          type: SupportedEntry.Block,
-          title: 'BLOCK 1',
+        group1: {
+          id: 'group1',
+          type: SupportedEntry.Group,
+          title: 'GROUP 1',
           colour: '',
           custom: {},
           duration: 0,
@@ -393,7 +393,7 @@ describe('v3 to v4', () => {
           type: SupportedEntry.Delay,
           id: 'delay',
           duration: 1000,
-          parent: 'block1',
+          parent: 'group1',
         },
       },