Remove public event feature (#1645)

apps/server/src/api-data/db/db.controller.ts

@@ -53,8 +53,6 @@ export async function createProjectFile(req: Request, res: Response<{ filename:
       project: {
         title: req.body?.title ?? '',
         description: req.body?.description ?? '',
-        publicUrl: req.body?.publicUrl ?? '',
-        publicInfo: req.body?.publicInfo ?? '',
         backstageUrl: req.body?.backstageUrl ?? '',
         backstageInfo: req.body?.backstageInfo ?? '',
         projectLogo: req.body?.projectLogo ?? null,

apps/server/src/api-data/db/db.validation.ts

@@ -11,8 +11,6 @@ export const validateNewProject = [
   body('filename').optional().isString().trim(),
   body('title').optional().isString().trim(),
   body('description').optional().isString().trim(),
-  body('publicUrl').optional().isString().trim(),
-  body('publicInfo').optional().isString().trim(),
   body('backstageUrl').optional().isString().trim(),
   body('backstageInfo').optional().isString().trim(),
   body('projectLogo').optional().isString().trim(),

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

@@ -56,7 +56,6 @@ describe('parseExcel()', () => {
         title: 'Guest Welcome',
         timerType: 'count-down',
         endAction: 'none',
-        isPublic: true,
         skip: false,
         note: 'Ballyhoo',
         custom: {
@@ -76,7 +75,6 @@ describe('parseExcel()', () => {
         title: 'A song from the hearth',
         timerType: 'clock',
         endAction: 'load-next',
-        isPublic: false,
         skip: true,
         note: 'Rainbow chase',
         custom: {},
@@ -117,7 +115,6 @@ describe('parseExcel()', () => {
       title: 'Guest Welcome',
       timerType: 'count-down',
       endAction: 'none',
-      isPublic: true,
       skip: false,
       note: 'Ballyhoo',
       custom: {},
@@ -132,7 +129,6 @@ describe('parseExcel()', () => {
       title: 'A song from the hearth',
       timerType: 'clock',
       endAction: 'load-next',
-      isPublic: false,
       skip: true,
       note: 'Rainbow chase',
       custom: {},
@@ -434,7 +430,6 @@ describe('getCustomFieldData()', () => {
       cue: 'cue',
       title: 'title',
       countToEnd: 'count to end',
-      isPublic: 'public',
       skip: 'skip',
       note: 'notes',
       colour: 'colour',
@@ -487,7 +482,6 @@ describe('getCustomFieldData()', () => {
       cue: 'cue',
       title: 'title',
       countToEnd: 'count to end',
-      isPublic: 'public',
       skip: 'skip',
       note: 'notes',
       colour: 'colour',

apps/server/src/api-data/excel/__tests__/mockData.ts

@@ -9,7 +9,6 @@ export const dataFromExcelTemplate = [
     'End Action',
     'Timer type',
     'Count to end',
-    'Public',
     'Skip',
     'Notes',
     't0',
@@ -27,7 +26,6 @@ export const dataFromExcelTemplate = [
     '', // <-- endAction
     '', // <-- timerType
     'x', // <-- count to end
-    'x', // <-- public
     '', // <-- skip
     'Ballyhoo', // <-- notes
     'a0', // <-- t0
@@ -45,7 +43,6 @@ export const dataFromExcelTemplate = [
     'load-next', // <-- endAction
     'clock', // timerType
     'x', // <-- count to end
-    '', // <-- public
     'x', // <-- skip
     'Rainbow chase', // <-- notes
     'b0', // <-- t0

apps/server/src/api-data/excel/excel.parser.ts

@@ -69,7 +69,6 @@ export const parseExcel = (
   let colourIndex: number | null = null;
 
   // options: booleans
-  let isPublicIndex: number | null = null;
   let skipIndex: number | null = null;
   let countToEndIndex: number | null = null;
 
@@ -128,10 +127,6 @@ export const parseExcel = (
         countToEndIndex = col;
         rundownMetadata['countToEnd'] = { row, col };
       },
-      [importMap.isPublic]: (row: number, col: number) => {
-        isPublicIndex = col;
-        rundownMetadata['isPublic'] = { row, col };
-      },
       [importMap.skip]: (row: number, col: number) => {
         skipIndex = col;
         rundownMetadata['skip'] = { row, col };
@@ -203,8 +198,6 @@ export const parseExcel = (
         entry.cue = makeString(column, '');
       } else if (j === countToEndIndex) {
         entry.countToEnd = parseBooleanString(column);
-      } else if (j === isPublicIndex) {
-        entry.isPublic = parseBooleanString(column);
       } else if (j === skipIndex) {
         entry.skip = parseBooleanString(column);
       } else if (j === notesIndex) {

apps/server/src/api-data/project-data/projectData.parser.ts

@@ -17,8 +17,6 @@ export function parseProjectData(data: Partial<DatabaseModel>, emitError?: Error
   return {
     title: data.project.title ?? dbModel.project.title,
     description: data.project.description ?? dbModel.project.description,
-    publicUrl: data.project.publicUrl ?? dbModel.project.publicUrl,
-    publicInfo: data.project.publicInfo ?? dbModel.project.publicInfo,
     backstageUrl: data.project.backstageUrl ?? dbModel.project.backstageUrl,
     backstageInfo: data.project.backstageInfo ?? dbModel.project.backstageInfo,
     projectLogo: data.project.projectLogo ?? dbModel.project.projectLogo,

apps/server/src/api-data/project-data/projectData.router.ts

@@ -21,8 +21,6 @@ router.post('/', projectSanitiser, async (req: Request, res: Response<ProjectDat
     const newData: Partial<ProjectData> = removeUndefined({
       title: req.body?.title,
       description: req.body?.description,
-      publicUrl: req.body?.publicUrl,
-      publicInfo: req.body?.publicInfo,
       backstageUrl: req.body?.backstageUrl,
       backstageInfo: req.body?.backstageInfo,
       endMessage: req.body?.endMessage,

apps/server/src/api-data/project-data/projectData.validation.ts

@@ -5,8 +5,6 @@ export const projectSanitiser = [
   body().notEmpty().withMessage('No object found in request'),
   body('title').optional().isString().trim(),
   body('description').optional().isString().trim(),
-  body('publicUrl').optional().isString().trim(),
-  body('publicInfo').optional().isString().trim(),
   body('backstageUrl').optional().isString().trim(),
   body('backstageInfo').optional().isString().trim(),
   body('endMessage').optional().isString().trim(),

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

@@ -20,7 +20,6 @@ describe('test event validator', () => {
         timeStart: expect.any(Number),
         timeEnd: expect.any(Number),
         countToEnd: expect.any(Boolean),
-        isPublic: expect.any(Boolean),
         skip: expect.any(Boolean),
         revision: expect.any(Number),
         type: expect.any(String),
@@ -107,7 +106,6 @@ describe('doesInvalidateMetadata()', () => {
         note: 'note',
         endAction: EndAction.LoadNext,
         timerType: TimerType.Clock,
-        isPublic: false,
         colour: 'colour',
         timeWarning: 1,
         timeDanger: 2,

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

@@ -83,7 +83,6 @@ export function createPatch(originalEvent: OntimeEvent, patchEvent: Partial<Onti
     endAction: validateEndAction(patchEvent.endAction, originalEvent.endAction),
     timerType: validateTimerType(patchEvent.timerType, originalEvent.timerType),
     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),
     colour: makeString(patchEvent.colour, originalEvent.colour),
@@ -214,7 +213,6 @@ enum RegenerateWhitelist {
   'endAction',
   'timerType',
   'countToEnd',
-  'isPublic',
   'colour',
   'timeWarning',
   'timeDanger',

apps/server/src/api-integration/integration.utils.ts

@@ -22,7 +22,6 @@ const propertyConversion = {
   note: coerceString,
   cue: coerceString,
 
-  isPublic: coerceBoolean,
   skip: coerceBoolean,
 
   colour: coerceColour,

apps/server/src/app.ts

@@ -185,9 +185,7 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
       block: null,
       startedAt: null,
     },
-    publicEventNow: state.publicEventNow,
     eventNext: state.eventNext,
-    publicEventNext: state.publicEventNext,
     auxtimer1: {
       duration: timerConfig.auxTimerDefault,
       current: timerConfig.auxTimerDefault,

apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts

@@ -42,7 +42,6 @@ describe('safeMerge', () => {
     const mergedData = safeMerge(demoDb, {
       project: {
         title: 'new title',
-        publicInfo: 'new public info',
         backstageInfo: 'new backstage info',
         custom: [
           {
@@ -56,8 +55,6 @@ describe('safeMerge', () => {
     expect(mergedData.project).toStrictEqual({
       title: 'new title',
       description: 'Turin 2022',
-      publicUrl: 'www.getontime.no',
-      publicInfo: 'new public info',
       backstageUrl: 'www.github.com/cpvalente/ontime',
       backstageInfo: 'new backstage info',
       projectLogo: null,

apps/server/src/models/dataModel.ts

@@ -17,8 +17,6 @@ export const dbModel: DatabaseModel = {
   project: {
     title: '',
     description: '',
-    publicUrl: '',
-    publicInfo: '',
     backstageUrl: '',
     backstageInfo: '',
     projectLogo: null,

apps/server/src/models/demoProject.ts

@@ -71,7 +71,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 36000000,
           timeEnd: 37200000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -101,7 +100,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 37500000,
           timeEnd: 38700000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -131,7 +129,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 39000000,
           timeEnd: 40200000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -161,7 +158,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 40500000,
           timeEnd: 41700000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -191,7 +187,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 42000000,
           timeEnd: 43200000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -238,7 +233,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 47100000,
           timeEnd: 48300000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -268,7 +262,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 48600000,
           timeEnd: 49800000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -298,7 +291,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 50100000,
           timeEnd: 51300000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -328,7 +320,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 51600000,
           timeEnd: 52800000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -358,7 +349,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 53100000,
           timeEnd: 54300000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -405,7 +395,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 56100000,
           timeEnd: 57300000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -435,7 +424,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 57600000,
           timeEnd: 58800000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -465,7 +453,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 59100000,
           timeEnd: 60300000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -495,7 +482,6 @@ export const demoDb: DatabaseModel = {
           timeStart: 60600000,
           timeEnd: 61800000,
           duration: 1200000,
-          isPublic: true,
           skip: false,
           colour: '',
           parent: null,
@@ -518,8 +504,6 @@ export const demoDb: DatabaseModel = {
   project: {
     title: 'Eurovision Song Contest',
     description: 'Turin 2022',
-    publicUrl: 'www.getontime.no',
-    publicInfo: 'Rehearsal Schedule - Turin 2022',
     backstageUrl: 'www.github.com/cpvalente/ontime',
     backstageInfo: 'Rehearsal Schedule - Turin 2022\nAll performers to wear full costumes for 1st rehearsal',
     projectLogo: null,

apps/server/src/models/eventsDefinition.ts

@@ -20,7 +20,6 @@ export const event: Omit<OntimeEvent, 'id' | 'cue'> = {
   timeStart: 0,
   timeEnd: 0,
   duration: 0,
-  isPublic: false,
   skip: false,
   colour: '',
   timeWarning: 120000,

apps/server/src/services/__tests__/rollUtils.test.ts

@@ -9,49 +9,41 @@ describe('loadRoll()', () => {
       id: '1',
       timeStart: 5,
       timeEnd: 10,
-      isPublic: false,
     },
     {
       id: '2',
       timeStart: 10,
       timeEnd: 20,
-      isPublic: false,
     },
     {
       id: '3',
       timeStart: 20,
       timeEnd: 30,
-      isPublic: false,
     },
     {
       id: '4',
       timeStart: 30,
       timeEnd: 40,
-      isPublic: false,
     },
     {
       id: '5',
       timeStart: 40,
       timeEnd: 50,
-      isPublic: true,
     },
     {
       id: '6',
       timeStart: 50,
       timeEnd: 60,
-      isPublic: false,
     },
     {
       id: '7',
       timeStart: 60,
       timeEnd: 70,
-      isPublic: true,
     },
     {
       id: '8',
       timeStart: 70,
       timeEnd: 80,
-      isPublic: false,
     },
   ];
   const timedEvents = prepareTimedEvents(eventlist);
@@ -155,31 +147,26 @@ describe('loadRoll() handle edge cases with midnight', () => {
         id: '0',
         timeStart: 9 * MILLIS_PER_HOUR,
         timeEnd: 10 * MILLIS_PER_HOUR,
-        isPublic: true,
       },
       {
         id: '1',
         timeStart: 20 * MILLIS_PER_HOUR,
         timeEnd: 22 * MILLIS_PER_HOUR,
-        isPublic: true,
       },
       {
         id: '2',
         timeStart: 22 * MILLIS_PER_HOUR,
         timeEnd: 1 * MILLIS_PER_HOUR,
-        isPublic: true,
       },
       {
         id: '3',
         timeStart: 1 * MILLIS_PER_HOUR,
         timeEnd: 1 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE,
-        isPublic: true,
       },
       {
         id: '4',
         timeStart: 1 * MILLIS_PER_HOUR,
         timeEnd: 2 * MILLIS_PER_HOUR,
-        isPublic: true,
       },
     ];
     const timedEvents = prepareTimedEvents(eventlist);
@@ -311,7 +298,6 @@ describe('loadRoll() handle edge cases with before and after start', () => {
         id: '1',
         timeStart: 10 * MILLIS_PER_HOUR,
         timeEnd: 11 * MILLIS_PER_HOUR,
-        isPublic: true,
       }),
     ];
 
@@ -331,7 +317,6 @@ describe('loadRoll() handle edge cases with before and after start', () => {
         id: '1',
         timeStart: 10 * MILLIS_PER_HOUR,
         timeEnd: 11 * MILLIS_PER_HOUR,
-        isPublic: true,
       }),
     ];
 
@@ -351,7 +336,6 @@ describe('loadRoll() handle edge cases with before and after start', () => {
         id: '1',
         timeStart: 10 * MILLIS_PER_HOUR,
         timeEnd: 2 * MILLIS_PER_HOUR,
-        isPublic: true,
       }),
     ];
     const expected = {
@@ -370,7 +354,6 @@ describe('loadRoll() handle edge cases with before and after start', () => {
         id: '1',
         timeStart: 72000000, // 20:00
         timeEnd: 72010000, // 20:10
-        isPublic: true,
       }),
     ];
     const expected = {
@@ -389,19 +372,16 @@ describe('loadRoll() test that roll behaviour with overlapping times', () => {
       id: '1',
       timeStart: 10,
       timeEnd: 10,
-      isPublic: false,
     },
     {
       id: '2',
       timeStart: 10,
       timeEnd: 20,
-      isPublic: true,
     },
     {
       id: '3',
       timeStart: 10,
       timeEnd: 30,
-      isPublic: false,
     },
   ];
   const timedEvents = prepareTimedEvents(eventlist);
@@ -472,7 +452,6 @@ describe('loadRoll() test that roll behaviour multi day event edge cases', () =>
         id: '1',
         timeStart: 66000000, // 19:20
         timeEnd: 54600000, // 16:10
-        isPublic: false,
       }),
     ];
     const expected = {
@@ -491,7 +470,6 @@ describe('loadRoll() test that roll behaviour multi day event edge cases', () =>
         id: '1',
         timeStart: 67200000, // 19:40
         timeEnd: 66900000, // 19:35
-        isPublic: false,
       }),
     ];
     const expected = {

apps/server/src/services/__tests__/timerUtils.test.ts

@@ -914,7 +914,6 @@ describe('getRuntimeOffset()', () => {
         endAction: EndAction.None,
         timerType: TimerType.CountDown,
         countToEnd: true,
-        isPublic: true,
         skip: false,
         note: '',
         colour: '',
@@ -967,7 +966,6 @@ describe('getRuntimeOffset()', () => {
         endAction: EndAction.None,
         timerType: TimerType.CountDown,
         countToEnd: true,
-        isPublic: true,
         skip: false,
         note: '',
         colour: '',
@@ -1222,9 +1220,7 @@ describe('getTimerPhase()', () => {
     const state = {
       clock: 55691050,
       eventNow: null,
-      publicEventNow: null,
       eventNext: null,
-      publicEventNext: null,
       runtime: {
         selectedEventIndex: null,
         numEvents: 1,
@@ -1263,9 +1259,7 @@ describe('getTimerPhase()', () => {
     const state = {
       clock: 55691050,
       eventNow: null,
-      publicEventNow: null,
       eventNext: null,
-      publicEventNext: null,
       runtime: {
         selectedEventIndex: null,
         numEvents: 1,

apps/server/src/services/runtime-service/RuntimeService.ts

@@ -40,7 +40,7 @@ import {
   getShouldTimerUpdate,
 } from './rundownService.utils.js';
 
-type RuntimeStateEventKeys = keyof Pick<RuntimeState, 'eventNext' | 'eventNow' | 'publicEventNow' | 'publicEventNext'>;
+type RuntimeStateEventKeys = keyof Pick<RuntimeState, 'eventNext' | 'eventNow'>;
 
 /**
  * Service manages runtime status of app
@@ -185,15 +185,8 @@ class RuntimeService {
   private affectsLoaded(affectedIds: string[]): boolean {
     const state = runtimeState.getState();
     const now = state.eventNow?.id;
-    const nowPublic = state.publicEventNow?.id;
     const next = state.eventNext?.id;
-    const nextPublic = state.publicEventNext?.id;
-    return (
-      (now !== undefined && affectedIds.includes(now)) ||
-      (nowPublic !== undefined && affectedIds.includes(nowPublic)) ||
-      (next !== undefined && affectedIds.includes(next)) ||
-      (nextPublic !== undefined && affectedIds.includes(nextPublic))
-    );
+    return (now !== undefined && affectedIds.includes(now)) || (next !== undefined && affectedIds.includes(next));
   }
 
   private isNewNext() {
@@ -209,32 +202,7 @@ class RuntimeService {
     const indexNow = timedEvents.findIndex((event) => event.id === now);
     const indexNext = timedEvents.findIndex((event) => event.id === next);
 
-    if (indexNext - indexNow !== 1) {
-      return true;
-    }
-    // iterate through timed events and see if there are public events between nowPublic and nextPublic
-    const nowPublic = state.publicEventNow?.id;
-    const nextPublic = state.publicEventNext?.id;
-
-    let foundNew = false;
-    let isAfter = false;
-    for (const event of timedEvents) {
-      if (!isAfter) {
-        if (event.id === nowPublic) {
-          isAfter = true;
-        }
-      } else {
-        if (event.id === nextPublic) {
-          break;
-        }
-        if (event.isPublic) {
-          foundNew = true;
-          break;
-        }
-      }
-    }
-
-    return foundNew;
+    return indexNext - indexNow !== 1;
   }
 
   /**
@@ -852,9 +820,7 @@ function broadcastResult(_target: any, _propertyKey: string, descriptor: Propert
 
     // Update the events if they have changed
     updateEventIfChanged('eventNow', state);
-    updateEventIfChanged('publicEventNow', state);
     updateEventIfChanged('eventNext', state);
-    updateEventIfChanged('publicEventNext', state);
 
     // Helper function to update an event if it has changed
     function updateEventIfChanged(eventKey: RuntimeStateEventKeys, state: runtimeState.RuntimeState) {

apps/server/src/services/sheet-service/__tests__/sheetUtils.test.ts

@@ -33,7 +33,6 @@ describe('cellRequestFromEvent()', () => {
       timerType: TimerType.CountDown,
       countToEnd: false,
       duration: 10800000,
-      isPublic: false,
       skip: false,
       colour: 'red',
       delay: 0,
@@ -57,7 +56,6 @@ describe('cellRequestFromEvent()', () => {
       endAction: { row: 1, col: 22 },
       timerType: { row: 1, col: 23 },
       duration: { row: 1, col: 24 },
-      isPublic: { row: 1, col: 25 },
       skip: { row: 1, col: 26 },
       colour: { row: 1, col: 27 },
       revision: { row: 1, col: 38 },
@@ -83,7 +81,6 @@ describe('cellRequestFromEvent()', () => {
       duration: 10800000,
       timeStrategy: TimeStrategy.LockEnd,
       linkStart: false,
-      isPublic: false,
       skip: false,
       colour: 'red',
       parent: null,
@@ -107,7 +104,6 @@ describe('cellRequestFromEvent()', () => {
       endAction: { row: 1, col: 22 },
       timerType: { row: 1, col: 23 },
       duration: { row: 1, col: 24 },
-      isPublic: { row: 1, col: 25 },
       skip: { row: 1, col: 26 },
       colour: { row: 1, col: 27 },
       revision: { row: 1, col: 38 },
@@ -135,7 +131,6 @@ describe('cellRequestFromEvent()', () => {
       duration: 10800000,
       timeStrategy: TimeStrategy.LockEnd,
       linkStart: false,
-      isPublic: true,
       skip: false,
       colour: 'red',
       parent: null,
@@ -159,7 +154,6 @@ describe('cellRequestFromEvent()', () => {
       endAction: { row: 1, col: 22 },
       timerType: { row: 1, col: 23 },
       duration: { row: 1, col: 24 },
-      isPublic: { row: 1, col: 25 },
       skip: { row: 1, col: 26 },
       colour: { row: 1, col: 27 },
       revision: { row: 1, col: 38 },
@@ -168,7 +162,6 @@ describe('cellRequestFromEvent()', () => {
       timeDanger: { row: 1, col: 41 },
     };
     const result = cellRequestFromEvent(event, 1, 1234, metadata);
-    expect(result.updateCells?.rows?.at(0)?.values?.at(11)?.userEnteredValue?.boolValue).toStrictEqual(true);
     expect(result.updateCells?.rows?.at(0)?.values?.at(12)?.userEnteredValue?.boolValue).toStrictEqual(false);
   });
 
@@ -186,7 +179,6 @@ describe('cellRequestFromEvent()', () => {
       timeStrategy: TimeStrategy.LockEnd,
       linkStart: false,
       duration: 10800000,
-      isPublic: true,
       skip: false,
       colour: 'red',
       delay: 0,
@@ -223,7 +215,6 @@ describe('cellRequestFromEvent()', () => {
       duration: 10800000,
       timeStrategy: TimeStrategy.LockEnd,
       linkStart: false,
-      isPublic: true,
       skip: false,
       colour: 'red',
       parent: null,
@@ -261,7 +252,6 @@ describe('cellRequestFromEvent()', () => {
       duration: 10800000,
       timeStrategy: TimeStrategy.LockEnd,
       linkStart: false,
-      isPublic: true,
       skip: false,
       colour: 'red',
       parent: null,

apps/server/src/stores/__mocks__/runtimeState.mocks.ts

@@ -9,9 +9,7 @@ const baseState: RuntimeState = {
     startedAt: null,
   },
   eventNow: null,
-  publicEventNow: null,
   eventNext: null,
-  publicEventNext: null,
   runtime: {
     selectedEventIndex: null,
     numEvents: 0,

apps/server/src/stores/__tests__/runtimeState.test.ts

@@ -30,9 +30,7 @@ const mockEvent = {
 const mockState = {
   clock: 666,
   eventNow: null,
-  publicEventNow: null,
   eventNext: null,
-  publicEventNext: null,
   runtime: {
     selectedEventIndex: null,
     numEvents: 0,

apps/server/src/stores/runtimeState.ts

@@ -34,9 +34,7 @@ export type RuntimeState = {
   clock: number; // realtime clock
   eventNow: PlayableEvent | null;
   currentBlock: CurrentBlockState;
-  publicEventNow: PlayableEvent | null;
   eventNext: PlayableEvent | null;
-  publicEventNext: PlayableEvent | null;
   runtime: Runtime;
   timer: TimerState;
   // private properties of the timer calculations
@@ -54,9 +52,7 @@ const runtimeState: RuntimeState = {
   clock: timeNow(),
   currentBlock: { ...runtimeStorePlaceholder.currentBlock },
   eventNow: null,
-  publicEventNow: null,
   eventNext: null,
-  publicEventNext: null,
   runtime: { ...runtimeStorePlaceholder.runtime },
   timer: { ...runtimeStorePlaceholder.timer },
   _timer: {
@@ -75,8 +71,6 @@ export function getState(): Readonly<RuntimeState> {
     ...runtimeState,
     eventNow: runtimeState.eventNow ? { ...runtimeState.eventNow } : null,
     eventNext: runtimeState.eventNext ? { ...runtimeState.eventNext } : null,
-    publicEventNow: runtimeState.publicEventNow ? { ...runtimeState.publicEventNow } : null,
-    publicEventNext: runtimeState.publicEventNext ? { ...runtimeState.publicEventNext } : null,
     runtime: { ...runtimeState.runtime },
     timer: { ...runtimeState.timer },
     _timer: { ...runtimeState._timer },
@@ -89,9 +83,7 @@ export function getState(): Readonly<RuntimeState> {
  */
 export function clearEventData() {
   runtimeState.eventNow = null;
-  runtimeState.publicEventNow = null;
   runtimeState.eventNext = null;
-  runtimeState.publicEventNext = null;
 
   runtimeState.runtime.offset = 0;
   runtimeState.runtime.relativeOffset = 0;
@@ -111,14 +103,11 @@ export function clearEventData() {
 // clear all necessary data when doing a full stop and the event is unloaded
 export function clearState() {
   runtimeState.eventNow = null;
-  runtimeState.publicEventNow = null;
   runtimeState.eventNext = null;
 
   runtimeState.currentBlock.block = null;
   runtimeState.currentBlock.startedAt = null;
 
-  runtimeState.publicEventNext = null;
-
   runtimeState.runtime.offset = 0;
   runtimeState.runtime.relativeOffset = 0;
   runtimeState.runtime.actualStart = null;
@@ -242,33 +231,6 @@ export function loadNow(timedEvents: OntimeEvent[], eventIndex: MaybeNumber = ru
   const event = timedEvents[eventIndex] as PlayableEvent;
   runtimeState.runtime.selectedEventIndex = eventIndex;
   runtimeState.eventNow = event;
-
-  // check if current is also public
-  if (event.isPublic) {
-    runtimeState.publicEventNow = event;
-  } else {
-    // assume there is no public event
-    runtimeState.publicEventNow = null;
-
-    // if there is nothing before, return
-    if (!eventIndex) {
-      return;
-    }
-
-    // iterate backwards to find it
-    for (let i = eventIndex; i >= 0; i--) {
-      const event = timedEvents[i];
-      // we dont deal with events that are not playable
-      if (!isPlayableEvent(event)) {
-        continue;
-      }
-
-      if (event.isPublic) {
-        runtimeState.publicEventNow = event;
-        break;
-      }
-    }
-  }
 }
 
 /**
@@ -281,34 +243,21 @@ export function loadNext(
   if (eventIndex === null) {
     // reset the state to indicate there is no future event
     runtimeState.eventNext = null;
-    runtimeState.publicEventNext = null;
     return;
   }
 
   // temporarily reset this value to simplify loop logic
   runtimeState.eventNext = null;
 
+  //TODO: do we already have a it as a list of not skipped events
   for (let i = eventIndex + 1; i < timedEvents.length; i++) {
     const event = timedEvents[i];
     // we dont deal with events that are not playable
     if (!isPlayableEvent(event)) {
       continue;
     }
-
-    // the private event is the one immediately after the current event
-    if (runtimeState.eventNext === null) {
-      runtimeState.eventNext = event;
-    }
-
-    // if event is public
-    if (event.isPublic) {
-      runtimeState.publicEventNext = event;
-    }
-
-    // Stop if both are set
-    if (runtimeState.eventNext !== null && runtimeState.publicEventNext !== null) {
-      return;
-    }
+    runtimeState.eventNext = event;
+    return;
   }
 }