diff --git a/apps/client/src/common/hooks/useEntryAction.ts b/apps/client/src/common/hooks/useEntryAction.ts
index 942dc6f55..85d28b345 100644
--- a/apps/client/src/common/hooks/useEntryAction.ts
+++ b/apps/client/src/common/hooks/useEntryAction.ts
@@ -792,7 +792,6 @@ function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
} else {
const parent = entries[entry.parent] as OntimeBlock;
parent.events = parent.events.filter((event) => event !== entry.id);
- parent.numEvents -= 1;
}
delete entries[entry.id];
diff --git a/apps/client/src/features/rundown/block-block/BlockBlock.tsx b/apps/client/src/features/rundown/block-block/BlockBlock.tsx
index adaa4bc34..40f88d5a7 100644
--- a/apps/client/src/features/rundown/block-block/BlockBlock.tsx
+++ b/apps/client/src/features/rundown/block-block/BlockBlock.tsx
@@ -134,7 +134,7 @@ export default function BlockBlock(props: BlockBlockProps) {
Events
-
{data.numEvents}
+
{data.events.length}
diff --git a/apps/server/src/api-data/rundown/rundown.utils.ts b/apps/server/src/api-data/rundown/rundown.utils.ts
index d06d5a90e..064fcd052 100644
--- a/apps/server/src/api-data/rundown/rundown.utils.ts
+++ b/apps/server/src/api-data/rundown/rundown.utils.ts
@@ -90,7 +90,6 @@ export function createBlock(patch?: Partial): OntimeBlock {
endTime: null,
duration: 0,
isFirstLinked: false,
- numEvents: patch.events?.length ?? 0,
};
}
diff --git a/apps/server/src/models/demoProject.ts b/apps/server/src/models/demoProject.ts
index 1a18be57d..83432abdf 100644
--- a/apps/server/src/models/demoProject.ts
+++ b/apps/server/src/models/demoProject.ts
@@ -52,7 +52,6 @@ export const demoDb: DatabaseModel = {
endTime: null,
duration: 0,
isFirstLinked: false,
- numEvents: 0,
custom: {
song: 'Sekret',
artist: 'Ronela Hajati',
@@ -219,7 +218,6 @@ export const demoDb: DatabaseModel = {
endTime: null,
duration: 0,
isFirstLinked: false,
- numEvents: 0,
},
'1c420': {
type: SupportedEntry.Event,
@@ -382,7 +380,6 @@ export const demoDb: DatabaseModel = {
endTime: null,
duration: 0,
isFirstLinked: false,
- numEvents: 0,
},
'503c4': {
type: SupportedEntry.Event,
diff --git a/apps/server/src/models/eventsDefinition.ts b/apps/server/src/models/eventsDefinition.ts
index e8b11c7fc..1bf717db7 100644
--- a/apps/server/src/models/eventsDefinition.ts
+++ b/apps/server/src/models/eventsDefinition.ts
@@ -54,5 +54,4 @@ export const block: Omit = {
endTime: null, // calculated at runtime
duration: 0, // calculated at runtime
isFirstLinked: false, // calculated at runtime
- numEvents: 0, // calculated at runtime
};
diff --git a/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts b/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
index a19d7761a..44d817a0a 100644
--- a/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
+++ b/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
@@ -550,7 +550,6 @@ describe('generate() v4', () => {
endTime: 400,
duration: 300,
isFirstLinked: false,
- numEvents: 3,
},
'100': { type: SupportedEntry.Event, parent: '1' },
'200': { type: SupportedEntry.Event, parent: '1' },
@@ -591,7 +590,6 @@ describe('generate() v4', () => {
endTime: 400,
duration: 300,
isFirstLinked: false,
- numEvents: 3,
},
'101': { parent: '1', gap: 90, linkStart: false },
'102': { parent: '1' },
@@ -603,7 +601,6 @@ describe('generate() v4', () => {
endTime: 800,
duration: 300,
isFirstLinked: false,
- numEvents: 3,
},
'201': { id: '201', timeStart: 500, timeEnd: 600, duration: 100, gap: 100, linkStart: false },
'202': { id: '202', timeStart: 600, timeEnd: 700, duration: 100 },
@@ -615,7 +612,6 @@ describe('generate() v4', () => {
endTime: 1200,
duration: 300,
isFirstLinked: false,
- numEvents: 3,
},
'301': { id: '301', timeStart: 900, timeEnd: 1000, duration: 100, gap: 100, linkStart: false },
'302': { id: '302', timeStart: 1000, timeEnd: 1100, duration: 100 },
diff --git a/apps/server/src/services/rundown-service/rundownCache.ts b/apps/server/src/services/rundown-service/rundownCache.ts
index 9a50f81ab..2331e13d8 100644
--- a/apps/server/src/services/rundown-service/rundownCache.ts
+++ b/apps/server/src/services/rundown-service/rundownCache.ts
@@ -169,7 +169,6 @@ export function generate(
processedEntry.endTime = blockEndTime;
processedEntry.isFirstLinked = isFirstLinked;
processedEntry.events = blockEvents;
- processedEntry.numEvents = blockEvents.length;
}
}
@@ -416,7 +415,6 @@ export function remove({ rundown, eventIds }: RemoveArgs): MutatingReturn {
eventId: entry.parent,
patch: {
events: parentEvents,
- numEvents: parentEvents.length,
},
});
}
diff --git a/apps/server/src/user/styles/override.css b/apps/server/src/user/styles/override.css
index 4ee7275ab..19af31668 100644
--- a/apps/server/src/user/styles/override.css
+++ b/apps/server/src/user/styles/override.css
@@ -1,3 +1,4 @@
+
/**
* This CSS file allows user customisation of the UI
* We expose some CSS properties to facilitate this (see below in :root)
diff --git a/apps/server/test-db/db.json b/apps/server/test-db/db.json
index 02a6cd30b..534ccc1fb 100644
--- a/apps/server/test-db/db.json
+++ b/apps/server/test-db/db.json
@@ -180,8 +180,7 @@
"startTime": null,
"endTime": null,
"duration": 0,
- "isFirstLinked": false,
- "numEvents": 0
+ "isFirstLinked": false
},
"1c420": {
"type": "event",
diff --git a/e2e/tests/fixtures/e2e-test-db.json b/e2e/tests/fixtures/e2e-test-db.json
index 02a6cd30b..ee0c3ed55 100644
--- a/e2e/tests/fixtures/e2e-test-db.json
+++ b/e2e/tests/fixtures/e2e-test-db.json
@@ -180,8 +180,7 @@
"startTime": null,
"endTime": null,
"duration": 0,
- "isFirstLinked": false,
- "numEvents": 0
+ "isFirstLinked": false
},
"1c420": {
"type": "event",
@@ -341,8 +340,7 @@
"startTime": null,
"endTime": null,
"duration": 0,
- "isFirstLinked": false,
- "numEvents": 0
+ "isFirstLinked": false
},
"503c4": {
"type": "event",
diff --git a/packages/types/src/definitions/core/OntimeEvent.type.ts b/packages/types/src/definitions/core/OntimeEvent.type.ts
index 0e9bbd2e7..3ed779966 100644
--- a/packages/types/src/definitions/core/OntimeEvent.type.ts
+++ b/packages/types/src/definitions/core/OntimeEvent.type.ts
@@ -33,7 +33,6 @@ export type OntimeBlock = OntimeBaseEvent & {
endTime: MaybeNumber; // calculated at runtime
duration: number; // calculated at runtime
isFirstLinked: boolean; // calculated at runtime, whether the first event is linked
- numEvents: number; // calculated at runtime
};
export type OntimeEvent = OntimeBaseEvent & {