Revert "Session version" (#1649)

* Revert "refactor: add version to session endpoint"

This reverts commit cd40a6e55e.

* Revert "Remove public event feature (#1645)"

This reverts commit 08d9e24871.

* Revert "Fix: rearrange playing event (#1640)"

This reverts commit 0649678dca.

* Revert "refactor: style tweaks to edit css modal"

This reverts commit a00ec2d02a.

* Revert "refactor: remove usages of framer-motion"

This reverts commit 54a74ccc2a.

* Revert "Upgrade expressjs (#1633)"

This reverts commit 6f3ab274bd.

* Revert "Refactor: require trigger in all events objects (#1636)"

This reverts commit 90870ecfb6.

* Revert "Fix: Correct boundary condition in applyDelay"

This reverts commit b640e0e181.

* Revert "let vite be the proxy to the dev server (#1630)"

This reverts commit c41fe824cf.

* Revert "refactor: migrate custom fields to transactions"

This reverts commit 62c8319d70.

* Revert "refactor: simplify validations"

This reverts commit b1d23467a2.

* Revert "refactor: create transaction system and apply to adding entry (#1620)"

This reverts commit 9a62daf047.

* Revert "Refactor: better rounding (#1594)"

This reverts commit b9ab1c6fd7.

* Revert "refactor: improve reorder logic"

This reverts commit c1054711b0.

* Revert "chore: simplify URLs"

This reverts commit a4d4f29a37.

* Revert "refactor: order is single source of truth"

This reverts commit 2793aadea0.

* Revert "refactor: refetch targets is enum"

This reverts commit e7cfb7d9d9.

* Revert "refactor: small ux improvements"

This reverts commit 256a851c9b.

* Revert "refactor: remove trivially inferred numEvents"

This reverts commit 4ab9c81cb8.

* Revert "feat: duplicate groups"

This reverts commit 2f13d6c89e.

* Revert "feat: create group from entry selection"

This reverts commit f1f7bad25e.

* Revert "feat: create block from rundown empty"

This reverts commit a8b52a48f7.

* Revert "fix: collapsed blocks dont render children"

This reverts commit cd0999b2ab.

* Revert "refactor: type cleanup and test improvements"

This reverts commit b4c60f3f04.

* Revert "feat: allow dissolving a block"

This reverts commit 5cefad3666.

* Revert "fix: uncontrolled prop on controlled component"

This reverts commit 7a6ecd8c34.

* Revert "refactor: improve return of reorder"

This reverts commit ba96ecfd91.

* Revert "refactor: mutations on batch elements must have IDs"

This reverts commit 7bed3757f2.

* Revert "chore: upgrade dependencies"

This reverts commit e2e755b1d2.

* Revert "refactor: extract utility to merge two arrays"

This reverts commit a77d23109d.

* Revert "refactor: change network mode defaults"

This reverts commit 0eb3b8d382.

* Revert "fix: delete nested events"

This reverts commit 0021185288.

* Revert "fix: add event at end of block"

This reverts commit 94c72ff4f6.

* Revert "refactor: make finder available in exported rundown"

This reverts commit e4c08dc9b2.

* Revert "assert non null and update test (#1604)"

This reverts commit ec74af0d62.

* Revert "Fix project renumber (#1597)"

This reverts commit b6d72dd082.

* Revert "Refactor: WebSocket from flush queue to one patch (#1595)"

This reverts commit 31c311daf0.

* Revert "Refactor: ms for api calls (#1593)"

This reverts commit e9b3cc6090.

* Revert "fix test (#1601)"

This reverts commit 543b04a097.

* Revert "fix: rebase master"

This reverts commit d39b85b6e6.

* Revert "chore: correct test path"

This reverts commit bbe107bb2b.

* Revert "refactor: extract rundown parsing"

This reverts commit c616240db1.

* Revert "chore: improve convention entry <> event"

This reverts commit 166be66ce3.

* Revert "refactor: maintain flat orders"

This reverts commit 4180d0a337.

* Revert "refactor: implement operations on nested events"

This reverts commit 78108e316c.

* Revert "refactor: process events in rundown"

This reverts commit 3bb8b70915.

* Revert "chore: improve convention entry <> event"

This reverts commit 1c4f13a0ed.

* Revert "chore: rename currentBlock > parent"

This reverts commit 3ca0abad53.

* Revert "refactor: fix delay positioning in gaps"

This reverts commit 030c8f897f.

* Revert "refactor(e2e): skip flaky test"

This reverts commit 68175cfa3b.

* Revert "refactor: improve project loading"

This reverts commit fd8f757851.

* Revert "refactor: gather group metadata"

This reverts commit 876d111c61.

* Revert "refactor: swap maintains schedule"

This reverts commit 730cb95c04.

* Revert "chore: rename files"

This reverts commit 3c388d4fb5.

* Revert "refactor: restructure model to contain an object of rundowns"

This reverts commit 2e23718d73.

* Revert "refactor: clearer relationship on rundown elements"

This reverts commit 89ea8c470b.

* Revert "refactor: use strict typing"

This reverts commit 178640bfc4.

* Revert "refactor: remove stop as a possible end action"

This reverts commit 4ed38340e0.

* Revert "refactor: restructure model to contain an object of rundowns"

This reverts commit 69eb9a5eff.

* Revert "chore: remove IDE files"

This reverts commit 351425127a.

* Revert "refactor: remove unused and legacy code"

This reverts commit 95f2ba37cc.

apps/client/src/features/rundown/event-editor/CuesheetEventEditor.tsx

@@ -15,22 +15,23 @@ interface CuesheetEventEditorProps {
 export default function CuesheetEventEditor(props: CuesheetEventEditorProps) {
   const { eventId } = props;
   const { data } = useRundown();
+  const { order, rundown } = data;
 
   const [event, setEvent] = useState<OntimeEvent | null>(null);
 
   useEffect(() => {
-    if (data.order.length === 0) {
+    if (order.length === 0) {
       setEvent(null);
       return;
     }
 
-    const event = data.entries[eventId];
+    const event = rundown[eventId];
     if (event && isOntimeEvent(event)) {
       setEvent(event);
     } else {
       setEvent(null);
     }
-  }, [eventId, data.order, data.entries]);
+  }, [data, eventId, order, rundown]);
 
   if (!event) {
     return null;

apps/client/src/features/rundown/event-editor/EventEditor.tsx

@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
-import { OntimeEvent } from 'ontime-types';
+import { CustomFieldLabel, OntimeEvent } from 'ontime-types';
 
 import AppLink from '../../../common/components/link/app-link/AppLink';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import * as Editor from '../../editors/editor-utils/EditorUtils';
 
@@ -14,8 +14,9 @@ import EventEditorEmpty from './EventEditorEmpty';
 
 import style from './EventEditor.module.scss';
 
-// any of the titles + custom field labels
-export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | string;
+export type EventEditorSubmitActions = keyof OntimeEvent;
+
+export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | CustomFieldLabel;
 
 interface EventEditorProps {
   event: OntimeEvent;
@@ -24,7 +25,7 @@ interface EventEditorProps {
 export default function EventEditor(props: EventEditorProps) {
   const { event } = props;
   const { data: customFields } = useCustomFields();
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
 
   const isEditor = window.location.pathname.includes('editor');
 
@@ -32,12 +33,12 @@ export default function EventEditor(props: EventEditorProps) {
     (field: EditorUpdateFields, value: string) => {
       if (field.startsWith('custom-')) {
         const fieldLabel = field.split('custom-')[1];
-        updateEntry({ id: event?.id, custom: { [fieldLabel]: value } });
+        updateEvent({ id: event?.id, custom: { [fieldLabel]: value } });
       } else {
-        updateEntry({ id: event?.id, [field]: value });
+        updateEvent({ id: event?.id, [field]: value });
       }
     },
-    [event?.id, updateEntry],
+    [event?.id, updateEvent],
   );
 
   if (!event) {
@@ -56,6 +57,7 @@ export default function EventEditor(props: EventEditorProps) {
         linkStart={event.linkStart}
         countToEnd={event.countToEnd}
         delay={event.delay ?? 0}
+        isPublic={event.isPublic}
         endAction={event.endAction}
         timerType={event.timerType}
         timeWarning={event.timeWarning}

apps/client/src/features/rundown/event-editor/RundownEventEditor.tsx

@@ -13,28 +13,29 @@ import style from './EventEditor.module.scss';
 export default function RundownEventEditor() {
   const selectedEvents = useEventSelection((state) => state.selectedEvents);
   const { data } = useRundown();
+  const { order, rundown } = data;
 
   const [event, setEvent] = useState<OntimeEvent | null>(null);
 
   useEffect(() => {
-    if (data.order.length === 0) {
+    if (order.length === 0) {
       setEvent(null);
       return;
     }
 
-    const selectedEventId = Array.from(selectedEvents).at(0);
+    const selectedEventId = order.find((eventId) => selectedEvents.has(eventId));
     if (!selectedEventId) {
       setEvent(null);
       return;
     }
-    const event = data.entries[selectedEventId];
+    const event = rundown[selectedEventId];
 
     if (event && isOntimeEvent(event)) {
       setEvent(event);
     } else {
       setEvent(null);
     }
-  }, [data.order, data.entries, selectedEvents]);
+  }, [order, rundown, selectedEvents]);
 
   if (!event) {
     return <EventEditorEmpty />;

apps/client/src/features/rundown/event-editor/composite/EventEditorTimes.tsx

@@ -1,11 +1,11 @@
 import { memo } from 'react';
 import { IoInformationCircle } from 'react-icons/io5';
 import { Select, Switch, Tooltip } from '@chakra-ui/react';
-import { EndAction, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, MaybeString, TimerType, TimeStrategy } from 'ontime-types';
 import { millisToString, parseUserTime } from 'ontime-utils';
 
 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
-import { useEntryActions } from '../../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../../common/hooks/useEventAction';
 import { millisToDelayString } from '../../../../common/utils/dateConfig';
 import * as Editor from '../../../editors/editor-utils/EditorUtils';
 import TimeInputFlow from '../../time-input-flow/TimeInputFlow';
@@ -18,16 +18,17 @@ interface EventEditorTimesProps {
   timeEnd: number;
   duration: number;
   timeStrategy: TimeStrategy;
-  linkStart: boolean;
+  linkStart: MaybeString;
   countToEnd: boolean;
   delay: number;
+  isPublic: boolean;
   endAction: EndAction;
   timerType: TimerType;
   timeWarning: number;
   timeDanger: number;
 }
 
-type HandledActions = 'countToEnd' | 'timerType' | 'endAction' | 'timeWarning' | 'timeDanger';
+type HandledActions = 'countToEnd' | 'timerType' | 'endAction' | 'isPublic' | 'timeWarning' | 'timeDanger';
 
 function EventEditorTimes(props: EventEditorTimesProps) {
   const {
@@ -39,27 +40,33 @@ function EventEditorTimes(props: EventEditorTimesProps) {
     linkStart,
     countToEnd,
     delay,
+    isPublic,
     endAction,
     timerType,
     timeWarning,
     timeDanger,
   } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
 
   const handleSubmit = (field: HandledActions, value: string | boolean) => {
+    if (field === 'isPublic') {
+      updateEvent({ id: eventId, isPublic: !(value as boolean) });
+      return;
+    }
+
     if (field === 'countToEnd') {
-      updateEntry({ id: eventId, countToEnd: !(value as boolean) });
+      updateEvent({ id: eventId, countToEnd: !(value as boolean) });
       return;
     }
 
     if (field === 'timeWarning' || field === 'timeDanger') {
       const newTime = parseUserTime(value as string);
-      updateEntry({ id: eventId, [field]: newTime });
+      updateEvent({ id: eventId, [field]: newTime });
       return;
     }
 
     if (field === 'timerType' || field === 'endAction') {
-      updateEntry({ id: eventId, [field]: value });
+      updateEvent({ id: eventId, [field]: value });
       return;
     }
   };
@@ -107,6 +114,7 @@ function EventEditorTimes(props: EventEditorTimesProps) {
               variant='ontime'
             >
               <option value={EndAction.None}>None</option>
+              <option value={EndAction.Stop}>Stop rundown</option>
               <option value={EndAction.LoadNext}>Load next event</option>
               <option value={EndAction.PlayNext}>Play next event</option>
             </Select>
@@ -153,9 +161,6 @@ function EventEditorTimes(props: EventEditorTimesProps) {
               <option value={TimerType.None}>None</option>
             </Select>
           </div>
-          <div>
-            {/* TODO: rearrange this grid */}
-          </div>
           <div>
             <Editor.Label htmlFor='timeWarning'>Warning Time</Editor.Label>
             <TimeInput
@@ -167,6 +172,19 @@ function EventEditorTimes(props: EventEditorTimesProps) {
             />
           </div>
 
+          <div>
+            <Editor.Label htmlFor='isPublic'>Event Visibility</Editor.Label>
+            <Editor.Label className={style.switchLabel}>
+              <Switch
+                id='isPublic'
+                size='md'
+                isChecked={isPublic}
+                onChange={() => handleSubmit('isPublic', isPublic)}
+                variant='ontime'
+              />
+              {isPublic ? 'Public' : 'Private'}
+            </Editor.Label>
+          </div>
           <div>
             <Editor.Label htmlFor='timeDanger'>Danger Time</Editor.Label>
             <TimeInput

apps/client/src/features/rundown/event-editor/composite/EventEditorTriggers.tsx

@@ -5,7 +5,7 @@ import { TimerLifeCycle, timerLifecycleValues, Trigger } from 'ontime-types';
 import { generateId } from 'ontime-utils';
 
 import Tag from '../../../../common/components/tag/Tag';
-import { useEntryActions } from '../../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../../common/hooks/useEventAction';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 
 import { eventTriggerOptions } from './eventTrigger.constants';
@@ -14,12 +14,12 @@ import style from './EventEditorTriggers.module.scss';
 
 interface EventEditorTriggersProps {
   eventId: string;
-  triggers: Trigger[];
+  triggers?: Trigger[];
 }
 
 export default function EventEditorTriggers(props: EventEditorTriggersProps) {
   const { triggers, eventId } = props;
-  const showTriggers = triggers.length > 0;
+  const showTriggers = triggers !== undefined && triggers.length > 0;
 
   return (
     <>
@@ -37,7 +37,7 @@ interface EventTriggerFormProps {
 function EventTriggerForm(props: EventTriggerFormProps) {
   const { eventId, triggers } = props;
   const { data: automationSettings } = useAutomationSettings();
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
   const [automationId, setAutomationId] = useState<string | undefined>(undefined);
   const [cycleValue, setCycleValue] = useState(TimerLifeCycle.onStart);
 
@@ -45,7 +45,7 @@ function EventTriggerForm(props: EventTriggerFormProps) {
     const newTriggers = triggers ?? new Array<Trigger>();
     const id = generateId();
     newTriggers.push({ id, title: '', trigger: triggerLifeCycle, automationId });
-    updateEntry({ id: eventId, triggers: newTriggers });
+    updateEvent({ id: eventId, triggers: newTriggers });
   };
 
   const getValidationError = (cycle: TimerLifeCycle, automationId?: string): string | undefined => {
@@ -72,6 +72,7 @@ function EventTriggerForm(props: EventTriggerFormProps) {
         variant='ontime'
         value={cycleValue}
         onChange={(e) => setCycleValue(e.target.value as TimerLifeCycle)}
+        defaultValue={TimerLifeCycle.onStart}
       >
         <option disabled>Lifecycle Trigger</option>
         {eventTriggerOptions.map((cycle) => (
@@ -122,15 +123,15 @@ interface ExistingEventTriggersProps {
 
 function ExistingEventTriggers(props: ExistingEventTriggersProps) {
   const { eventId, triggers } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
   const { data: automationSettings } = useAutomationSettings();
 
   const handleDelete = useCallback(
     (triggerId: string) => {
       const newTriggers = triggers.filter((trigger) => trigger.id !== triggerId);
-      updateEntry({ id: eventId, triggers: newTriggers });
+      updateEvent({ id: eventId, triggers: newTriggers });
     },
-    [eventId, triggers, updateEntry],
+    [eventId, triggers, updateEvent],
   );
 
   const filteredTriggers: Record<string, Trigger[]> = {};