bump version to 3.16.1

fix: prevent storage key conflicts between stages
chore: add demo images to github
2026-08-07 08:23:55 +00:00 · 2025-08-15 19:54:38 +02:00 · 2025-08-15 19:54:38 +02:00 · 2025-08-09 07:01:01 +02:00 · 2025-06-23 20:42:53 +02:00 · 2025-06-23 19:56:53 +02:00
354 changed files with 12721 additions and 14040 deletions
@@ -0,0 +1,5 @@
 # Default ignored files
 /shelf/
 /workspace.xml
 # Editor-based HTTP Client requests
 /httpRequests/
@@ -0,0 +1,51 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="CssUnknownProperty" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="myCustomPropertiesEnabled" value="true" />
      <option name="myIgnoreVendorSpecificProperties" value="false" />
      <option name="myCustomPropertiesList">
        <value>
          <list size="3">
            <item index="0" class="java.lang.String" itemvalue="scrollbar-color" />
            <item index="1" class="java.lang.String" itemvalue="scrollbar-width" />
            <item index="2" class="java.lang.String" itemvalue="app-region" />
          </list>
        </value>
      </option>
    </inspection_tool>
    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="HttpUrlsUsage" enabled="true" level="WEAK WARNING" enabled_by_default="true">
      <option name="ignoredUrls">
        <list>
          <option value="http://localhost" />
          <option value="http://127.0.0.1" />
          <option value="http://0.0.0.0" />
          <option value="http://www.w3.org/" />
          <option value="http://json-schema.org/draft" />
          <option value="http://java.sun.com/" />
          <option value="http://xmlns.jcp.org/" />
          <option value="http://javafx.com/javafx/" />
          <option value="http://javafx.com/fxml" />
          <option value="http://maven.apache.org/xsd/" />
          <option value="http://maven.apache.org/POM/" />
          <option value="http://www.springframework.org/schema/" />
          <option value="http://www.springframework.org/tags" />
          <option value="http://www.springframework.org/security/tags" />
          <option value="http://www.thymeleaf.org" />
          <option value="http://www.jboss.org/j2ee/schema/" />
          <option value="http://www.jboss.com/xml/ns/" />
          <option value="http://www.ibm.com/webservices/xsd" />
          <option value="http://activemq.apache.org/schema/" />
          <option value="http://schema.cloudfoundry.org/spring/" />
          <option value="http://schemas.xmlsoap.org/" />
          <option value="http://cxf.apache.org/schemas/" />
          <option value="http://primefaces.org/ui" />
          <option value="http://tiles.apache.org/" />
          <option value="http://__IP__" />
        </list>
      </option>
    </inspection_tool>
    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
  </profile>
 </component>
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.15.2",
+    "version": "3.16.1",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,25 +1,25 @@
 {
  "name": "ontime-ui",
-  "version": "3.15.2",
+  "version": "3.16.1",
  "private": true,
  "type": "module",
  "dependencies": {
    "@chakra-ui/react": "^2.7.0",
-    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/core": "^6.1.0",
-    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/sortable": "^8.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@emotion/is-prop-valid": "^1.3.1",
    "@emotion/react": "^11.10.6",
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.17.2",
+    "@mantine/hooks": "^7.13.3",
    "@sentry/react": "^8.43.0",
    "@table-nav/react": "^0.0.7",
    "@tanstack/react-query": "^5.62.7",
    "@tanstack/react-query-devtools": "^5.62.7",
    "@tanstack/react-table": "^8.21.3",
    "autosize": "^6.0.1",
-    "axios": "^1.9.0",
+    "axios": "^1.2.0",
    "color": "^4.2.3",
    "csv-stringify": "^6.4.5",
    "framer-motion": "^10.10.0",
@@ -25,10 +25,11 @@ const Operator = React.lazy(() => import('./features/operator/OperatorExport'));
 const TimerView = React.lazy(() => import('./views/timer/Timer'));
 const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-timer/MinimalTimer'));
 const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
-const Countdown = React.lazy(() => import('./views/countdown/Countdown'));
+const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));
 const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
 const Public = React.lazy(() => import('./views/public/Public'));
 const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird'));
 const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock'));
 const ProjectInfo = React.lazy(() => import('./views/project-info/ProjectInfo'));
@@ -39,6 +40,7 @@ const SClock = withPreset(withData(ClockView));
 const SCountdown = withPreset(withData(Countdown));
 const SBackstage = withPreset(withData(Backstage));
 const SProjectInfo = withPreset(withData(ProjectInfo));
 const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
 const STimeline = withPreset(withData(Timeline));
@@ -86,6 +88,14 @@ export default function AppRouter() {
            </ViewLoader>
          }
        />
        <Route
          path='/public'
          element={
            <ViewLoader>
              <SPublic />
            </ViewLoader>
          }
        />
        <Route
          path='/minimal'
          element={
@@ -10,6 +10,7 @@ export const PROJECT_DATA = ['project'];
 export const PROJECT_LIST = ['projectList'];
 export const RUNDOWN = ['rundown'];
 export const RUNTIME = ['runtimeStore'];
 export const SHEET_STATE = ['sheetState'];
 export const URL_PRESETS = ['urlpresets'];
 export const VIEW_SETTINGS = ['viewSettings'];
 export const CLIENT_LIST = ['clientList'];
@@ -18,8 +19,11 @@ export const REPORT = ['report'];
 // API URLs
 export const apiEntryUrl = `${serverURL}/data`;
-const userAssetsPath = 'user';
+export const projectDataURL = `${serverURL}/project`;
-const cssOverridePath = 'styles/override.css';
+export const rundownURL = `${serverURL}/events`;
 export const ontimeURL = `${serverURL}/ontime`;
 export const userAssetsPath = 'user';
 export const cssOverridePath = 'styles/override.css';
 export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
 export const projectLogoPath = `${serverURL}/${userAssetsPath}/logo`;
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { CustomField, CustomFieldKey, CustomFields } from 'ontime-types';
+import { CustomField, CustomFieldLabel, CustomFields } from 'ontime-types';
 import { apiEntryUrl } from './constants';
@@ -24,15 +24,15 @@ export async function postCustomField(newField: CustomField): Promise<CustomFiel
 /**
 * Edits single custom field
 */
-export async function editCustomField(key: CustomFieldKey, newField: CustomField): Promise<CustomFields> {
+export async function editCustomField(label: CustomFieldLabel, newField: CustomField): Promise<CustomFields> {
-  const res = await axios.put(`${customFieldsPath}/${key}`, { ...newField });
+  const res = await axios.put(`${customFieldsPath}/${label}`, { ...newField });
  return res.data;
 }
 /**
 * Deletes single custom field
 */
-export async function deleteCustomField(key: CustomFieldKey): Promise<CustomFields> {
+export async function deleteCustomField(label: CustomFieldLabel): Promise<CustomFields> {
-  const res = await axios.delete(`${customFieldsPath}/${key}`);
+  const res = await axios.delete(`${customFieldsPath}/${label}`);
  return res.data;
 }
@@ -2,7 +2,7 @@ import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
 import { makeTable } from '../../views/cuesheet/cuesheet.utils';
-import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../utils/csv';
+import { makeCSVFromArrayOfArrays } from '../utils/csv';
 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -40,11 +40,9 @@ export async function downloadProject(fileName: string) {
 export async function downloadCSV(fileName: string = 'rundown') {
  try {
    const { data, name } = await fileDownload(fileName);
-    const { project, rundowns, customFields } = data;
+    const { project, rundown, customFields } = data;
    const flatRundowns = aggregateRundowns(rundowns);
    const sheetData = makeTable(project, flatRundowns, customFields);
    const sheetData = makeTable(project, rundown, customFields);
    const fileContent = makeCSVFromArrayOfArrays(sheetData);
    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
@@ -1,11 +1,16 @@
 import axios, { AxiosResponse } from 'axios';
-import { CustomFields, Rundown } from 'ontime-types';
+import { CustomFields, OntimeRundown } from 'ontime-types';
 import { ImportMap } from 'ontime-utils';
 import { apiEntryUrl } from './constants';
 const excelPath = `${apiEntryUrl}/excel`;
 type PreviewSpreadsheetResponse = {
  rundown: OntimeRundown;
  customFields: CustomFields;
 };
 /**
 * upload Excel file to server
 * @return string - file ID op the uploaded file
@@ -29,10 +34,6 @@ export async function getWorksheetNames(): Promise<string[]> {
  return response.data;
 }
 type PreviewSpreadsheetResponse = {
  rundown: Rundown;
  customFields: CustomFields;
 };
 export async function importRundownPreview(options: ImportMap): Promise<PreviewSpreadsheetResponse> {
  const response: AxiosResponse<PreviewSpreadsheetResponse> = await axios.post(`${excelPath}/preview`, {
    options,
@@ -11,7 +11,7 @@ export type HasUpdate = {
 * HTTP request to get the latest version and url from github
 */
 export async function getLatestVersion(): Promise<HasUpdate> {
-  const res = await axios.get(apiRepoLatest);
+  const res = await axios.get(`${apiRepoLatest}`);
  return {
    url: res.data.html_url as string,
    version: res.data.tag_name as string,
@@ -11,7 +11,7 @@ export const reportUrl = `${apiEntryUrl}/report`;
 * HTTP request to fetch all reports
 */
 export async function fetchReport(): Promise<OntimeReport> {
-  const res = await axios.get(reportUrl);
+  const res = await axios.get(`${reportUrl}/`);
  return res.data;
 }
@@ -1,45 +1,29 @@
 import axios, { AxiosResponse } from 'axios';
-import {
+import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
  EntryId,
  MessageResponse,
  OntimeEntry,
  OntimeEvent,
  ProjectRundownsList,
  Rundown,
  TransientEventPayload,
 } from 'ontime-types';
 import { apiEntryUrl } from './constants';
 const rundownPath = `${apiEntryUrl}/rundown`;
 /**
 * HTTP request to fetch a list of existing rundowns
 */
 export async function fetchProjectRundownList(): Promise<ProjectRundownsList> {
  const res = await axios.get(rundownPath);
  return res.data;
 }
 /**
 * HTTP request to fetch all events
 */
-export async function fetchCurrentRundown(): Promise<Rundown> {
+export async function fetchNormalisedRundown(): Promise<RundownCached> {
-  const res = await axios.get(`${rundownPath}/current`);
+  const res = await axios.get(`${rundownPath}/normalised`);
  return res.data;
 }
 /**
- * HTTP request to post new entry
+ * HTTP request to post new event
 */
-export async function postAddEntry(data: TransientEventPayload): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.post(rundownPath, data);
 }
 /**
- * HTTP request to edit an entry
+ * HTTP request to put new event
 */
-export async function putEditEntry(data: Partial<OntimeEntry>): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPutEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.put(rundownPath, data);
 }
@@ -49,22 +33,22 @@ type BatchEditEntry = {
 };
 /**
- * HTTP request to edit multiple events
+ * HTTP request to put multiple events
 */
-export async function putBatchEditEvents(data: BatchEditEntry): Promise<AxiosResponse<Rundown>> {
+export async function requestBatchPutEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
  return axios.put(`${rundownPath}/batch`, data);
 }
 export type ReorderEntry = {
-  entryId: EntryId;
+  eventId: string;
-  destinationId: EntryId;
+  from: number;
-  order: 'before' | 'after' | 'insert';
+  to: number;
 };
 /**
- * HTTP request to reorder an entry
+ * HTTP request to reorder events
 */
-export async function patchReorderEntry(data: ReorderEntry): Promise<AxiosResponse<Rundown>> {
+export async function requestReorderEvent(data: ReorderEntry): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.patch(`${rundownPath}/reorder`, data);
 }
@@ -83,36 +67,15 @@ export async function requestEventSwap(data: SwapEntry): Promise<AxiosResponse<M
 /**
 * HTTP request to request application of delay
 */
-export async function requestApplyDelay(delayId: EntryId): Promise<AxiosResponse<Rundown>> {
+export async function requestApplyDelay(eventId: string): Promise<AxiosResponse<MessageResponse>> {
-  return axios.patch(`${rundownPath}/applydelay/${delayId}`);
+  return axios.patch(`${rundownPath}/applydelay/${eventId}`);
 }
 /**
- * HTTP request for cloning an entry
+ * HTTP request to delete given event
 */
-export async function postCloneEntry(entryId: EntryId): Promise<AxiosResponse<Rundown>> {
+export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.post(`${rundownPath}/clone/${entryId}`);
+  return axios.delete(rundownPath, { data: { ids: eventIds } });
 }
 /**
 * HTTP request for dissolving of a block
 */
 export async function requestUngroup(blockId: EntryId): Promise<AxiosResponse<Rundown>> {
  return axios.post(`${rundownPath}/ungroup/${blockId}`);
 }
 /**
 * HTTP request for grouping a list of entries into a block
 */
 export async function requestGroupEntries(entryIds: EntryId[]): Promise<AxiosResponse<Rundown>> {
  return axios.post(`${rundownPath}/group`, { ids: entryIds });
 }
 /**
 * HTTP request to delete entries
 */
 export async function deleteEntries(entryIds: EntryId[]): Promise<AxiosResponse<MessageResponse>> {
  return axios.delete(rundownPath, { data: { ids: entryIds } });
 }
 /**
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { AuthenticationStatus, CustomFields, Rundown } from 'ontime-types';
+import { AuthenticationStatus, CustomFields, OntimeRundown } from 'ontime-types';
 import { ImportMap } from 'ontime-utils';
 import { apiEntryUrl } from './constants';
@@ -54,7 +54,7 @@ export const previewRundown = async (
  sheetId: string,
  options: ImportMap,
 ): Promise<{
-  rundown: Rundown;
+  rundown: OntimeRundown;
  customFields: CustomFields;
 }> => {
  const response = await axios.post(`${sheetsPath}/${sheetId}/read`, { options });
@@ -7,7 +7,7 @@ import { addLog } from '../stores/logger';
 import { nowInMillis } from '../utils/time';
 /**
- * Utility unwrap a potential axios error
+ * Utility unrwap a potential axios error
 * @param error
 * @returns
 */
@@ -34,7 +34,7 @@ export function maybeAxiosError(error: unknown) {
 }
 /**
- * Utility unwraps a potential axios error and sends to logger
+ * Utility unrwaps a potential axios error and sends to logger
 * @param prepend
 * @param error
 */
@@ -1,61 +0,0 @@
@use '../../../theme/viewerDefs' as *;
 .baseButton {
  display: flex;
  align-items: center;
  gap: 0.5em;
  width: fit-content;
  padding-inline: 1em;
  border: 1px solid transparent;
  border-radius: 3px;
  cursor: pointer;
  &:disabled {
    opacity: 0.4;
    cursor: not-allowed;
  }
 }
 .subtle {
  background: $gray-1050;
  color: $blue-400;
  &:hover:not(:disabled):not(:active) {
    background: $gray-1000;
    color: $blue-500;
  }
  &:active:not(:disabled) {
    background: $gray-1100;
    border-color: $gray-1250;
  }
 }
 .primary {
  background: $blue-700;
  color: $ui-white;
  &:hover:not(:disabled):not(:active) {
    background: $blue-600;
  }
  &:active:not(:disabled) {
    background: $blue-800;
    border-color: $blue-900;
  }
  &:disabled {
    opacity: $viewer-opacity-disabled;
  }
 }
 .medium {
  height: 2rem;
 }
 .large {
  height: 3.5rem;
 }
@@ -1,20 +0,0 @@
 import { ButtonHTMLAttributes } from 'react';
 import { cx } from '../../utils/styleUtils';
 import style from './Button.module.scss';
 interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
  variant?: 'subtle' | 'primary';
  size?: 'medium' | 'large';
 }
 export default function Button(props: ButtonProps) {
  const { className, children, variant = 'subtle', size = 'medium', ...buttonProps } = props;
  return (
    <button className={cx([style.baseButton, style[variant], style[size], className])} type='button' {...buttonProps}>
      {children}
    </button>
  );
 }
@@ -1,28 +1,21 @@
-@use '../../../theme/viewerDefs' as *;
+.subtle {
 .baseIconButton {
  aspect-ratio: 1;
  height: 2rem;
-  width: 2rem;
+  height: 2rem;
  display: grid;
  place-content: center;
  border: 1px solid transparent;
  border-radius: 3px;
  cursor: pointer;
 }
 .subtle {
  background: $gray-1050;
  color: $blue-400;
  border: 1px solid transparent;
  border-radius: 3px;
  &:hover:not(:disabled):not(:active) {
    background: $gray-1000;
    color: $blue-500;
  }
-  &:active:not(:disabled){
+  &:active {
    background: $gray-1100;
    border-color: $gray-1250;
  }
@@ -31,37 +24,3 @@
    background: $gray-1050;
  }
 }
 .subtle-white {
  background: $gray-1050;
  color: $ui-white;
  &:hover:not(:disabled):not(:active) {
    background: $gray-1000;
    color: $ui-white;
  }
  &:active:not(:disabled) {
    background: $gray-1100;
    border-color: $gray-1250;
  }
  &:disabled {
    background: $gray-1050;
  }
 }
 .destructive {
  background: $red-700;
  color: $ui-white;
  &:hover:not(:disabled):not(:active) {
    background: $red-600;
    color: $ui-white;
  }
  &:active:not(:disabled) {
    background: $red-800;
    border-color: $red-900;
  }
 }
@@ -4,15 +4,10 @@ import { cx } from '../../utils/styleUtils';
 import style from './IconButton.module.scss';
-interface IconButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
-  variant?: 'subtle' | 'subtle-white' | 'destructive';
+  const { className, children, ...buttonProps } = props;
 }
 export default function IconButton(props: IconButtonProps) {
  const { className, children, variant = 'subtle', ...buttonProps } = props;
  return (
-    <button className={cx([style.baseIconButton, style[variant], className])} type='button' {...buttonProps}>
+    <button className={cx([style.subtle, className])} {...buttonProps}>
      {children}
    </button>
  );
@@ -23,7 +23,7 @@ export type OptionWithoutGroup = {
  withDivider?: boolean;
 };
-type OptionWithGroup = {
+export type OptionWithGroup = {
  label: string;
  group: Omit<OptionWithoutGroup, 'isGroup'>[];
 };
@@ -3,8 +3,8 @@ import React from 'react';
 // skipcq: JS-C1003 - sentry does not expose itself as an ES Module.
 import * as Sentry from '@sentry/react';
-import { hasConnected, reconnectAttempts } from '../../../common/utils/socket';
+import { runtimeStore } from '@/common/stores/runtime';
-import { runtimeStore } from '../../stores/runtime';
+import { hasConnected, reconnectAttempts, shouldReconnect } from '@/common/utils/socket';
 import style from './ErrorBoundary.module.scss';
@@ -37,7 +37,7 @@ class ErrorBoundary extends React.Component {
      scope.setExtras({
        error,
        store: appState,
-        hasSocket: { hasConnected, reconnectAttempts },
+        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
      });
      const eventId = Sentry.captureException(error);
      this.setState({ eventId, info });
@@ -2,7 +2,7 @@ import { KeyboardEvent, useEffect, useRef, useState } from 'react';
 import { Input, Radio, RadioGroup } from '@chakra-ui/react';
 import { millisToString, parseUserTime } from 'ontime-utils';
-import { useEntryActions } from '../../../hooks/useEntryAction';
+import { useEventAction } from '../../../hooks/useEventAction';
 import style from './DelayInput.module.scss';
@@ -13,7 +13,7 @@ interface DelayInputProps {
 export default function DelayInput(props: DelayInputProps) {
  const { eventId, duration } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
  const [value, setValue] = useState<string>('');
  const inputRef = useRef<HTMLInputElement | null>(null);
@@ -54,7 +54,7 @@ export default function DelayInput(props: DelayInputProps) {
  };
  const submitChange = (value: number) => {
-    updateEntry({
+    updateEvent({
      id: eventId,
      duration: value,
    });
@@ -0,0 +1,45 @@
 $loader-size: 4rem;
 .overlay {
  position: absolute;
  z-index: 10;
  width: 100%;
  height: 100%;
  display: grid;
  place-content: center;
  background-color: $black-10;
  backdrop-filter: blur(5px);
 }
 .loader {
  width: $loader-size;
  height: $loader-size;
  background: $blue-500;
  display: inline-block;
  border-radius: 50%;
  box-sizing: border-box;
  animation: animloader 1s ease-in infinite;
 }
@keyframes animloader {
  0% {
    transform: scale(0);
    opacity: 0.6;
  }
  100% {
    transform: scale(1);
    opacity: 0;
  }
 }
@keyframes animloader {
  0% {
    transform: scale(0);
    opacity: 0.6;
  }
  100% {
    transform: scale(1);
    opacity: 0;
  }
 }
@@ -0,0 +1,9 @@
 import style from './LoaderOverlay.module.scss';
 export default function LoaderOverlay() {
  return (
    <div className={style.overlay}>
      <span className={style.loader} />
    </div>
  );
 }
@@ -3,7 +3,6 @@ import { IoSettingsOutline } from 'react-icons/io5';
 import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
 import IconButton from '../buttons/IconButton';
 import style from './NavigationMenu.module.scss';
@@ -18,24 +17,22 @@ export default function FloatingNavigation(props: FloatingNavigationProps) {
  return (
    <div className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}>
-      <IconButton
+      <button
        variant='subtle-white'
        className={style.navButton}
        onClick={toggleMenu}
        aria-label='toggle menu'
        className={style.navButton}
        data-testid='navigation__toggle-menu'
      >
        <IoApps />
-      </IconButton>
+      </button>
-      <IconButton
+      <button
-        variant='subtle-white'
+        className={style.button}
        className={style.navButton}
        onClick={toggleSettings}
        aria-label='toggle settings'
        data-testid='navigation__toggle-settings'
      >
        <IoSettingsOutline />
-      </IconButton>
+      </button>
    </div>
  );
 }
@@ -3,6 +3,8 @@
 $menu-hover-bg: $gray-1350;
 $menu-focus-bg: $gray-1300;
 $icon-color: $ui-white;
 $button-bg: $gray-1050;
 $button-size: 3rem;
 .fadeable {
@@ -13,7 +15,6 @@ $button-size: 3rem;
  &.hidden {
    opacity: 0;
    pointer-events: none;
  }
 }
@@ -40,10 +41,20 @@ $button-size: 3rem;
  z-index: 12;
 }
-.navButton {
+.button {
  font-size: 1.5rem;
  color: $icon-color;
  background-color: $button-bg;
  width: $button-size;
  height: $button-size;
-  width: $button-size;;
+  display: grid;
  place-content: center;
  border-radius: 3px;
 }
 .navButton {
  @extend .button;
  z-index: 3;
 }
 .link {
@@ -0,0 +1,16 @@
 import { memo } from 'react';
 import NavigationMenu from './NavigationMenu';
 interface ProductionNavigationMenuProps {
  isMenuOpen: boolean;
  onMenuClose: () => void;
 }
 function ProductionNavigationMenu(props: ProductionNavigationMenuProps) {
  const { isMenuOpen, onMenuClose } = props;
  return <NavigationMenu isOpen={isMenuOpen} onClose={onMenuClose} />;
 }
 export default memo(ProductionNavigationMenu);
@@ -1,6 +1,7 @@
 import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
 import { baseURI } from '../../../externals';
 import { cx } from '../../utils/styleUtils';
 import ParamInput from './ParamInput';
@@ -17,7 +18,7 @@ interface ViewParamsSectionProps {
 export default function ViewParamsSection(props: ViewParamsSectionProps) {
  const { title, collapsible, options } = props;
-  const [collapsed, setCollapsed] = useLocalStorage({ key: `params-${title}`, defaultValue: false });
+  const [collapsed, setCollapsed] = useLocalStorage({ key: `${baseURI}params-${title}`, defaultValue: false });
  const handleCollapse = () => {
    if (collapsible) {
@@ -12,7 +12,7 @@ type OptionsField = {
  defaultValue?: string;
 };
-type MultiselectOption = { value: string; label: string; colour: string };
+export type MultiselectOption = { value: string; label: string; colour: string };
 export type MultiselectOptions = Record<string, MultiselectOption>;
 type MultiOptionsField = {
  type: 'multi-option';
@@ -1,5 +1,6 @@
 import { createContext, PropsWithChildren, useCallback, useEffect, useState } from 'react';
 import { baseURI } from '../../externals';
 import useSettings from '../hooks-query/useSettings';
 interface AppContextType {
@@ -26,7 +27,7 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {
  useEffect(() => {
    if (status === 'pending') return;
-    const previousEditor = sessionStorage.getItem(storageKeys.editor);
+    const previousEditor = sessionStorage.getItem(`${baseURI}${storageKeys.editor}`);
    if (previousEditor && previousEditor === data.editorKey) {
      setEditorAuth(true);
@@ -34,7 +35,7 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {
      setEditorAuth(data.editorKey == null || data.editorKey === '');
    }
-    const previousOperator = sessionStorage.getItem(storageKeys.operator);
+    const previousOperator = sessionStorage.getItem(`${baseURI}${storageKeys.operator}`);
    if (previousOperator && previousOperator === data.operatorKey) {
      setOperatorAuth(true);
    } else {
@@ -55,14 +56,14 @@ export const AppContextProvider = ({ children }: PropsWithChildren) => {
      if (permission === 'editor') {
        const correct = isValid(pin, data.editorKey);
        if (correct) {
-          sessionStorage.setItem(storageKeys.editor, pin);
+          sessionStorage.setItem(`${baseURI}${storageKeys.editor}`, pin);
        }
        setEditorAuth(correct);
        return correct;
      } else if (permission === 'operator') {
        const correct = isValid(pin, data.operatorKey);
        if (correct) {
-          sessionStorage.setItem(storageKeys.operator, pin);
+          sessionStorage.setItem(`${baseURI}${storageKeys.operator}`, pin);
        }
        setOperatorAuth(correct);
        return correct;
@@ -0,0 +1,32 @@
 // roughly from https://github.com/juliencrn/usehooks-ts/blob/master/packages/usehooks-ts/src/useMediaQuery/useMediaQuery.ts
 import { useCallback, useEffect, useState } from 'react';
 function getMatches(query: string): boolean {
  return window.matchMedia(query).matches;
 }
 // TODO: debounce handleChange
 export default function useMediaQuery(query: string): boolean {
  const [matches, setMatches] = useState<boolean>(getMatches(query));
  const handleChange = useCallback(() => {
    setMatches(getMatches(query));
  }, [query]);
  useEffect(() => {
    const matchMedia = window.matchMedia(query);
    // Triggered at the first client-side load and if query changes
    handleChange();
    // Listen matchMedia
    matchMedia.addEventListener('change', handleChange);
    return () => {
      matchMedia.removeEventListener('change', handleChange);
    };
  }, [handleChange, query]);
  return matches;
 }
@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery } from '@tanstack/react-query';
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
-import { getAutomationSettings } from '../api/automation';
+import { editAutomationSettings, getAutomationSettings } from '../api/automation';
 import { AUTOMATION } from '../api/constants';
 import { logAxiosError } from '../api/utils';
 import { automationPlaceholderSettings } from '../models/AutomationSettings';
 import { ontimeQueryClient } from '../queryClient';
 export default function useAutomationSettings() {
  const { data, status, isFetching, isError, refetch } = useQuery({
@@ -18,3 +20,15 @@ export default function useAutomationSettings() {
  return { data: data ?? automationPlaceholderSettings, status, isFetching, isError, refetch };
 }
 export function useAutomationSettingsMutation() {
  const { isPending, mutateAsync } = useMutation({
    mutationFn: editAutomationSettings,
    onError: (error) => logAxiosError('Error saving Automation settings', error),
    onSuccess: (data) => {
      ontimeQueryClient.setQueryData(AUTOMATION, data);
    },
    onSettled: () => ontimeQueryClient.invalidateQueries({ queryKey: AUTOMATION }),
  });
  return { isPending, mutateAsync };
 }
@@ -11,7 +11,7 @@ const placeholderProjectList: ProjectFileListResponse = {
  lastLoadedProject: '',
 };
-function useProjectList() {
+export function useProjectList() {
  const { data, status, refetch } = useQuery({
    queryKey: PROJECT_LIST,
    queryFn: getProjects,
@@ -1,30 +1,23 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { OntimeEntry, Rundown } from 'ontime-types';
+import { NormalisedRundown, OntimeRundown, OntimeRundownEntry, RundownCached } from 'ontime-types';
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
-import { fetchCurrentRundown } from '../api/rundown';
+import { fetchNormalisedRundown } from '../api/rundown';
 import useProjectData from './useProjectData';
 // revision is -1 so that the remote revision is higher
-const cachedRundownPlaceholder: Rundown = {
+const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };
  id: 'default',
  title: '',
  order: [],
  flatOrder: [],
  entries: {},
  revision: -1,
 };
 /**
 * Normalised rundown data
 */
 export default function useRundown() {
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
+  const { data, status, isError, refetch, isFetching } = useQuery<RundownCached>({
    queryKey: RUNDOWN,
-    queryFn: fetchCurrentRundown,
+    queryFn: fetchNormalisedRundown,
    placeholderData: (previousData, _previousQuery) => previousData,
    retry: 5,
    retryDelay: (attempt) => attempt * 2500,
@@ -44,16 +37,16 @@ export function useFlatRundown() {
  const loadedProject = useRef<string>('');
  const [prevRevision, setPrevRevision] = useState<number>(-1);
-  const [flatRundown, setFlatRundown] = useState<OntimeEntry[]>([]);
+  const [flatRunDown, setFlatRunDown] = useState<OntimeRundown>([]);
  // update data whenever the revision changes
  useEffect(() => {
-    if (data.revision !== -1 && data.revision !== prevRevision) {
+    if (data.revision !== -1 || data.revision !== prevRevision) {
-      const flatRundown = data.flatOrder.map((id) => data.entries[id]);
+      const flatRundown = data.order.map((id) => data.rundown[id]);
-      setFlatRundown(flatRundown);
+      setFlatRunDown(flatRundown);
      setPrevRevision(data.revision);
    }
-  }, [data.entries, data.flatOrder, data.revision, prevRevision]);
+  }, [data.order, data.revision, data.rundown, prevRevision]);
  // TODO: should we have a project id field?
  // invalidate current version if project changes
@@ -64,13 +57,13 @@ export function useFlatRundown() {
    }
  }, [projectData]);
-  return { data: flatRundown, status };
+  return { data: flatRunDown, status };
 }
 /**
 * Provides access to a partial rundown based on a filter callback
 */
-export function usePartialRundown(cb: (event: OntimeEntry) => boolean) {
+export function usePartialRundown(cb: (event: OntimeRundownEntry) => boolean) {
  const { data, status } = useFlatRundown();
  const filteredData = useMemo(() => {
    return data.filter(cb);
@@ -1,806 +0,0 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
  EntryId,
  isOntimeBlock,
  isOntimeEvent,
  MaybeString,
  OntimeBlock,
  OntimeEntry,
  OntimeEvent,
  Rundown,
  TimeField,
  TimeStrategy,
  TransientEventPayload,
 } from 'ontime-types';
 import { dayInMs, generateId, MILLIS_PER_SECOND, parseUserTime, swapEventData } from 'ontime-utils';
 import { moveDown, moveUp } from '../../features/rundown/rundown.utils';
 import { RUNDOWN } from '../api/constants';
 import {
  deleteEntries,
  patchReorderEntry,
  postAddEntry,
  postCloneEntry,
  putBatchEditEvents,
  putEditEntry,
  ReorderEntry,
  requestApplyDelay,
  requestDeleteAll,
  requestEventSwap,
  requestGroupEntries,
  requestUngroup,
  SwapEntry,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';
 export type EventOptions = Partial<{
  // options to any new block (event / delay / block)
  after: MaybeString;
  before: MaybeString;
  // options to blocks of type OntimeEvent
  defaultPublic: boolean;
  linkPrevious: boolean;
  lastEventId: MaybeString;
 }>;
 /**
 * Gather utilities for actions on entries
 */
 export const useEntryActions = () => {
  const queryClient = useQueryClient();
  const {
    defaultPublic,
    linkPrevious,
    defaultTimeStrategy,
    defaultDuration,
    defaultWarnTime,
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
  } = useEditorSettings();
  const getEntryById = useCallback(
    (eventId: string): OntimeEntry | undefined => {
      const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (!cachedRundown?.entries) {
        return;
      }
      return cachedRundown.entries[eventId];
    },
    [queryClient],
  );
  /**
   * Calls mutation to add new entry
   * @private
   */
  const _addEntryMutation = useMutation({
    // TODO(v4): optimistic create entry
    mutationFn: postAddEntry,
    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
  });
  /**
   * Adds an entry to rundown
   */
  const addEntry = useCallback(
    async (entry: Partial<OntimeEntry>, options?: EventOptions) => {
      const newEntry: TransientEventPayload = { ...entry, id: generateId() };
      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEntry)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
          before: options?.before,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
        };
        if (applicationOptions?.lastEventId) {
          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
          const rundownData = queryClient.getQueryData<Rundown>(RUNDOWN)!;
          const previousEvent = rundownData.entries[applicationOptions.lastEventId];
          if (isOntimeEvent(previousEvent)) {
            newEntry.timeStart = previousEvent.timeEnd;
          }
        }
        // Override event with options from editor settings
        newEntry.linkStart = applicationOptions.linkPrevious;
        newEntry.isPublic = applicationOptions.defaultPublic;
        if (newEntry.duration === undefined && newEntry.timeEnd === undefined) {
          newEntry.duration = parseUserTime(defaultDuration);
        }
        if (newEntry.timeDanger === undefined) {
          newEntry.timeDanger = parseUserTime(defaultDangerTime);
        }
        if (newEntry.timeWarning === undefined) {
          newEntry.timeWarning = parseUserTime(defaultWarnTime);
        }
        if (newEntry.timerType === undefined) {
          newEntry.timerType = defaultTimerType;
        }
        if (newEntry.endAction === undefined) {
          newEntry.endAction = defaultEndAction;
        }
        if (newEntry.timeStrategy === undefined) {
          newEntry.timeStrategy = defaultTimeStrategy;
        }
      }
      // handle adding options that concern all event type
      if (options?.after) {
        (newEntry as TransientEventPayload).after = options.after;
      }
      if (options?.before) {
        (newEntry as TransientEventPayload).before = options.before;
      }
      try {
        await _addEntryMutation.mutateAsync(newEntry);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
    },
    [
      _addEntryMutation,
      defaultDangerTime,
      defaultDuration,
      defaultEndAction,
      defaultPublic,
      defaultTimerType,
      defaultTimeStrategy,
      defaultWarnTime,
      linkPrevious,
      queryClient,
    ],
  );
  /**
   * Calls mutation to clone a selection
   * @private
   */
  const _cloneMutation = useMutation({
    mutationFn: postCloneEntry,
    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
  });
  /**
   * Clone a selection
   */
  const clone = useCallback(
    async (entryId: EntryId) => {
      try {
        await _cloneMutation.mutateAsync(entryId);
      } catch (error) {
        logAxiosError('Error cloning entry', error);
      }
    },
    [_cloneMutation],
  );
  /**
   * Calls mutation to update existing entry
   * @private
   */
  const _updateEntryMutation = useMutation({
    mutationFn: putEditEntry,
    // we optimistically update here
    onMutate: async (newEvent) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      const eventId = newEvent.id;
      if (previousData && eventId) {
        // optimistically update object
        const newRundown = { ...previousData.entries };
        // @ts-expect-error -- we expect the events to be of same type
        newRundown[eventId] = { ...newRundown[eventId], ...newEvent };
        queryClient.setQueryData<Rundown>(RUNDOWN, {
          id: previousData.id,
          title: previousData.title,
          order: previousData.order,
          flatOrder: previousData.flatOrder,
          entries: newRundown,
          revision: -1,
        });
      }
      // Return a context with the previous and new events
      return { previousData, newEvent };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _newEvent, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: async () => {
      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Updates existing entry
   */
  const updateEntry = useCallback(
    async (event: Partial<OntimeEntry>) => {
      try {
        await _updateEntryMutation.mutateAsync(event);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
    [_updateEntryMutation],
  );
  const updateCustomField = useCallback(
    async (entryId: EntryId, field: string, value: string) => {
      updateEntry({ id: entryId, custom: { [field]: value } });
    },
    [updateEntry],
  );
  /**
   * Updates time of existing event
   * @param eventId {EntryId} - id of the event
   * @param field {TimeField} - field to update
   * @param value {string} - new value string to be parsed
   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
   */
  const updateTimer = useCallback(
    async (eventId: EntryId, field: TimeField, value: string, lockOnUpdate?: boolean) => {
      // an empty value with no lock has no domain validity
      if (!lockOnUpdate && value === '') {
        return;
      }
      const newEvent: Partial<OntimeEvent> = {
        id: eventId,
      };
      // check if we should lock the field
      if (lockOnUpdate) {
        if (field === 'timeEnd') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
        } else if (field === 'duration') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
          newEvent.duration = value === '' ? undefined : calculateNewValue();
        } else if (field === 'timeStart') {
          // an empty values means we should link to the previous
          newEvent.linkStart = value === '';
          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
        }
      } else {
        newEvent[field] = calculateNewValue();
      }
      try {
        await _updateEntryMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
      /**
       * Utility function to calculate the new time value
       */
      function calculateNewValue(): number {
        let newValMillis = 0;
        // check for previous keyword
        if (value === 'p' || value === 'prev' || value === 'previous') {
          newValMillis = getPreviousEnd();
          // check for adding time keyword
        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
          // TODO: is this logic solid?
          const remainingString = value.substring(1);
          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
        } else {
          newValMillis = parseUserTime(value);
        }
        // dont allow timer values over 23:59:59
        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
      }
      /**
       * Utility function to get the previous event end time
       */
      function getPreviousEnd(): number {
        const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
        if (!cachedRundown?.order || !cachedRundown?.entries) {
          return 0;
        }
        const index = cachedRundown.order.indexOf(eventId);
        if (index === 0) {
          return 0;
        }
        let previousEnd = 0;
        for (let i = index - 1; i >= 0; i--) {
          const event = cachedRundown.entries[cachedRundown.order[i]];
          if (isOntimeEvent(event)) {
            previousEnd = event.timeEnd;
            break;
          }
        }
        return previousEnd;
      }
    },
    [_updateEntryMutation, queryClient],
  );
  /**
   * Calls mutation to edit multiple events
   * @private
   */
  const _batchUpdateEventsMutation = useMutation({
    mutationFn: putBatchEditEvents,
    onMutate: async ({ ids, data }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (previousRundown) {
        const eventIds = new Set(ids);
        const newRundown = { ...previousRundown.entries };
        eventIds.forEach((eventId) => {
          if (Object.hasOwn(newRundown, eventId)) {
            const event = newRundown[eventId];
            if (isOntimeEvent(event)) {
              newRundown[eventId] = {
                ...event,
                ...data,
              };
            }
          }
        });
        queryClient.setQueryData<Rundown>(RUNDOWN, {
          id: previousRundown.id,
          title: previousRundown.title,
          order: previousRundown.order,
          flatOrder: previousRundown.flatOrder,
          entries: newRundown,
          revision: -1,
        });
      }
      // Return a context with the previous rundown
      return { previousRundown };
    },
    onSuccess: (response) => {
      if (!response.data) return;
      const { id, title, order, flatOrder, entries, revision } = response.data;
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id,
        title,
        order,
        flatOrder,
        entries,
        revision,
      });
    },
    onError: (_error, _newEvent, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousRundown);
    },
  });
  const batchUpdateEvents = useCallback(
    async (data: Partial<OntimeEvent>, eventIds: string[]) => {
      try {
        await _batchUpdateEventsMutation.mutateAsync({ ids: eventIds, data });
      } catch (error) {
        logAxiosError('Error updating events', error);
      }
    },
    [_batchUpdateEventsMutation],
  );
  /**
   * Calls mutation to delete an entry
   * @private
   */
  const _deleteEntryMutation = useMutation({
    mutationFn: deleteEntries,
    // we optimistically update here
    onMutate: async (entryIds: EntryId[]) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (previousData) {
        // optimistically update object
        const { entries, order, flatOrder } = optimisticDeleteEntries(entryIds, previousData);
        queryClient.setQueryData<Rundown>(RUNDOWN, {
          id: previousData.id,
          title: previousData.title,
          order,
          flatOrder,
          entries,
          revision: -1,
        });
      }
      // Return a context with the previous and new events
      return { previousData };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _entryIds, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Deletes an event entry from the rundown
   */
  const deleteEntry = useCallback(
    async (entryIds: EntryId[]) => {
      try {
        await _deleteEntryMutation.mutateAsync(entryIds);
      } catch (error) {
        logAxiosError('Error deleting event', error);
      }
    },
    [_deleteEntryMutation],
  );
  /**
   * Calls mutation to delete all events
   * @private
   */
  const _deleteAllEntriesMutation = useMutation({
    mutationFn: requestDeleteAll,
    // we optimistically update here
    onMutate: async () => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      // optimistically update object
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id: previousData?.id ?? 'default',
        title: previousData?.title ?? '',
        order: [],
        flatOrder: [],
        entries: {},
        revision: -1,
      });
      // Return a context with the previous and new events
      return { previousData };
    },
    // Mutation fails, rollback optimist update
    onError: (_error, _, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Deletes all entries in the rundown
   */
  const deleteAllEntries = useCallback(async () => {
    try {
      await _deleteAllEntriesMutation.mutateAsync();
    } catch (error) {
      logAxiosError('Error deleting events', error);
    }
  }, [_deleteAllEntriesMutation]);
  /**
   * Calls mutation to apply a delay
   * @private
   */
  const _applyDelayMutation = useMutation({
    mutationFn: requestApplyDelay,
    onSuccess: (response) => {
      if (!response.data) return;
      const { id, title, order, flatOrder, entries, revision } = response.data;
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id,
        title,
        order,
        flatOrder,
        entries,
        revision,
      });
    },
    // Mutation finished, failed or successful
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Applies a given delay
   */
  const applyDelay = useCallback(
    async (delayEventId: EntryId) => {
      try {
        await _applyDelayMutation.mutateAsync(delayEventId);
      } catch (error) {
        logAxiosError('Error applying delay', error);
      }
    },
    [_applyDelayMutation],
  );
  /**
   * Calls mutation to dissolve a block
   * @private
   */
  const _ungroupMutation = useMutation({
    mutationFn: requestUngroup,
    onSuccess: (response) => {
      if (!response.data) return;
      const { id, title, order, flatOrder, entries, revision } = response.data;
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id,
        title,
        order,
        flatOrder,
        entries,
        revision,
      });
    },
    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
  });
  /**
   * Deletes a block and moves its events to the top level
   */
  const ungroup = useCallback(
    async (blockId: EntryId) => {
      try {
        await _ungroupMutation.mutateAsync(blockId);
      } catch (error) {
        logAxiosError('Error dissolving block', error);
      }
    },
    [_ungroupMutation],
  );
  /**
   * Calls mutation to create a block with a selection
   * @private
   */
  const _groupEntriesMutation = useMutation({
    mutationFn: requestGroupEntries,
    onSuccess: (response) => {
      if (!response.data) return;
      const { id, title, order, flatOrder, entries, revision } = response.data;
      queryClient.setQueryData<Rundown>(RUNDOWN, {
        id,
        title,
        order,
        flatOrder,
        entries,
        revision,
      });
    },
    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
  });
  /**
   * Create a block with a selection
   */
  const groupEntries = useCallback(
    async (entryIds: EntryId[]) => {
      try {
        await _groupEntriesMutation.mutateAsync(entryIds);
      } catch (error) {
        logAxiosError('Error grouping entries', error);
      }
    },
    [_groupEntriesMutation],
  );
  /**
   * Calls mutation to reorder an entry
   * @private
   */
  const _reorderEntryMutation = useMutation({
    mutationFn: patchReorderEntry,
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Reorders a given entry
   */
  const reorderEntry = useCallback(
    async (entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') => {
      try {
        const reorderObject: ReorderEntry = {
          entryId,
          destinationId,
          order,
        };
        await _reorderEntryMutation.mutateAsync(reorderObject);
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
    [_reorderEntryMutation],
  );
  const move = useCallback(async (entryId: EntryId, direction: 'up' | 'down') => {
    const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
    if (!cachedRundown?.order) {
      return;
    }
    const { destinationId, order } =
      direction === 'up'
        ? moveUp(entryId, cachedRundown.order, cachedRundown.entries)
        : moveDown(entryId, cachedRundown.order, cachedRundown.entries);
    if (destinationId) {
      try {
        const reorderObject: ReorderEntry = {
          entryId,
          destinationId,
          order: order as 'before' | 'after' | 'insert',
        };
        await _reorderEntryMutation.mutateAsync(reorderObject);
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    }
  }, []);
  /**
   * Calls mutation to swap events
   * @private
   */
  const _swapEvents = useMutation({
    mutationFn: requestEventSwap,
    // we optimistically update here
    onMutate: async ({ from, to }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (previousData) {
        // optimistically update object
        const newRundown = { ...previousData.entries };
        const eventA = previousData.entries[from];
        const eventB = previousData.entries[to];
        if (!isOntimeEvent(eventA) || !isOntimeEvent(eventB)) {
          return;
        }
        const [newA, newB] = swapEventData(eventA, eventB);
        newRundown[from] = newA;
        newRundown[to] = newB;
        queryClient.setQueryData<Rundown>(RUNDOWN, {
          id: previousData.id,
          title: previousData.title,
          order: previousData.order,
          flatOrder: previousData.flatOrder,
          entries: newRundown,
          revision: -1,
        });
      }
      // Return a context with the previous events
      return { previousData };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _eventId, context) => {
      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
  });
  /**
   * Swaps the schedule of two events
   */
  const swapEvents = useCallback(
    async ({ from, to }: SwapEntry) => {
      try {
        await _swapEvents.mutateAsync({ from, to });
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
    [_swapEvents],
  );
  return {
    addEntry,
    applyDelay,
    batchUpdateEvents,
    clone,
    deleteEntry,
    deleteAllEntries,
    ungroup,
    getEntryById,
    groupEntries,
    move,
    reorderEntry,
    swapEvents,
    updateEntry,
    updateTimer,
    updateCustomField,
  };
 };
 /**
 * Utility to optimistically delete entries from client cache
 */
 function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
  const entries = { ...rundown.entries };
  let order = [...rundown.order];
  let flatOrder = [...rundown.flatOrder];
  for (let i = 0; i < entryIds.length; i++) {
    const entry = entries[entryIds[i]];
    deleteEntry(entry);
  }
  function deleteEntry(entry: OntimeEntry) {
    if (isOntimeBlock(entry) || !entry.parent) {
      order = order.filter((id) => id !== entry.id);
    } else {
      const parent = entries[entry.parent] as OntimeBlock;
      parent.events = parent.events.filter((event) => event !== entry.id);
    }
    delete entries[entry.id];
    flatOrder = flatOrder.filter((id) => id !== entry.id);
  }
  return { entries, order, flatOrder };
 }
@@ -0,0 +1,636 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
  isOntimeEvent,
  OntimeBlock,
  OntimeDelay,
  OntimeEvent,
  OntimeRundownEntry,
  RundownCached,
  TimeField,
  TimeStrategy,
  TransientEventPayload,
 } from 'ontime-types';
 import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
 import { RUNDOWN } from '../api/constants';
 import {
  ReorderEntry,
  requestApplyDelay,
  requestBatchPutEvents,
  requestDelete,
  requestDeleteAll,
  requestEventSwap,
  requestPostEvent,
  requestPutEvent,
  requestReorderEvent,
  SwapEntry,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';
 export type EventOptions = Partial<{
  // options to any new block (event / delay / block)
  after: string;
  before: string;
  // options to blocks of type OntimeEvent
  defaultPublic: boolean;
  linkPrevious: boolean;
  lastEventId: string;
 }>;
 /**
 * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
 */
 export const useEventAction = () => {
  const queryClient = useQueryClient();
  const {
    defaultPublic,
    linkPrevious,
    defaultTimeStrategy,
    defaultDuration,
    defaultWarnTime,
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
  } = useEditorSettings();
  const getEventById = useCallback(
    (eventId: string) => {
      const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
      if (!cachedRundown?.rundown) {
        return;
      }
      return cachedRundown.rundown[eventId];
    },
    [queryClient],
  );
  /**
   * Calls mutation to add new event
   * @private
   */
  const _addEventMutation = useMutation({
    mutationFn: requestPostEvent,
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Adds an event to rundown
   */
  const addEvent = useCallback(
    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
      const newEvent: TransientEventPayload = { ...event };
      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEvent)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
          before: options?.before,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
        };
        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
          newEvent.linkStart = applicationOptions.lastEventId;
        } else if (applicationOptions?.lastEventId) {
          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
          const rundownData = queryClient.getQueryData<RundownCached>(RUNDOWN)!;
          const { rundown } = rundownData;
          const previousEvent = rundown[applicationOptions.lastEventId];
          if (isOntimeEvent(previousEvent)) {
            newEvent.timeStart = previousEvent.timeEnd;
          }
        }
        // Override event with options from editor settings
        if (applicationOptions.defaultPublic) {
          newEvent.isPublic = true;
        }
        if (newEvent.duration === undefined && newEvent.timeEnd === undefined) {
          newEvent.duration = parseUserTime(defaultDuration);
        }
        if (newEvent.timeDanger === undefined) {
          newEvent.timeDanger = parseUserTime(defaultDangerTime);
        }
        if (newEvent.timeWarning === undefined) {
          newEvent.timeWarning = parseUserTime(defaultWarnTime);
        }
        if (newEvent.timerType === undefined) {
          newEvent.timerType = defaultTimerType;
        }
        if (newEvent.endAction === undefined) {
          newEvent.endAction = defaultEndAction;
        }
        if (newEvent.timeStrategy === undefined) {
          newEvent.timeStrategy = defaultTimeStrategy;
        }
      }
      // handle adding options that concern all event type
      if (options?.after) {
        // @ts-expect-error -- not sure how to type this, <after> is a transient property
        newEvent.after = options.after;
      }
      if (options?.before) {
        // @ts-expect-error -- not sure how to type this, <before> is a transient property
        newEvent.before = options.before;
      }
      try {
        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
    },
    [
      _addEventMutation,
      defaultDangerTime,
      defaultDuration,
      defaultEndAction,
      defaultPublic,
      defaultTimerType,
      defaultTimeStrategy,
      defaultWarnTime,
      linkPrevious,
      queryClient,
    ],
  );
  /**
   * Calls mutation to update existing event
   * @private
   */
  const _updateEventMutation = useMutation({
    mutationFn: requestPutEvent,
    // we optimistically update here
    onMutate: async (newEvent) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
      const eventId = newEvent.id;
      if (previousData && eventId) {
        // optimistically update object
        const newRundown = { ...previousData.rundown };
        // @ts-expect-error -- we expect the events to be of same type
        newRundown[eventId] = { ...newRundown[eventId], ...newEvent };
        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
      }
      // Return a context with the previous and new events
      return { previousData, newEvent };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _newEvent, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: async () => {
      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Updates existing event
   */
  const updateEvent = useCallback(
    async (event: Partial<OntimeRundownEntry>) => {
      try {
        await _updateEventMutation.mutateAsync(event);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
    [_updateEventMutation],
  );
  const updateCustomField = useCallback(
    async (eventId: string, field: string, value: string) => {
      updateEvent({ id: eventId, custom: { [field]: value } });
    },
    [updateEvent],
  );
  /**
   * Updates time of existing event
   * @param eventId {string} - id of the event
   * @param field {TimeField} - field to update
   * @param value {string} - new value string to be parsed
   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
   */
  const updateTimer = useCallback(
    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
      // an empty value with no lock has no domain validity
      if (!lockOnUpdate && value === '') {
        return;
      }
      const newEvent: Partial<OntimeEvent> = {
        id: eventId,
      };
      // check if we should lock the field
      if (lockOnUpdate) {
        if (field === 'timeEnd') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
        } else if (field === 'duration') {
          // an empty value indicates that we should unlock the field
          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
          newEvent.duration = value === '' ? undefined : calculateNewValue();
        } else if (field === 'timeStart') {
          // an empty values means we should link to the previous
          newEvent.linkStart = value === '' ? 'true' : null;
          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
        }
      } else {
        newEvent[field] = calculateNewValue();
      }
      try {
        await _updateEventMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
      /**
       * Utility function to calculate the new time value
       */
      function calculateNewValue(): number {
        let newValMillis = 0;
        // check for previous keyword
        if (value === 'p' || value === 'prev' || value === 'previous') {
          newValMillis = getPreviousEnd();
          // check for adding time keyword
        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
          // TODO: is this logic solid?
          const remainingString = value.substring(1);
          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
        } else {
          newValMillis = parseUserTime(value);
        }
        // dont allow timer values over 23:59:59
        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
      }
      /**
       * Utility function to get the previous event end time
       */
      function getPreviousEnd(): number {
        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
        if (!cachedRundown?.order || !cachedRundown?.rundown) {
          return 0;
        }
        const index = cachedRundown.order.indexOf(eventId);
        if (index === 0) {
          return 0;
        }
        let previousEnd = 0;
        for (let i = index - 1; i >= 0; i--) {
          const event = cachedRundown.rundown[cachedRundown.order[i]];
          if (isOntimeEvent(event)) {
            previousEnd = event.timeEnd;
            break;
          }
        }
        return previousEnd;
      }
    },
    [_updateEventMutation, queryClient],
  );
  /**
   * Calls mutation to edit multiple events
   * @private
   */
  const _batchUpdateEventsMutation = useMutation({
    mutationFn: requestBatchPutEvents,
    onMutate: async ({ ids, data }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousEvents = queryClient.getQueryData<RundownCached>(RUNDOWN);
      if (previousEvents) {
        const eventIds = new Set(ids);
        const newRundown = { ...previousEvents.rundown };
        eventIds.forEach((eventId) => {
          if (Object.hasOwn(newRundown, eventId)) {
            const event = newRundown[eventId];
            if (isOntimeEvent(event)) {
              newRundown[eventId] = {
                ...event,
                ...data,
              };
            }
          }
        });
        queryClient.setQueryData(RUNDOWN, { order: previousEvents.order, rundown: newRundown, revision: -1 });
      }
      // Return a context with the previous and new events
      return { previousEvents };
    },
    onSettled: async () => {
      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    onError: (_error, _newEvent, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousEvents);
    },
    networkMode: 'always',
  });
  const batchUpdateEvents = useCallback(
    async (data: Partial<OntimeEvent>, eventIds: string[]) => {
      try {
        await _batchUpdateEventsMutation.mutateAsync({ ids: eventIds, data });
      } catch (error) {
        logAxiosError('Error updating events', error);
      }
    },
    [_batchUpdateEventsMutation],
  );
  /**
   * Calls mutation to delete an event
   * @private
   */
  const _deleteEventMutation = useMutation({
    mutationFn: requestDelete,
    // we optimistically update here
    onMutate: async (eventIds: string[]) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
      if (previousData) {
        // optimistically update object
        const newOrder = previousData.order.filter((id) => !eventIds.includes(id));
        const newRundown = { ...previousData.rundown };
        for (const eventId of eventIds) {
          delete newRundown[eventId];
        }
        queryClient.setQueryData(RUNDOWN, {
          order: newOrder,
          rundown: newRundown,
          revision: -1,
        });
      }
      // Return a context with the previous and new events
      return { previousData };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _eventId, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Deletes an event form the list
   */
  const deleteEvent = useCallback(
    async (eventIds: string[]) => {
      try {
        await _deleteEventMutation.mutateAsync(eventIds);
      } catch (error) {
        logAxiosError('Error deleting event', error);
      }
    },
    [_deleteEventMutation],
  );
  /**
   * Calls mutation to delete all events
   * @private
   */
  const _deleteAllEventsMutation = useMutation({
    mutationFn: requestDeleteAll,
    // we optimistically update here
    onMutate: async () => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
      // optimistically update object
      queryClient.setQueryData(RUNDOWN, { rundown: {}, order: [], revision: -1 });
      // Return a context with the previous and new events
      return { previousData };
    },
    // Mutation fails, rollback undos optimist update
    onError: (_error, _eventId, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Deletes all events from list
   */
  const deleteAllEvents = useCallback(async () => {
    try {
      await _deleteAllEventsMutation.mutateAsync();
    } catch (error) {
      logAxiosError('Error deleting events', error);
    }
  }, [_deleteAllEventsMutation]);
  /**
   * Calls mutation to apply a delay
   * @private
   */
  const _applyDelayMutation = useMutation({
    mutationFn: requestApplyDelay,
    // Mutation finished, failed or successful
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Applies a given delay block
   */
  const applyDelay = useCallback(
    async (delayEventId: string) => {
      try {
        await _applyDelayMutation.mutateAsync(delayEventId);
      } catch (error) {
        logAxiosError('Error applying delay', error);
      }
    },
    [_applyDelayMutation],
  );
  /**
   * Calls mutation to reorder an event
   * @private
   */
  const _reorderEventMutation = useMutation({
    mutationFn: requestReorderEvent,
    // we optimistically update here
    onMutate: async (data) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
      if (previousData) {
        // optimistically update object
        const newOrder = reorderArray(previousData.order, data.from, data.to);
        queryClient.setQueryData(RUNDOWN, { order: newOrder, rundown: previousData.rundown, revision: -1 });
      }
      // Return a context with the previous and new events
      return { previousData };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _eventId, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Reorders a given event
   */
  const reorderEvent = useCallback(
    async (eventId: string, from: number, to: number) => {
      try {
        const reorderObject: ReorderEntry = {
          eventId,
          from,
          to,
        };
        await _reorderEventMutation.mutateAsync(reorderObject);
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
    [_reorderEventMutation],
  );
  /**
   * Calls mutation to swap events
   * @private
   */
  const _swapEvents = useMutation({
    mutationFn: requestEventSwap,
    // we optimistically update here
    onMutate: async ({ from, to }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });
      // Snapshot the previous value
      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
      if (previousData) {
        // optimistically update object
        const newRundown = { ...previousData.rundown };
        const eventA = previousData.rundown[from];
        const eventB = previousData.rundown[to];
        if (!isOntimeEvent(eventA) || !isOntimeEvent(eventB)) {
          return;
        }
        const { newA, newB } = swapEventData(eventA, eventB);
        newRundown[from] = newA;
        newRundown[to] = newB;
        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
      }
      // Return a context with the previous events
      return { previousData };
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _eventId, context) => {
      queryClient.setQueryData(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    networkMode: 'always',
  });
  /**
   * Swaps the schedule of two events
   */
  const swapEvents = useCallback(
    async ({ from, to }: SwapEntry) => {
      try {
        await _swapEvents.mutateAsync({ from, to });
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
    [_swapEvents],
  );
  return {
    addEvent,
    applyDelay,
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
    getEventById,
    reorderEvent,
    swapEvents,
    updateEvent,
    updateTimer,
    updateCustomField,
  };
 };
@@ -2,38 +2,31 @@ import { useEffect, useState } from 'react';
 import { throttle } from '../utils/throttle';
 const inactiveTime = 3000; // 3 seconds
-/**
+export const useFadeOutOnInactivity = () => {
- * Provides whether there has been mouse movement in the page in the last <inactiveTime>
+  const [isMouseMoved, setIsMouseMoved] = useState(false);
 */
 export const useFadeOutOnInactivity = (initialState = false) => {
  const [isUserActive, setIsUserActive] = useState(initialState);
  // show on mouse move
  useEffect(() => {
    let fadeOut: NodeJS.Timeout | null = null;
    const setShowMenuTrue = () => {
-      setIsUserActive(true);
+      setIsMouseMoved(true);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
-      fadeOut = setTimeout(() => setIsUserActive(false), inactiveTime);
+      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
    };
    const throttledShowMenu = throttle(setShowMenuTrue, 1000);
    document.addEventListener('mousemove', throttledShowMenu);
    document.addEventListener('keydown', throttledShowMenu);
    return () => {
      document.removeEventListener('mousemove', throttledShowMenu);
      document.removeEventListener('keydown', throttledShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
    };
  }, []);
-  return isUserActive;
+  return isMouseMoved;
 };
@@ -12,7 +12,7 @@ type noop = (this: any, ...args: any[]) => any;
 type PickFunction<T extends noop> = (this: ThisParameterType<T>, ...args: Parameters<T>) => ReturnType<T>;
-const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';
+export const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';
 export default function useMemoisedFn<T extends noop>(fn: T) {
  if (isDev) {
@@ -91,6 +91,14 @@ export const setPlayback = {
  },
 };
 export const useInfoPanel = createSelector((state: RuntimeStore) => ({
  eventNow: state.eventNow,
  eventNext: state.eventNext,
  playback: state.timer.playback,
  selectedEventIndex: state.runtime.selectedEventIndex,
  numEvents: state.runtime.numEvents,
 }));
 export const useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);
 export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
@@ -137,6 +145,8 @@ export const useProgressData = createSelector((state: RuntimeStore) => ({
  timeDanger: state.eventNow?.timeDanger ?? null,
 }));
 export const setClientName = (newName: string) => socketSendJson('set-client-name', newName);
 export const useRuntimeOverview = createSelector((state: RuntimeStore) => ({
  plannedStart: state.runtime.plannedStart,
  actualStart: state.runtime.actualStart,
@@ -164,15 +174,11 @@ export const useTimeUntilData = createSelector((state: RuntimeStore) => ({
  clock: state.clock,
  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,
  offsetMode: state.runtime.offsetMode,
-  currentDay: state.eventNow?.dayOffset ?? 0,
+  currentDay: state.eventNow?.dayOffset ?? 0, //The day of the currently running event
  actualStart: state.runtime.actualStart,
  plannedStart: state.runtime.plannedStart,
 }));
 export const useCurrentDay = createSelector((state: RuntimeStore) => ({
  currentDay: state.eventNow?.dayOffset ?? 0,
 }));
 export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
  offset: state.runtime.offset,
 }));
@@ -2,7 +2,7 @@ import { GetInfo } from 'ontime-types';
 export const ontimePlaceholderInfo: GetInfo = {
  networkInterfaces: [],
-  version: '4.0.0',
+  version: '2.0.0',
  serverPort: 4001,
  publicDir: '',
 };
@@ -1,7 +1,8 @@
 import { Settings } from 'ontime-types';
 export const ontimePlaceholderSettings: Settings = {
-  version: '4.0.0',
+  app: 'ontime',
  version: '2.0.0',
  serverPort: 4001,
  editorKey: null,
  operatorKey: null,
@@ -1,20 +1,9 @@
 import { QueryClient } from '@tanstack/react-query';
 import { isOntimeCloud } from '../externals';
 export const ontimeQueryClient = new QueryClient({
  defaultOptions: {
    queries: {
      gcTime: 1000 * 60 * 10, // 10 min
    },
    mutations: {
      /**
       * React Query detects whether the client is online
       * However, web access is not required for the clients when deployed locally
       * - use 'always' for clients that may be online
       * - use 'online' for clients that are connected to the cloud
       */
      networkMode: isOntimeCloud ? 'online' : 'always',
    },
  },
 });
@@ -1,12 +1,14 @@
 import { create } from 'zustand';
 import { baseURI } from '../../externals';
 export enum AppMode {
  Run = 'run',
  Edit = 'edit',
  Freeze = 'freeze',
 }
-const appModeKey = 'ontime-app-mode';
+const appModeKey = `${baseURI}ontime-app-mode`;
 function getModeFromSession() {
  return sessionStorage.getItem(appModeKey) === AppMode.Run ? AppMode.Run : AppMode.Edit;
@@ -1,6 +1,8 @@
 import { ClientList } from 'ontime-types';
 import { create } from 'zustand';
 import { baseURI } from '../../externals';
 interface ClientStore {
  name?: string;
  setName: (newValue: string) => void;
@@ -15,7 +17,7 @@ interface ClientStore {
  setClients: (clients: ClientList) => void;
 }
-const clientNameKey = 'ontime-client-name';
+const clientNameKey = `${baseURI}ontime-client-name`;
 function persistNameInStorage(newValue: string) {
  localStorage.setItem(clientNameKey, newValue);
@@ -11,7 +11,7 @@ type LogStore = {
  logs: Log[];
 };
-const logger = createStore<LogStore>(() => ({
+export const logger = createStore<LogStore>(() => ({
  logs: [],
 }));
@@ -14,6 +14,18 @@ export const runtimeStore = createWithEqualityFn<RuntimeStore>(
 export const useRuntimeStore = <T>(selector: (state: RuntimeStore) => T) =>
  useStoreWithEqualityFn(runtimeStore, selector, deepCompare);
 let batchStore: Partial<RuntimeStore> = {};
 export function addToBatchUpdates<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]) {
  batchStore[key] = value;
 }
 export function flushBatchUpdates() {
  const state = runtimeStore.getState();
  runtimeStore.setState({ ...state, ...batchStore });
  batchStore = {};
 }
 /**
 * Allows patching a property of the runtime store
 */
@@ -1,6 +1,8 @@
 // eslint-disable-next-line simple-import-sort/imports
 import { create } from 'zustand';
 import { booleanFromLocalStorage } from '../utils/localStorage';
 import { baseURI } from '../../externals';
 enum LocalEventKeys {
  Mirror = 'ontime-view-mirror',
@@ -12,11 +14,11 @@ type ViewOptionsStore = {
 };
 export const useViewOptionsStore = create<ViewOptionsStore>()((set) => ({
-  mirror: booleanFromLocalStorage(LocalEventKeys.Mirror, false),
+  mirror: booleanFromLocalStorage(`${baseURI}${LocalEventKeys.Mirror}`, false),
  toggleMirror: (newValue?: boolean) =>
    set((state) => {
      const val = typeof newValue === 'undefined' ? !state.mirror : newValue;
-      localStorage.setItem(LocalEventKeys.Mirror, String(val));
+      localStorage.setItem(`${baseURI}${LocalEventKeys.Mirror}`, String(val));
      return { mirror: val };
    }),
 }));
@@ -1,6 +1,4 @@
-import { OntimeEntry, ProjectRundowns, Rundown } from 'ontime-types';
+import { makeCSVFromArrayOfArrays } from '../csv';
 import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../csv';
 describe('makeCSVFromArrayOfArrays()', () => {
  it('joins an array of arrays with commas and newlines', () => {
@@ -13,34 +11,3 @@ after newline,after comma
 `);
  });
 });
 describe('aggregateRundowns()', () => {
  it('flattens an object of rundowns into a single array', () => {
    const rundowns = {
      first: {
        id: '',
        title: '',
        revision: 0,
        order: ['1', '2'],
        flatOrder: ['1', '2'],
        entries: {
          '1': { id: '1' } as OntimeEntry,
          '2': { id: '2' } as OntimeEntry,
        },
      },
      second: {
        id: '',
        title: '',
        revision: 0,
        order: ['3', '4'],
        flatOrder: ['3', '4'],
        entries: {
          '3': { id: '3' } as OntimeEntry,
          '4': { id: '4' } as OntimeEntry,
        },
      } as Rundown,
    } as ProjectRundowns;
    expect(aggregateRundowns(rundowns)).toStrictEqual([{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }]);
  });
 });
@@ -1,12 +1,12 @@
-import { EndAction, EntryCustomFields, OntimeEvent, SupportedEntry, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType, TimeStrategy } from 'ontime-types';
-import { cloneEvent } from '../clone';
+import { cloneEvent } from '../eventsManager';
 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
    const original: OntimeEvent = {
      id: 'unique',
-      type: SupportedEntry.Event,
+      type: SupportedEvent.Event,
      title: 'title',
      cue: 'cue',
      note: 'note',
@@ -15,8 +15,7 @@ describe('cloneEvent()', () => {
      timeEnd: 10,
      timerType: TimerType.CountDown,
      timeStrategy: TimeStrategy.LockEnd,
-      parent: 'test',
+      linkStart: null,
      linkStart: false,
      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
@@ -28,19 +27,17 @@ describe('cloneEvent()', () => {
      delay: 0,
      dayOffset: 0,
      gap: 0,
      triggers: [],
      custom: {
        lighting: '3',
-      } as EntryCustomFields,
+      } as EventCustomFields,
    };
    const cloned = cloneEvent(original);
    expect(cloned).not.toBe(original);
    expect(cloned.custom).not.toBe(original.custom);
    expect(cloned.triggers).not.toBe(original.triggers);
    expect(cloned).toMatchObject({
-      type: SupportedEntry.Event,
+      type: SupportedEvent.Event,
      title: original.title,
      note: original.note,
      timeStart: original.timeStart,
@@ -48,7 +45,6 @@ describe('cloneEvent()', () => {
      timeEnd: original.timeEnd,
      timerType: original.timerType,
      timeStrategy: original.timeStrategy,
      parent: 'test',
      countToEnd: original.countToEnd,
      linkStart: original.linkStart,
      endAction: original.endAction,
@@ -61,8 +57,6 @@ describe('cloneEvent()', () => {
      gap: 0,
      timeWarning: original.timeWarning,
      timeDanger: original.timeDanger,
      triggers: original.triggers,
      custom: original.custom,
    });
  });
 });
@@ -64,13 +64,13 @@ describe('getRouteFromPreset()', () => {
  describe('handle url sharing edge cases', () => {
    it('finds the correct preset when the url contains extra arguments', () => {
      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy();
+      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy()
-    });
+    })
    it('appends the feature params to the alias', () => {
      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
+      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123')
-    });
+    })
  });
 });
@@ -83,26 +83,25 @@ describe('generatePathFromPreset()', () => {
  });
  test('appends the feature params to the alias', () => {
-    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe(
+    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
      'timer?user=guest&alias=demopage&locked=true&token=123',
    );
  });
 });
 describe('arePathsEquivalent()', () => {
-  it('checks whether the paths match', () => {
+  it("checks whether the paths match",  () => {
    expect(arePathsEquivalent('demopage', 'timer')).toBeFalsy();
    expect(arePathsEquivalent('timer', 'timer')).toBeTruthy();
    expect(arePathsEquivalent('timer?user=guest', 'timer?user=guest')).toBeTruthy();
-  });
+  })
-  it('checks whether the params match', () => {
+  it("checks whether the params match",  () => {
    expect(arePathsEquivalent('timer?test=a', 'timer?test=b')).toBeFalsy();
    expect(arePathsEquivalent('timer?test=a', 'timer?test=a')).toBeTruthy();
-  });
+  })
-  it('considers edge cases for the url sharing feature', () => {
+  it("considers edge cases for the url sharing feature",  () => {
    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=b')).toBeFalsy();
    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=a')).toBeTruthy();
-  });
+  })
 });
@@ -1,31 +1,10 @@
 import { stringify } from 'csv-stringify/browser/esm/sync';
 import { OntimeEntry, ProjectRundowns } from 'ontime-types';
 /**
- * Converts an array of arrays to a CSV file
+ * @description Converts an array of arrays to a CSV file
 * @param {string[][]} arrayOfArrays
 * @return {string}
 */
 export function makeCSVFromArrayOfArrays(arrayOfArrays: string[][]): string {
  return stringify(arrayOfArrays);
 }
 /**
 * Receives an object of rundowns, and flattens them into a single, linear rundown
 * Used for CSV export
 */
 export function aggregateRundowns(rundowns: ProjectRundowns): OntimeEntry[] {
  const rundownKeys = Object.keys(rundowns);
  if (rundownKeys.length === 0) return [];
  const flatRundown: OntimeEntry[] = [];
  for (const key of rundownKeys) {
    const { order, entries } = rundowns[key];
    for (let i = 0; i < order.length; i++) {
      const entryId = order[i];
      const entry = entries[entryId];
      flatRundown.push(entry);
    }
  }
  return flatRundown;
 }
@@ -1,4 +1,4 @@
-import { OntimeEvent, SupportedEntry } from 'ontime-types';
+import { OntimeEvent, SupportedEvent } from 'ontime-types';
 /**
 * @description Creates a safe duplicate of an event
@@ -9,7 +9,7 @@ import { OntimeEvent, SupportedEntry } from 'ontime-types';
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
 export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
  return {
-    type: SupportedEntry.Event,
+    type: SupportedEvent.Event,
    title: event.title,
    note: event.note,
    timeStart: event.timeStart,
@@ -23,14 +23,12 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
    parent: event.parent,
    revision: 0,
    delay: event.delay, // the events will be collocated, so having the same metadata is a good start
    dayOffset: event.dayOffset,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
-    triggers: structuredClone(event.triggers),
+    custom: { ...event.custom },
    custom: structuredClone(event.custom),
  };
 };
@@ -1,4 +1,4 @@
-import { Log, Rundown, RuntimeStore } from 'ontime-types';
+import { Log, RundownCached, RuntimeStore } from 'ontime-types';
 import { isProduction, websocketUrl } from '../../externals';
 import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
@@ -14,12 +14,13 @@ import {
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { addToBatchUpdates, flushBatchUpdates, patchRuntime, patchRuntimeProperty } from '../stores/runtime';
-let websocket: WebSocket | null = null;
+export let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
 const reconnectInterval = 1000;
 export let shouldReconnect = true;
 export let hasConnected = false;
 export let reconnectAttempts = 0;
@@ -48,17 +49,18 @@ export const connectSocket = () => {
  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
-    // we decide to allows reconnect
+    if (shouldReconnect) {
-    reconnectTimeout = setTimeout(() => {
+      reconnectTimeout = setTimeout(() => {
-      if (reconnectAttempts > 2) {
+        if (reconnectAttempts > 2) {
-        setOnlineStatus(false);
+          setOnlineStatus(false);
-      }
+        }
-      console.warn('WebSocket: attempting reconnect');
+        console.warn('WebSocket: attempting reconnect');
-      if (websocket && websocket.readyState === WebSocket.CLOSED) {
+        if (websocket && websocket.readyState === WebSocket.CLOSED) {
-        reconnectAttempts += 1;
+          reconnectAttempts += 1;
-        connectSocket();
+          connectSocket();
-      }
+        }
-    }, reconnectInterval);
+      }, reconnectInterval);
    }
  };
  websocket.onerror = (error) => {
@@ -141,10 +143,59 @@ export const connectSocket = () => {
          updateDevTools(serverPayload);
          break;
        }
-        case 'ontime-patch': {
+        case 'ontime-clock': {
-          const patch = payload as Partial<RuntimeStore>;
+          addToBatchUpdates('clock', payload);
-          patchRuntime(patch);
+          updateDevTools({ clock: payload });
-          updateDevTools(patch);
+          break;
        }
        case 'ontime-timer': {
          addToBatchUpdates('timer', payload);
          updateDevTools({ timer: payload });
          break;
        }
        case 'ontime-onAir': {
          addToBatchUpdates('onAir', payload);
          updateDevTools({ onAir: payload });
          break;
        }
        case 'ontime-message': {
          addToBatchUpdates('message', payload);
          updateDevTools({ message: payload });
          break;
        }
        case 'ontime-runtime': {
          addToBatchUpdates('runtime', payload);
          updateDevTools({ runtime: payload });
          break;
        }
        case 'ontime-eventNow': {
          addToBatchUpdates('eventNow', payload);
          updateDevTools({ eventNow: payload });
          break;
        }
        case 'ontime-currentBlock': {
          addToBatchUpdates('currentBlock', payload);
          updateDevTools({ currentBlock: payload });
          break;
        }
        case 'ontime-publicEventNow': {
          addToBatchUpdates('publicEventNow', payload);
          updateDevTools({ publicEventNow: payload });
          break;
        }
        case 'ontime-eventNext': {
          addToBatchUpdates('eventNext', payload);
          updateDevTools({ eventNext: payload });
          break;
        }
        case 'ontime-publicEventNext': {
          addToBatchUpdates('publicEventNext', payload);
          updateDevTools({ publicEventNext: payload });
          break;
        }
        case 'ontime-auxtimer1': {
          addToBatchUpdates('auxtimer1', payload);
          updateDevTools({ auxtimer1: payload });
          break;
        }
        case 'ontime-refetch': {
@@ -154,7 +205,7 @@ export const connectSocket = () => {
            invalidateAllCaches();
          } else if (target === 'RUNDOWN') {
            const { revision } = payload;
-            const currentRevision = ontimeQueryClient.getQueryData<Rundown>(RUNDOWN)?.revision ?? -1;
+            const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
            if (revision > currentRevision) {
              ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
              ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
@@ -164,8 +215,8 @@ export const connectSocket = () => {
          }
          break;
        }
-        default: {
+        case 'ontime-flush': {
-          console.log('unknown WS message', type);
+          flushBatchUpdates();
          break;
        }
      }
@@ -175,6 +226,11 @@ export const connectSocket = () => {
  };
 };
 export const disconnectSocket = () => {
  shouldReconnect = false;
  websocket?.close();
 };
 export const socketSend = (message: any) => {
  if (websocket && websocket.readyState === WebSocket.OPEN) {
    websocket.send(message);
@@ -35,7 +35,7 @@ function getFormatFromParams() {
 * Gets the format options from the applicaton settings
 * @returns a string equivalent to the format, ie: hh:mm:ss a or HH:mm:ss
 */
-function getFormatFromSettings(): TimeFormat {
+export function getFormatFromSettings(): TimeFormat {
  const settings: Settings | undefined = ontimeQueryClient.getQueryData(APP_SETTINGS);
  return settings?.timeFormat ?? '24';
 }
@@ -119,7 +119,7 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }
  if (!hideSeconds) {
-    const seconds = Math.ceil((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
+    const seconds = Math.floor((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
    if (seconds > 0) {
      result += `${seconds}s`;
    }
@@ -0,0 +1,11 @@
 import { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';
 import 'vitest';
 // ugly hack because vite and pnpm are not playing ball with jest
 // https://github.com/testing-library/jest-dom/issues/123
 declare global {
  namespace Vi {
    type Assertion<T = any> = TestingLibraryMatchers<T, void>;
  }
 }
@@ -49,7 +49,10 @@ function resolveUrl(protocol: 'http' | 'ws', path: string) {
  url.pathname = baseURI ? `${baseURI}/${path}` : path;
  // in development mode, we use the React port for UI, but need the requests to target the server
-  // this is done with a proxy in the vite config to avoid CORS issues in the dev environment
+  if (isDev) {
    // this is used as a fallback port for development
    url.port = '4001';
  }
  const result = url.toString();
@@ -29,8 +29,8 @@ export default function ReportSettings() {
  };
  const combinedReport = useMemo(() => {
-    return getCombinedReport(reportData, data.entries, data.order);
+    return getCombinedReport(reportData, data.rundown, data.order);
-  }, [reportData, data.entries, data.order]);
+  }, [reportData, data.rundown, data.order]);
  return (
    <Panel.Section>
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { CustomField, CustomFieldKey } from 'ontime-types';
+import { CustomField, CustomFieldLabel } from 'ontime-types';
 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
@@ -17,8 +17,8 @@ interface CustomFieldEntryProps {
  label: string;
  fieldKey: string;
  type: 'string' | 'image';
-  onEdit: (key: CustomFieldKey, patch: CustomField) => Promise<void>;
+  onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
-  onDelete: (key: CustomFieldKey) => Promise<void>;
+  onDelete: (label: CustomFieldLabel) => Promise<void>;
 }
 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { CustomField, CustomFieldKey } from 'ontime-types';
+import { CustomField, CustomFieldLabel } from 'ontime-types';
 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
 import Info from '../../../../../common/components/info/Info';
@@ -31,14 +31,14 @@ export default function CustomFields() {
    setIsAdding(false);
  };
-  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
+  const handleEditField = async (label: CustomFieldLabel, customField: CustomField) => {
-    await editCustomField(key, customField);
+    await editCustomField(label, customField);
    refetch();
  };
-  const handleDelete = async (key: CustomFieldKey) => {
+  const handleDelete = async (label: string) => {
    try {
-      await deleteCustomField(key);
+      await deleteCustomField(label);
      refetch();
    } catch (_error) {
      /** we do not handle errors here */
@@ -1,4 +1,4 @@
-import { EntryId, isOntimeEvent, MaybeNumber, OntimeReport, RundownEntries } from 'ontime-types';
+import { isOntimeEvent, MaybeNumber, NormalisedRundown, OntimeReport } from 'ontime-types';
 import { makeCSVFromArrayOfArrays } from '../../../../common/utils/csv';
 import { formatTime } from '../../../../common/utils/time';
@@ -16,7 +16,7 @@ export type CombinedReport = {
 /**
 * Creates a combined report with the rundown data
 */
-export function getCombinedReport(report: OntimeReport, rundown: RundownEntries, order: EntryId[]): CombinedReport[] {
+export function getCombinedReport(report: OntimeReport, rundown: NormalisedRundown, order: string[]): CombinedReport[] {
  if (Object.keys(report).length === 0) return [];
  if (order.length === 0) return [];
@@ -13,6 +13,10 @@ import * as Panel from '../../panel-utils/PanelUtils';
 import GeneralPinInput from './GeneralPinInput';
 export type GeneralPanelFormValues = {
  filename: string;
 };
 export default function GeneralPanelForm() {
  const { data, status, refetch } = useSettings();
  const {
@@ -8,5 +8,7 @@
 }
 .column {
  align-items: start;
  display: flex;
  flex-direction: column;
 }
@@ -123,7 +123,7 @@ export default function ViewSettingsForm() {
                onClick={onCodeEditorOpen}
                variant='ontime-subtle'
                size='sm'
-                isDisabled={isSubmitting}
+                isDisabled={!data.overrideStyles}
                width='fit-content'
              >
                Edit CSS override
@@ -102,6 +102,7 @@ export default function EditorSettingsForm() {
                onChange={(event) => setDefaultEndAction(event.target.value as EndAction)}
              >
                <option value={EndAction.None}>None</option>
                <option value={EndAction.Stop}>Stop</option>
                <option value={EndAction.LoadNext}>Load next</option>
                <option value={EndAction.PlayNext}>Play next</option>
              </Select>
@@ -6,7 +6,7 @@ export async function makeProjectPatch(data: DatabaseModel, mergeKeys: Record<st
  for (const key in mergeKeys) {
    if (isKeyOfType(key, data) && mergeKeys[key]) {
      // if the rundown is merged we also need the custom fields
-      if (key === 'rundowns') {
+      if (key === 'rundown') {
        patchObject.customFields = data['customFields'];
      }
      Object.assign(patchObject, { [key]: data[key] });
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Button } from '@chakra-ui/react';
-import { CustomFields, Rundown } from 'ontime-types';
+import { CustomFields, OntimeRundown } from 'ontime-types';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -9,7 +9,7 @@ import useGoogleSheet from './useGoogleSheet';
 import { useSheetStore } from './useSheetStore';
 interface ImportReviewProps {
-  rundown: Rundown;
+  rundown: OntimeRundown;
  customFields: CustomFields;
  onFinished: () => void;
  onCancel: () => void;
@@ -29,12 +29,7 @@ export default function ImportReview(props: ImportReviewProps) {
  const applyImport = async () => {
    setLoading(true);
-    await importRundown(
+    await importRundown(rundown, customFields);
      {
        [rundown.id]: rundown,
      },
      customFields,
    );
    setLoading(false);
    onFinished();
  };
@@ -1,9 +1,11 @@
 import { ImportCustom, ImportMap } from 'ontime-utils';
 import { baseURI } from '../../../../../externals';
 export type NamedImportMap = typeof namedImportMap;
 // Record of label and import name
-const namedImportMap = {
+export const namedImportMap = {
  Worksheet: 'event schedule',
  Start: 'time start',
  'Link start': 'link start',
@@ -64,11 +66,11 @@ export function convertToImportMap(namedImportMap: NamedImportMap): ImportMap {
 }
 export function persistImportMap(options: NamedImportMap) {
-  localStorage.setItem('ontime-import-options', JSON.stringify(options));
+  localStorage.setItem(`${baseURI}ontime-import-options`, JSON.stringify(options));
 }
 function getPersistImportMap(): unknown {
-  const options = localStorage.getItem('ontime-import-options');
+  const options = localStorage.getItem(`${baseURI}ontime-import-options`);
  if (!options) {
    throw new Error('no import options found');
  }
@@ -1,6 +1,6 @@
 import { Fragment } from 'react';
 import { IoLink } from 'react-icons/io5';
-import { CustomFields, isOntimeBlock, isOntimeEvent, Rundown } from 'ontime-types';
+import { CustomFields, isOntimeBlock, isOntimeEvent, OntimeRundown } from 'ontime-types';
 import { millisToString } from 'ontime-utils';
 import Tag from '../../../../../common/components/tag/Tag';
@@ -10,7 +10,7 @@ import * as Panel from '../../../panel-utils/PanelUtils';
 import style from './PreviewRundown.module.scss';
 interface PreviewRundownProps {
-  rundown: Rundown;
+  rundown: OntimeRundown;
  customFields: CustomFields;
 }
@@ -53,76 +53,75 @@ export default function PreviewRundown(props: PreviewRundownProps) {
        </tr>
      </thead>
      <tbody>
-        {rundown.order.map((entryId) => {
+        {rundown.map((event) => {
-          const entry = rundown.entries[entryId];
+          if (isOntimeBlock(event)) {
          if (isOntimeBlock(entry)) {
            return (
-              <tr key={entry.id}>
+              <tr key={event.id}>
                <td className={style.center}>
                  <Tag>-</Tag>
                </td>
                <td className={style.center}>
-                  <Tag>{entry.type}</Tag>
+                  <Tag>{event.type}</Tag>
                </td>
                <td />
-                <td colSpan={99}>{entry.title}</td>
+                <td colSpan={99}>{event.title}</td>
              </tr>
            );
          }
-          if (!isOntimeEvent(entry)) {
+          if (!isOntimeEvent(event)) {
            return null;
          }
          eventIndex += 1;
-          const colour = entry.colour ? getAccessibleColour(entry.colour) : {};
+          const colour = event.colour ? getAccessibleColour(event.colour) : {};
-          const countToEnd = booleanToText(entry.countToEnd);
+          const countToEnd = booleanToText(event.countToEnd);
-          const isPublic = booleanToText(entry.isPublic);
+          const isPublic = booleanToText(event.isPublic);
-          const skip = booleanToText(entry.skip);
+          const skip = booleanToText(event.skip);
          return (
-            <Fragment key={entry.id}>
+            <Fragment key={event.id}>
              <tr>
                <td className={style.center}>
                  <Tag>{eventIndex}</Tag>
                </td>
                <td className={style.center}>
-                  <Tag>{entry.type}</Tag>
+                  <Tag>{event.type}</Tag>
                </td>
-                <td className={style.nowrap}>{entry.cue}</td>
+                <td className={style.nowrap}>{event.cue}</td>
-                <td>{entry.title}</td>
+                <td>{event.title}</td>
                <td className={style.flex}>
-                  <span className={entry.linkStart ? style.subdued : undefined}>{millisToString(entry.timeStart)}</span>
+                  <span className={event.linkStart ? style.subdued : undefined}>{millisToString(event.timeStart)}</span>
-                  {entry.linkStart && <IoLink className={style.linkStartActive} />}
+                  {event.linkStart && <IoLink className={style.linkStartActive} />}
                </td>
-                <td>{millisToString(entry.timeEnd)}</td>
+                <td>{millisToString(event.timeEnd)}</td>
-                <td>{millisToString(entry.duration)}</td>
+                <td>{millisToString(event.duration)}</td>
-                <td>{millisToString(entry.timeWarning)}</td>
+                <td>{millisToString(event.timeWarning)}</td>
-                <td>{millisToString(entry.timeDanger)}</td>
+                <td>{millisToString(event.timeDanger)}</td>
                <td className={style.center}>{countToEnd && <Tag>{countToEnd}</Tag>}</td>
                <td className={style.center}>{isPublic && <Tag>{isPublic}</Tag>}</td>
                <td>{skip && <Tag>{skip}</Tag>}</td>
-                <td style={{ ...colour }}>{entry.colour}</td>
+                <td style={{ ...colour }}>{event.colour}</td>
                <td className={style.center}>
-                  <Tag>{entry.timerType}</Tag>
+                  <Tag>{event.timerType}</Tag>
                </td>
                <td className={style.center}>
-                  <Tag>{entry.endAction}</Tag>
+                  <Tag>{event.endAction}</Tag>
                </td>
-                {isOntimeEvent(entry) &&
+                {isOntimeEvent(event) &&
                  fieldKeys.map((field) => {
                    let value = '';
-                    if (field in entry.custom) {
+                    if (field in event.custom) {
-                      value = entry.custom[field];
+                      value = event.custom[field];
                    }
                    return <td key={field}>{value}</td>;
                  })}
                <td className={style.center}>
-                  <Tag>{entry.id}</Tag>
+                  <Tag>{event.id}</Tag>
                </td>
              </tr>
-              {entry.note && (
+              {event.note && (
                <tr>
                  <td colSpan={99} className={style.secondaryRow}>
-                    Note: {entry.note}
+                    Note: {event.note}
                  </td>
                </tr>
              )}
@@ -1,5 +1,5 @@
 import { useQueryClient } from '@tanstack/react-query';
-import { AuthenticationStatus, CustomFields, ProjectRundowns } from 'ontime-types';
+import { AuthenticationStatus, CustomFields, OntimeRundown } from 'ontime-types';
 import { ImportMap } from 'ontime-utils';
 import { CUSTOM_FIELDS, RUNDOWN } from '../../../../common/api/constants';
@@ -75,9 +75,9 @@ export default function useGoogleSheet() {
  };
  /** applies rundown and customFields to current project */
-  const importRundown = async (rundowns: ProjectRundowns, customFields: CustomFields) => {
+  const importRundown = async (rundown: OntimeRundown, customFields: CustomFields) => {
    try {
-      await patchData({ rundowns, customFields });
+      await patchData({ rundown, customFields });
      // we are unable to optimistically set the rundown since we need
      // it to be normalised
      await queryClient.invalidateQueries({
@@ -1,4 +1,4 @@
-import { AuthenticationStatus, CustomFields, Rundown } from 'ontime-types';
+import { AuthenticationStatus, CustomFields, OntimeRundown } from 'ontime-types';
 import { defaultImportMap, ImportMap } from 'ontime-utils';
 import { create } from 'zustand';
@@ -15,8 +15,8 @@ type SheetStore = {
  setAuthenticationStatus: (status: AuthenticationStatus) => void;
  // we get this from a preview response
-  rundown: Rundown | null;
+  rundown: OntimeRundown | null;
-  setRundown: (rundown: Rundown | null) => void;
+  setRundown: (rundown: OntimeRundown | null) => void;
  // we get this from a preview response
  customFields: CustomFields | null;
@@ -60,7 +60,7 @@ export const useSheetStore = create<SheetStore>((set, get) => ({
  setAuthenticationStatus: (status: AuthenticationStatus) => set({ authenticationStatus: status }),
-  setRundown: (rundown: Rundown | null) => set({ rundown }),
+  setRundown: (rundown: OntimeRundown | null) => set({ rundown }),
  setCustomFields: (customFields: CustomFields | null) => set({ customFields }),
@@ -2,10 +2,11 @@ import { IoAdd, IoRemove } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
 import { useLocalStorage } from '@mantine/hooks';
 import { Playback } from 'ontime-types';
-import { MILLIS_PER_HOUR, parseUserTime } from 'ontime-utils';
+import { MILLIS_PER_HOUR, MILLIS_PER_SECOND, parseUserTime } from 'ontime-utils';
 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
 import { setPlayback } from '../../../../common/hooks/useSocket';
 import { baseURI } from '../../../../externals';
 import { tooltipDelayMid } from '../../../../ontimeConfig';
 import TapButton from '../tap-button/TapButton';
@@ -17,29 +18,29 @@ interface AddTimeProps {
 export default function AddTime(props: AddTimeProps) {
  const { playback } = props;
-  const [timeInMs, setTime] = useLocalStorage({ key: 'add-time', defaultValue: 300_000 }); // 5 minutes
+  const [time, setTime] = useLocalStorage({ key: `${baseURI}add-time`, defaultValue: 300_000 }); // 5 minutes
  const handleTimeChange = (_field: string, value: string) => {
-    const newTimeInMs = parseUserTime(value);
+    const newTime = parseUserTime(value);
    // cap add time to 1 hour
-    setTime(Math.min(newTimeInMs, MILLIS_PER_HOUR));
+    setTime(Math.min(newTime, MILLIS_PER_HOUR));
  };
  const handleAddTime = (direction: 'add' | 'remove') => {
-    // API expects input in milliseconds
+    // API expects input in seconds
    if (direction === 'add') {
-      setPlayback.addTime(timeInMs);
+      setPlayback.addTime(time / MILLIS_PER_SECOND);
    } else {
-      setPlayback.addTime(-1 * timeInMs);
+      setPlayback.addTime((-1 * time) / MILLIS_PER_SECOND);
    }
  };
  const canAddTime = playback === Playback.Play || playback === Playback.Pause;
-  const doDisableButtons = !canAddTime || timeInMs === 0;
+  const doDisableButtons = !canAddTime || time === 0;
  return (
    <div className={style.addTime}>
-      <TimeInput name='addtime' submitHandler={handleTimeChange} time={timeInMs} placeholder='Add time' />
+      <TimeInput name='addtime' submitHandler={handleTimeChange} time={time} placeholder='Add time' />
      <div className={style.addButtons}>
        <Tooltip label='Remove time' openDelay={tooltipDelayMid} shouldWrapChildren>
          <TapButton onClick={() => handleAddTime('remove')} disabled={doDisableButtons} className={style.tallButtons}>
@@ -59,20 +59,15 @@ export function AuxTimer() {
 }
 function AuxTimerInput() {
-  const newTimeInMs = useAuxTimerTime();
+  const time = useAuxTimerTime();
  const { setDuration } = setAuxTimer;
  const handleTimeUpdate = (_field: string, value: string) => {
-    const newTimeInMs = parseUserTime(value);
+    const newTime = parseUserTime(value);
-    setDuration(newTimeInMs);
+    setDuration(newTime / 1000); // frontend api is seconds based
  };
  return (
-    <TimeInput<'auxTimer'>
+    <TimeInput<'auxTimer'> submitHandler={handleTimeUpdate} name='auxTimer' time={time} placeholder='Aux Timer 1' />
      submitHandler={handleTimeUpdate}
      name='auxTimer'
      time={newTimeInMs}
      placeholder='Aux Timer 1'
    />
  );
 }
@@ -10,6 +10,7 @@ import AppSettings from '../app-settings/AppSettings';
 import useAppSettingsNavigation from '../app-settings/useAppSettingsNavigation';
 import { EditorOverview } from '../overview/Overview';
 import Finder from './finder/Finder';
 import WelcomePlacement from './welcome/WelcomePlacement';
 import styles from './Editor.module.scss';
@@ -21,6 +22,7 @@ const MessageControl = lazy(() => import('../control/message/MessageControlExpor
 export default function Editor() {
  const { isOpen: isSettingsOpen, setLocation, close } = useAppSettingsNavigation();
  const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure();
  const { isOpen: isFinderOpen, onToggle: onFinderToggle, onClose: onFinderClose } = useDisclosure();
  useWindowTitle('Editor');
@@ -44,11 +46,16 @@ export default function Editor() {
    }
  }, [close, isSettingsOpen, setLocation]);
-  useHotkeys([['mod + ,', toggleSettings]]);
+  useHotkeys([
    ['mod + ,', toggleSettings],
    ['mod + f', onFinderToggle],
    ['Escape', onFinderClose],
  ]);
  return (
    <div className={styles.mainContainer} data-testid='event-editor'>
      <WelcomePlacement />
      <Finder isOpen={isFinderOpen} onClose={onFinderClose} />
      <NavigationMenu isOpen={isMenuOpen} onClose={onClose} />
      <EditorOverview>
        <IconButton
@@ -1,7 +1,7 @@
 import { KeyboardEvent, useState } from 'react';
 import { Input, Modal, ModalBody, ModalContent, ModalFooter, ModalOverlay } from '@chakra-ui/react';
 import { useDebouncedCallback } from '@mantine/hooks';
-import { SupportedEntry } from 'ontime-types';
+import { SupportedEvent } from 'ontime-types';
 import { useEventSelection } from '../../rundown/useEventSelection';
@@ -67,9 +67,9 @@ export default function Finder(props: FinderProps) {
            {results.length > 0 &&
              results.map((entry, index) => {
                const isSelected = selected === index;
-                const displayIndex = entry.type === SupportedEntry.Event ? entry.eventIndex : '-';
+                const displayIndex = entry.type === SupportedEvent.Event ? entry.eventIndex : '-';
-                const displayCue = entry.type === SupportedEntry.Event ? entry.cue : '';
+                const displayCue = entry.type === SupportedEvent.Event ? entry.cue : '';
-                const colour = entry.type === SupportedEntry.Event ? entry.colour : '';
+                const colour = entry.type === SupportedEvent.Event ? entry.colour : '';
                return (
                  <li
@@ -1,19 +1,19 @@
 import { ChangeEvent, useEffect, useRef, useState } from 'react';
-import { isOntimeBlock, isOntimeEvent, MaybeString, SupportedEntry } from 'ontime-types';
+import { isOntimeBlock, isOntimeEvent, MaybeString, SupportedEvent } from 'ontime-types';
 import { useFlatRundown } from '../../../common/hooks-query/useRundown';
 const maxResults = 12;
 type FilterableBlock = {
-  type: SupportedEntry.Block;
+  type: SupportedEvent.Block;
  id: string;
  index: number;
  title: string;
 };
 type FilterableEvent = {
-  type: SupportedEntry.Event;
+  type: SupportedEvent.Event;
  id: string;
  index: number;
  eventIndex: number;
@@ -59,7 +59,7 @@ export default function useFinder() {
      if (isOntimeEvent(event)) {
        if (eventIndex === searchIndex) {
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -93,7 +93,7 @@ export default function useFinder() {
        if (event.cue.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -126,7 +126,7 @@ export default function useFinder() {
        if (event.title.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Event,
+            type: SupportedEvent.Event,
            id: event.id,
            index: i,
            eventIndex,
@@ -141,7 +141,7 @@ export default function useFinder() {
        if (event.title.toLowerCase().includes(searchString)) {
          remaining--;
          results.push({
-            type: SupportedEntry.Block,
+            type: SupportedEvent.Block,
            id: event.id,
            index: i,
            title: event.title,
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { isOntimeEvent, OntimeEvent, SupportedEntry } from 'ontime-types';
+import { isOntimeEvent, OntimeEvent, SupportedEvent } from 'ontime-types';
 import { getFirstEventNormal, getLastEventNormal } from 'ontime-utils';
 import EmptyPage from '../../common/components/state/EmptyPage';
@@ -126,8 +126,8 @@ export default function Operator() {
  let isPast = Boolean(featureData.selectedEventId);
  const hidePast = isStringBoolean(searchParams.get('hidepast'));
-  const { firstEvent } = getFirstEventNormal(data.entries, data.order);
+  const { firstEvent } = getFirstEventNormal(data.rundown, data.order);
-  const { lastEvent } = getLastEventNormal(data.entries, data.order);
+  const { lastEvent } = getLastEventNormal(data.rundown, data.order);
  return (
    <div className={style.operatorContainer}>
@@ -152,7 +152,7 @@ export default function Operator() {
      <div className={style.operatorEvents} onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
        {data.order.map((eventId) => {
-          const entry = data.entries[eventId];
+          const entry = data.rundown[eventId];
          if (isOntimeEvent(entry)) {
            const isSelected = featureData.selectedEventId === entry.id;
            if (isSelected) {
@@ -197,7 +197,7 @@ export default function Operator() {
            );
          }
-          if (entry.type === SupportedEntry.Block) {
+          if (entry.type === SupportedEvent.Block) {
            return <OperatorBlock key={entry.id} title={entry.title} />;
          }
          return null;
@@ -2,7 +2,7 @@ import { useRef, useState } from 'react';
 import { Button, Textarea } from '@chakra-ui/react';
 import { OntimeEvent } from 'ontime-types';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import type { EditEvent } from '../Operator';
 import style from './EditModal.module.scss';
@@ -15,7 +15,7 @@ interface EditModalProps {
 export default function EditModal(props: EditModalProps) {
  const { event, onClose } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
  const [loading, setLoading] = useState(false);
  const inputRef = useRef<HTMLTextAreaElement[]>(new Array<HTMLTextAreaElement>());
@@ -36,7 +36,7 @@ export default function EditModal(props: EditModalProps) {
    });
    if (patchObject.custom) {
-      await updateEntry(patchObject);
+      await updateEvent(patchObject);
    }
    setLoading(false);
@@ -118,8 +118,7 @@
    padding-inline: 0.25rem;
    background-color: $gray-1250;
    color: $ui-white;
-    // allow multi-line text but trim before
+    white-space: pre;
    white-space: pre-line;
  }
 }
@@ -78,7 +78,7 @@ function OperatorEvent(props: OperatorEventProps) {
      <span className={style.mainField}>{main}</span>
      <span className={style.schedule}>
        <ClockTime value={timeStart} preferredFormat12='h:mm' preferredFormat24='HH:mm' />
-        →
+        -
        <ClockTime value={timeEnd} preferredFormat12='h:mm' preferredFormat24='HH:mm' />
      </span>
@@ -36,8 +36,8 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
        },
        {
          id: 'subscribe',
-          title: 'Highlight Fields',
+          title: 'Highlight Field',
-          description: 'Choose custom fields to highlight',
+          description: 'Choose a custom field to highlight',
          type: 'multi-option',
          values: customFieldSelect,
        },
@@ -1,11 +0,0 @@
 .empty {
  padding-block: 1.5rem;
  text-align: center;
 }
 .inline {
  display: flex;
  align-items: center;
  justify-content: center;
  gap: 2rem;
 }
@@ -7,6 +7,7 @@
  margin-top: 1rem;
  display: flex;
  flex-direction: column;
  padding-right: 4px; // size of scrollbar
  overflow-y: scroll;
  height: 100%;
 }
@@ -15,7 +16,6 @@
  overflow-x: clip;
  display: flex;
  flex-direction: column;
  padding-inline: 1rem;
 }
 .empty {
@@ -23,6 +23,15 @@
  align-self: center;
 }
 .alignCenter {
  text-align: center;
  flex-direction: column;
  .spaceTop {
    margin-top: 1.5rem;
  }
 }
 .spacer {
  min-height: 50vh;
 }
@@ -31,7 +40,6 @@
  display: flex;
  gap: 0.5rem;
  align-items: center;
  background-color: color-mix(in srgb, var(--user-bg, transparent) 10%, transparent 90%);
 }
 .entryIndex {
@@ -1,48 +1,36 @@
 import { Fragment, lazy, useCallback, useEffect, useRef, useState } from 'react';
 import { closestCenter, DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { arrayMove, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { useHotkeys } from '@mantine/hooks';
 import {
  closestCenter,
  DndContext,
  DragEndEvent,
  DragOverEvent,
  DragStartEvent,
  PointerSensor,
  useSensor,
  useSensors,
 } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { useHotkeys, useSessionStorage } from '@mantine/hooks';
 import {
  type EntryId,
  type MaybeString,
  type Rundown,
  isOntimeBlock,
  isOntimeEvent,
-  OntimeBlock,
+  isPlayableEvent,
-  OntimeEntry,
+  MaybeString,
  PlayableEvent,
  Playback,
-  SupportedEntry,
+  RundownCached,
  SupportedEvent,
 } from 'ontime-types';
 import {
  checkIsNextDay,
  getFirstNormal,
  getLastNormal,
  getNextBlockNormal,
  getNextNormal,
  getPreviousBlockNormal,
  getPreviousNormal,
-  reorderArray,
+  isNewLatest,
 } from 'ontime-utils';
-import { type EventOptions, useEntryActions } from '../../common/hooks/useEntryAction';
+import { type EventOptions, useEventAction } from '../../common/hooks/useEventAction';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useRundownEditor } from '../../common/hooks/useSocket';
 import { AppMode, useAppMode } from '../../common/stores/appModeStore';
 import { useEntryCopy } from '../../common/stores/entryCopyStore';
-import { cloneEvent } from '../../common/utils/clone';
+import { cloneEvent } from '../../common/utils/eventsManager';
 import BlockBlock from './block-block/BlockBlock';
 import BlockEnd from './block-block/BlockEnd';
 import QuickAddBlock from './quick-add-block/QuickAddBlock';
 import { makeRundownMetadata, makeSortableList, moveDown, moveUp } from './rundown.utils';
 import RundownEmpty from './RundownEmpty';
 import { useEventSelection } from './useEventSelection';
@@ -51,21 +39,15 @@ import style from './Rundown.module.scss';
 const RundownEntry = lazy(() => import('./RundownEntry'));
 interface RundownProps {
-  data: Rundown;
+  data: RundownCached;
 }
 export default function Rundown({ data }: RundownProps) {
-  const { order, entries, id } = data;
+  const { order, rundown } = data;
-  // we create a copy of the rundown with a data structured aligned with what dnd-kit needs
+  const [statefulEntries, setStatefulEntries] = useState(order);
  const featureData = useRundownEditor();
  const [sortableData, setSortableData] = useState<EntryId[]>(() => makeSortableList(order, entries));
  const [collapsedGroups, setCollapsedGroups] = useSessionStorage<EntryId[]>({
    // we ensure that this is unique to the rundown
    key: `rundown.${id}-editor-collapsed-groups`,
    defaultValue: [],
  });
-  const { addEntry, reorderEntry, deleteEntry } = useEntryActions();
+  const featureData = useRundownEditor();
  const { addEvent, reorderEvent, deleteEvent } = useEventAction();
  const { entryCopyId, setEntryCopyId } = useEntryCopy();
@@ -78,39 +60,39 @@ export default function Rundown({ data }: RundownProps) {
  useFollowComponent({ followRef: cursorRef, scrollRef, doFollow: appMode === AppMode.Run });
  // DND KIT
-  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 10 } }));
+  const sensors = useSensors(useSensor(PointerSensor));
  const deleteAtCursor = useCallback(
    (cursor: string | null) => {
      if (!cursor) return;
-      const { entry, index } = getPreviousNormal(entries, order, cursor);
+      const { entry, index } = getPreviousNormal(rundown, order, cursor);
-      deleteEntry([cursor]);
+      deleteEvent([cursor]);
      if (entry && index !== null) {
        setSelectedEvents({ id: entry.id, selectMode: 'click', index });
      }
    },
-    [entries, order, deleteEntry, setSelectedEvents],
+    [rundown, order, deleteEvent, setSelectedEvents],
  );
  const insertCopyAtId = useCallback(
    (atId: string | null, copyId: string | null, above = false) => {
-      const adjustedCursor = above ? getPreviousNormal(entries, order, atId ?? '').entry?.id ?? null : atId;
+      const adjustedCursor = above ? getPreviousNormal(rundown, order, atId ?? '').entry?.id ?? null : atId;
      if (copyId === null) {
        // we cant clone without selection
        return;
      }
-      const cloneEntry = entries[copyId];
+      const cloneEntry = rundown[copyId];
-      if (cloneEntry?.type === SupportedEntry.Event) {
+      if (cloneEntry?.type === SupportedEvent.Event) {
        //if we don't have a cursor add the new event on top
        const newEvent = cloneEvent(cloneEntry);
-        addEntry(newEvent, { after: adjustedCursor ?? undefined });
+        addEvent(newEvent, { after: adjustedCursor ?? undefined });
      }
    },
-    [addEntry, order, entries],
+    [addEvent, order, rundown],
  );
  const insertAtId = useCallback(
-    (patch: Partial<OntimeEntry> & { type: SupportedEntry }, id: MaybeString, above = false) => {
+    (type: SupportedEvent, id: MaybeString, above = false) => {
      const options: EventOptions =
        id === null
          ? {}
@@ -119,12 +101,19 @@ export default function Rundown({ data }: RundownProps) {
              before: above ? id : undefined,
            };
-      if (!above && id) {
+      if (type === SupportedEvent.Event) {
-        options.lastEventId = id;
+        const newEvent = {
          type: SupportedEvent.Event,
        };
        if (!above && id) {
          options.lastEventId = id;
        }
        addEvent(newEvent, options);
      } else {
        addEvent({ type }, options);
      }
      addEntry(patch, options);
    },
-    [addEntry],
+    [addEvent],
  );
  const selectBlock = useCallback(
@@ -135,7 +124,7 @@ export default function Rundown({ data }: RundownProps) {
      let newCursor = cursor;
      if (cursor === null) {
        // there is no cursor, we select the first or last depending on direction
-        const selected = direction === 'up' ? getLastNormal(entries, order) : getFirstNormal(entries, order);
+        const selected = direction === 'up' ? getLastNormal(rundown, order) : getFirstNormal(rundown, order);
        if (isOntimeBlock(selected)) {
          setSelectedEvents({ id: selected.id, selectMode: 'click', index: direction === 'up' ? order.length : 0 });
@@ -151,14 +140,14 @@ export default function Rundown({ data }: RundownProps) {
      // otherwise we select the next or previous
      const selected =
        direction === 'up'
-          ? getPreviousBlockNormal(entries, order, newCursor)
+          ? getPreviousBlockNormal(rundown, order, newCursor)
-          : getNextBlockNormal(entries, order, newCursor);
+          : getNextBlockNormal(rundown, order, newCursor);
      if (selected.entry !== null && selected.index !== null) {
        setSelectedEvents({ id: selected.entry.id, selectMode: 'click', index: selected.index });
      }
    },
-    [order, entries, setSelectedEvents],
+    [order, rundown, setSelectedEvents],
  );
  const selectEntry = useCallback(
@@ -169,7 +158,7 @@ export default function Rundown({ data }: RundownProps) {
      if (cursor === null) {
        // there is no cursor, we select the first or last depending on direction if it exists
-        const selected = direction === 'up' ? getLastNormal(entries, order) : getFirstNormal(entries, order);
+        const selected = direction === 'up' ? getLastNormal(rundown, order) : getFirstNormal(rundown, order);
        if (selected !== null) {
          setSelectedEvents({ id: selected.id, selectMode: 'click', index: direction === 'up' ? order.length : 0 });
        }
@@ -178,36 +167,29 @@ export default function Rundown({ data }: RundownProps) {
      // otherwise we select the next or previous
      const selected =
-        direction === 'up' ? getPreviousNormal(entries, order, cursor) : getNextNormal(entries, order, cursor);
+        direction === 'up' ? getPreviousNormal(rundown, order, cursor) : getNextNormal(rundown, order, cursor);
      if (selected.entry !== null && selected.index !== null) {
        setSelectedEvents({ id: selected.entry.id, selectMode: 'click', index: selected.index });
      }
    },
-    [order, entries, setSelectedEvents],
+    [order, rundown, setSelectedEvents],
  );
  const moveEntry = useCallback(
-    (cursor: EntryId | null, direction: 'up' | 'down') => {
+    (cursor: string | null, direction: 'up' | 'down') => {
-      if (sortableData.length < 2 || cursor == null) {
+      if (order.length < 2 || cursor == null) {
        return;
      }
      const { index } =
        direction === 'up' ? getPreviousNormal(rundown, order, cursor) : getNextNormal(rundown, order, cursor);
-      const { destinationId, order, isBlock } =
+      if (index !== null) {
-        direction === 'up' ? moveUp(cursor, sortableData, entries) : moveDown(cursor, sortableData, entries);
+        const offsetIndex = direction === 'up' ? index + 1 : index - 1;
-
+        reorderEvent(cursor, offsetIndex, index);
      if (!destinationId) {
        return;
      }
      // if we are moving into a block, we need to make sure it is expanded
      if (isBlock) {
        handleCollapseGroup(false, destinationId);
      }
      reorderEntry(cursor, destinationId, order as 'before' | 'after' | 'insert');
    },
-    [sortableData, reorderEntry],
+    [order, reorderEvent, rundown],
  );
  // shortcuts
@@ -225,14 +207,14 @@ export default function Rundown({ data }: RundownProps) {
    ['mod + Backspace', () => deleteAtCursor(cursor), { preventDefault: true }],
-    ['alt + E', () => insertAtId({ type: SupportedEntry.Event }, cursor), { preventDefault: true }],
+    ['alt + E', () => insertAtId(SupportedEvent.Event, cursor), { preventDefault: true }],
-    ['alt + shift + E', () => insertAtId({ type: SupportedEntry.Event }, cursor, true), { preventDefault: true }],
+    ['alt + shift + E', () => insertAtId(SupportedEvent.Event, cursor, true), { preventDefault: true }],
-    ['alt + B', () => insertAtId({ type: SupportedEntry.Block }, cursor), { preventDefault: true }],
+    ['alt + B', () => insertAtId(SupportedEvent.Block, cursor), { preventDefault: true }],
-    ['alt + shift + B', () => insertAtId({ type: SupportedEntry.Block }, cursor, true), { preventDefault: true }],
+    ['alt + shift + B', () => insertAtId(SupportedEvent.Block, cursor, true), { preventDefault: true }],
-    ['alt + D', () => insertAtId({ type: SupportedEntry.Delay }, cursor), { preventDefault: true }],
+    ['alt + D', () => insertAtId(SupportedEvent.Delay, cursor), { preventDefault: true }],
-    ['alt + shift + D', () => insertAtId({ type: SupportedEntry.Delay }, cursor, true), { preventDefault: true }],
+    ['alt + shift + D', () => insertAtId(SupportedEvent.Delay, cursor, true), { preventDefault: true }],
    ['mod + C', () => setEntryCopyId(cursor)],
    ['mod + V', () => insertCopyAtId(cursor, entryCopyId)],
@@ -244,11 +226,11 @@ export default function Rundown({ data }: RundownProps) {
  // we copy the state from the store here
  // to workaround async updates on the drag mutations
  useEffect(() => {
-    setSortableData(makeSortableList(order, entries));
+    setStatefulEntries(order);
-  }, [order, entries]);
+  }, [order]);
  // in run mode, we follow selection
  useEffect(() => {
    // in run mode, we follow selection
    if (appMode !== AppMode.Run || !featureData?.selectedEventId) {
      return;
    }
@@ -256,235 +238,111 @@ export default function Rundown({ data }: RundownProps) {
    setSelectedEvents({ id: featureData.selectedEventId, selectMode: 'click', index });
  }, [appMode, featureData.selectedEventId, order, setSelectedEvents]);
  /**
   * Checks whether a block is collapsed
   */
  const getIsCollapsed = useCallback(
    (blockId: EntryId): boolean => {
      return Boolean(collapsedGroups.find((id) => id === blockId));
    },
    [collapsedGroups],
  );
  /**
   * Handles logic for collapsing groups
   */
  const handleCollapseGroup = useCallback(
    (collapsed: boolean, groupId: EntryId) => {
      setCollapsedGroups((prev) => {
        const isCollapsed = getIsCollapsed(groupId);
        if (collapsed && !isCollapsed) {
          const newSet = new Set(prev).add(groupId);
          return [...newSet];
        }
        if (!collapsed && isCollapsed) {
          return [...prev].filter((id) => id !== groupId);
        }
        return prev;
      });
    },
    [getIsCollapsed, setCollapsedGroups],
  );
  /**
   * On drag end, we reorder the events
   */
  const handleOnDragEnd = (event: DragEndEvent) => {
    const { active, over } = event;
-    if (!over?.id || active.id === over.id) {
+    if (over?.id) {
-      return;
+      if (active.id !== over?.id) {
-    }
+        const fromIndex = active.data.current?.sortable.index;
-
+        const toIndex = over.data.current?.sortable.index;
-    const fromIndex = active.data.current?.sortable.index;
+        // ugly hack to handle inconsistencies between dnd-kit and async store updates
-    const toIndex = over.data.current?.sortable.index;
+        setStatefulEntries((currentEntries) => {
-
+          return arrayMove(currentEntries, fromIndex, toIndex);
-    // we keep a copy of the state as a hack to handle inconsistencies between dnd-kit and async store updates
+        });
-    setSortableData((currentEntries) => {
+        reorderEvent(String(active.id), fromIndex, toIndex);
-      return reorderArray(currentEntries, fromIndex, toIndex);
+      }
    });
    let destinationId = over.id as EntryId;
    let order: 'before' | 'after' | 'insert' = fromIndex < toIndex ? 'after' : 'before';
    /**
     * We need to specially handle the end blocks
     * Dragging before and end block will add the entry to the end of the block
     * Dragging after an end block will add the event after the block itself
     */
    if (destinationId.startsWith('end-')) {
      destinationId = destinationId.replace('end-', '');
      // if we are moving before the end, we use the insert operation
      order = 'insert';
    }
    reorderEntry(active.id as EntryId, destinationId, order);
  };
  /**
   * When we drag a block, we force collapse it
   * This avoids strange scenarios like dropping a block inside itself
   */
  const collapseDraggedBlocks = (event: DragStartEvent) => {
    const isBlock = event.active.data.current?.type === 'block';
    if (isBlock) {
      handleCollapseGroup(true, event.active.id as EntryId);
    }
  };
-  /**
+  if (statefulEntries.length < 1) {
-   * When we drag over a block, we expand it if it is collapsed
+    return <RundownEmpty handleAddNew={() => insertAtId(SupportedEvent.Event, cursor)} />;
   */
  const expandOverBlock = (event: DragOverEvent) => {
    // if we are dragging a block, the drop operation is invalid so we dont expand
    if (event.active.data.current?.type === 'block') {
      return;
    }
    if (event.over?.data.current?.type !== 'block') {
      return;
    }
    const blockId = event.over?.id as EntryId;
    const isCollapsed = getIsCollapsed(blockId);
    if (isCollapsed) {
      handleCollapseGroup(false, blockId);
    }
  };
  if (sortableData.length < 1) {
    return <RundownEmpty handleAddNew={(type: SupportedEntry) => addEntry({ type })} />;
  }
-  // 1. gather presentation options
+  // last event is used to calculate relative timings
  let lastEvent: PlayableEvent | undefined; // used by indicators
  let thisEvent: PlayableEvent | undefined;
  // previous entry is used to infer position in the rundown for new events
  let previousEntryId: string | undefined;
  let thisId = previousEntryId;
  let eventIndex = 0;
  // all events before the current selected are in the past
  let isPast = Boolean(featureData?.selectedEventId);
  let isNextDay = false;
  let totalGap = 0;
  const isEditMode = appMode === AppMode.Edit;
-
+  let isLinkedToLoaded = true; //check if the event can link all the way back to the currently playing event
  // 2. initialise rundown metadata
  const { metadata, process } = makeRundownMetadata(featureData?.selectedEventId);
  // keep a single reference to the metadata which we override for every entry
  let rundownMetadata = metadata;
  return (
    <div className={style.rundownContainer} ref={scrollRef} data-testid='rundown'>
-      <DndContext
+      <DndContext onDragEnd={handleOnDragEnd} sensors={sensors} collisionDetection={closestCenter}>
-        onDragEnd={handleOnDragEnd}
+        <SortableContext items={statefulEntries} strategy={verticalListSortingStrategy}>
        onDragStart={collapseDraggedBlocks}
        onDragOver={expandOverBlock}
        sensors={sensors}
        collisionDetection={closestCenter}
      >
        <SortableContext items={sortableData} strategy={verticalListSortingStrategy}>
          <div className={style.list}>
-            {sortableData.map((entryId, index) => {
+            {statefulEntries.map((entryId, index) => {
-              const isFirst = index === 0;
+              // we iterate through a stateful copy of order to make the operations smoother
              const isLast = index === sortableData.length - 1;
              // the entry might be a pseudo block-end which does not generate metadata and should not be processed
              if (entryId.startsWith('end-')) {
                const parentId = entryId.split('end-')[1];
                const isBlockCollapsed = getIsCollapsed(parentId);
                if (isBlockCollapsed && isEditMode && isLast) {
                  return <QuickAddBlock key={entryId} previousEventId={parentId} parentBlock={null} />;
                } else if (isBlockCollapsed) {
                  return null;
                } else {
                  const parentColour = (entries[parentId] as OntimeBlock | undefined)?.colour;
                  // if the previous element is selected, it will have its own QuickAddBlock
                  // we use thisId instead of previousEntryId because the block end does not process
                  // and it does not cause the reassignment of the iteration id to the previous entry
                  const showPrependingQuickAdd = isEditMode && cursor !== rundownMetadata.thisId;
                  return (
                    <Fragment key={entryId}>
                      {showPrependingQuickAdd && (
                        <QuickAddBlock
                          previousEventId={rundownMetadata.thisId}
                          parentBlock={parentId}
                          backgroundColor={parentColour}
                        />
                      )}
                      <BlockEnd key={entryId} id={entryId} colour={parentColour} />
                      {isEditMode && isLast && <QuickAddBlock previousEventId={parentId} parentBlock={null} />}
                    </Fragment>
                  );
                }
              }
              // we iterate through a stateful copy of order to make the dnd operations smoother
              // this means that this can be out of sync with order until the useEffect runs
              // instead of writing all the logic guards, we simply short circuit rendering here
-              const entry = entries[entryId];
+              const entry = rundown[entryId];
-              if (!entry) return null;
+              if (!entry) {
              rundownMetadata = process(entry);
              // if the entry has a parent, and it is collapsed, render nothing
              if (
                entry.type !== SupportedEntry.Block &&
                rundownMetadata.groupId !== null &&
                getIsCollapsed(rundownMetadata.groupId)
              ) {
                return null;
              }
              if (index === 0) {
                eventIndex = 0;
              }
              isNextDay = false;
              previousEntryId = thisId;
              thisId = entryId;
              if (isOntimeEvent(entry)) {
                // event indexes are 1 based in frontend
                eventIndex++;
                lastEvent = thisEvent;
                if (isPlayableEvent(entry)) {
                  isNextDay = checkIsNextDay(entry, lastEvent);
                  if (!isPast) {
                    totalGap += entry.gap;
                    // We also include countToEnd in this test as the behavior of a linked event coming after a countToEnd is simelar to an unlinked event
                    isLinkedToLoaded = isLinkedToLoaded && entry.linkStart !== null && !lastEvent?.countToEnd;
                  }
                  if (isNewLatest(entry, lastEvent)) {
                    // populate previous entry
                    thisEvent = entry;
                  }
                }
              }
              const isFirst = index === 0;
              const isLast = index === order.length - 1;
              const isLoaded = featureData?.selectedEventId === entry.id;
              const isNext = featureData?.nextEventId === entry.id;
              const hasCursor = entry.id === cursor;
-
+              if (isLoaded) {
-              /**
+                isPast = false;
-               * Outside a block, the value will be undefined
+              }
               * If the colour is empty string ''
               * ie: we are inside a block, but there is no defined colour
               * we default to $gray-1050 #303030
               */
              const blockColour = rundownMetadata.groupColour === '' ? '#303030' : rundownMetadata.groupColour;
              return (
                <Fragment key={entry.id}>
-                  {isEditMode && (hasCursor || isFirst) && (
+                  {isEditMode && (hasCursor || isFirst) && <QuickAddBlock previousEventId={previousEntryId} />}
-                    <QuickAddBlock
+                  <div className={style.entryWrapper} data-testid={`entry-${eventIndex}`}>
-                      previousEventId={rundownMetadata.previousEntryId}
+                    {isOntimeEvent(entry) && <div className={style.entryIndex}>{eventIndex}</div>}
-                      parentBlock={isFirst ? null : rundownMetadata.groupId}
+                    <div className={style.entry} key={entry.id} ref={hasCursor ? cursorRef : undefined}>
-                      backgroundColor={isFirst ? undefined : blockColour}
+                      <RundownEntry
-                    />
+                        type={entry.type}
-                  )}
+                        isPast={isPast}
-                  {isOntimeBlock(entry) ? (
+                        eventIndex={eventIndex}
-                    <BlockBlock
+                        data={entry}
-                      data={entry}
+                        loaded={isLoaded}
-                      hasCursor={hasCursor}
+                        hasCursor={hasCursor}
-                      collapsed={getIsCollapsed(entry.id)}
+                        isNext={isNext}
-                      onCollapse={handleCollapseGroup}
+                        previousEntryId={previousEntryId}
-                    />
+                        previousEventId={lastEvent?.id}
-                  ) : (
+                        playback={isLoaded ? featureData.playback : undefined}
-                    <div
+                        isRolling={featureData.playback === Playback.Roll}
-                      className={style.entryWrapper}
+                        isNextDay={isNextDay}
-                      data-testid={`entry-${rundownMetadata.eventIndex}`}
+                        totalGap={totalGap}
-                      style={blockColour ? { '--user-bg': blockColour } : {}}
+                        isLinkedToLoaded={isLinkedToLoaded}
-                    >
+                      />
                      {isOntimeEvent(entry) && <div className={style.entryIndex}>{rundownMetadata.eventIndex}</div>}
                      <div className={style.entry} key={entry.id} ref={hasCursor ? cursorRef : undefined}>
                        <RundownEntry
                          type={entry.type}
                          isPast={rundownMetadata.isPast}
                          eventIndex={rundownMetadata.eventIndex}
                          data={entry}
                          loaded={rundownMetadata.isLoaded}
                          hasCursor={hasCursor}
                          isNext={isNext}
                          previousEntryId={rundownMetadata.previousEntryId}
                          previousEventId={rundownMetadata.previousEvent?.id}
                          playback={rundownMetadata.isLoaded ? featureData.playback : undefined}
                          isRolling={featureData.playback === Playback.Roll}
                          isNextDay={rundownMetadata.isNextDay}
                          totalGap={rundownMetadata.totalGap}
                          isLinkedToLoaded={rundownMetadata.isLinkedToLoaded}
                        />
                      </div>
                    </div>
-                  )}
+                  </div>
-                  {isEditMode && (hasCursor || isLast) && (
+                  {isEditMode && (hasCursor || isLast) && <QuickAddBlock previousEventId={entry.id} />}
                    <QuickAddBlock
                      previousEventId={entry.id}
                      parentBlock={rundownMetadata.groupId}
                      backgroundColor={blockColour}
                    />
                  )}
                </Fragment>
              );
            })}
@@ -1,30 +1,23 @@
 import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
 import { SupportedEntry } from 'ontime-types';
 import Empty from '../../common/components/state/Empty';
-import style from './Empty.module.scss';
+import style from './Rundown.module.scss';
 interface RundownEmptyProps {
-  handleAddNew: (type: SupportedEntry) => void;
+  handleAddNew: () => void;
 }
 export default function RundownEmpty(props: RundownEmptyProps) {
  const { handleAddNew } = props;
  return (
-    <div className={style.empty}>
+    <div className={style.alignCenter}>
-      <Empty style={{ marginTop: '5vh', marginBottom: '3rem' }} />
+      <Empty style={{ marginTop: '7vh' }} />
-      <div className={style.inline}>
+      <Button onClick={handleAddNew} variant='ontime-filled' className={style.spaceTop} leftIcon={<IoAdd />}>
-        <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='ontime-filled' leftIcon={<IoAdd />}>
+        Create Event
-          Create Event
+      </Button>
        </Button>
        <Button onClick={() => handleAddNew(SupportedEntry.Block)} variant='ontime-filled' leftIcon={<IoAdd />}>
          Create Block
        </Button>
      </div>
    </div>
  );
 }
@@ -1,46 +1,40 @@
 import { useCallback } from 'react';
-import {
+import { OntimeEvent, OntimeRundownEntry, Playback, SupportedEvent } from 'ontime-types';
  isOntimeDelay,
  isOntimeEvent,
  MaybeString,
  OntimeEntry,
  OntimeEvent,
  Playback,
  SupportedEntry,
 } from 'ontime-types';
-import { useEntryActions } from '../../common/hooks/useEntryAction';
+import { useEventAction } from '../../common/hooks/useEventAction';
 import useMemoisedFn from '../../common/hooks/useMemoisedFn';
 import { useEmitLog } from '../../common/stores/logger';
-import { cloneEvent } from '../../common/utils/clone';
+import { cloneEvent } from '../../common/utils/eventsManager';
 import BlockBlock from './block-block/BlockBlock';
 import DelayBlock from './delay-block/DelayBlock';
 import EventBlock from './event-block/EventBlock';
 import { useEventSelection } from './useEventSelection';
 export type EventItemActions =
  | 'set-cursor'
  | 'event'
  | 'event-before'
  | 'delay'
  | 'delay-before'
  | 'block'
  | 'block-before'
  | 'swap'
  | 'delete'
  | 'clone'
-  | 'group'
+  | 'update'
-  | 'update';
+  | 'swap'
  | 'clear-report';
 interface RundownEntryProps {
-  type: SupportedEntry;
+  type: SupportedEvent;
  isPast: boolean;
-  data: OntimeEntry;
+  data: OntimeRundownEntry;
  loaded: boolean;
  eventIndex: number;
  hasCursor: boolean;
  isNext: boolean;
  isNextDay: boolean;
-  previousEntryId: MaybeString;
+  previousEntryId?: string;
  previousEventId?: string;
  playback?: Playback; // we only care about this if this event is playing
  isRolling: boolean; // we need to know even if not related to this event
@@ -65,7 +59,7 @@ export default function RundownEntry(props: RundownEntryProps) {
    isLinkedToLoaded,
  } = props;
  const { emitError } = useEmitLog();
-  const { addEntry, updateEntry, batchUpdateEvents, deleteEntry, groupEntries, swapEvents } = useEntryActions();
+  const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
  const { selectedEvents, unselect, clearSelectedEvents } = useEventSelection();
  const removeOpenEvent = useCallback(() => {
@@ -85,31 +79,31 @@ export default function RundownEntry(props: RundownEntryProps) {
  const actionHandler = useMemoisedFn((action: EventItemActions, payload?: number | FieldValue) => {
    switch (action) {
      case 'event': {
-        const newEvent = { type: SupportedEntry.Event };
+        const newEvent = { type: SupportedEvent.Event };
        const options = {
          after: data.id,
          lastEventId: previousEventId,
        };
-        return addEntry(newEvent, options);
+        return addEvent(newEvent, options);
      }
      case 'event-before': {
-        const newEvent = { type: SupportedEntry.Event };
+        const newEvent = { type: SupportedEvent.Event };
        const options = {
          after: previousEntryId,
        };
-        return addEntry(newEvent, options);
+        return addEvent(newEvent, options);
      }
      case 'delay': {
-        return addEntry({ type: SupportedEntry.Delay }, { after: data.id });
+        return addEvent({ type: SupportedEvent.Delay }, { after: data.id });
      }
      case 'delay-before': {
-        return addEntry({ type: SupportedEntry.Delay }, { after: previousEntryId });
+        return addEvent({ type: SupportedEvent.Delay }, { after: previousEntryId });
      }
      case 'block': {
-        return addEntry({ type: SupportedEntry.Block }, { after: data.id });
+        return addEvent({ type: SupportedEvent.Block }, { after: data.id });
      }
      case 'block-before': {
-        return addEntry({ type: SupportedEntry.Block }, { after: previousEntryId });
+        return addEvent({ type: SupportedEvent.Block }, { after: previousEntryId });
      }
      case 'swap': {
        const { value } = payload as FieldValue;
@@ -118,21 +112,14 @@ export default function RundownEntry(props: RundownEntryProps) {
      case 'delete': {
        if (selectedEvents.size > 1) {
          clearMultiSelection();
-          return deleteEntry(Array.from(selectedEvents));
+          return deleteEvent(Array.from(selectedEvents));
        }
        removeOpenEvent();
-        return deleteEntry([data.id]);
+        return deleteEvent([data.id]);
      }
      case 'clone': {
        const newEvent = cloneEvent(data as OntimeEvent);
-        addEntry(newEvent, { after: data.id });
+        addEvent(newEvent, { after: data.id });
        break;
      }
      case 'group': {
        if (selectedEvents.size > 1) {
          clearMultiSelection();
          return groupEntries(Array.from(selectedEvents));
        }
        break;
      }
      case 'update': {
@@ -153,7 +140,7 @@ export default function RundownEntry(props: RundownEntryProps) {
        if (field in data) {
          // @ts-expect-error -- not sure how to type this
          newData[field] = value;
-          return updateEntry(newData);
+          return updateEvent(newData);
        }
        return emitError(`Unknown field: ${field}`);
@@ -163,7 +150,7 @@ export default function RundownEntry(props: RundownEntryProps) {
    }
  });
-  if (isOntimeEvent(data)) {
+  if (data.type === SupportedEvent.Event) {
    return (
      <EventBlock
        eventId={data.id}
@@ -180,12 +167,11 @@ export default function RundownEntry(props: RundownEntryProps) {
        timerType={data.timerType}
        title={data.title}
        note={data.note}
-        delay={data.delay}
+        delay={data.delay ?? 0}
        colour={data.colour}
        isPast={isPast}
        isNext={isNext}
        skip={data.skip}
        parent={data.parent}
        loaded={loaded}
        hasCursor={hasCursor}
        playback={playback}
@@ -198,7 +184,9 @@ export default function RundownEntry(props: RundownEntryProps) {
        actionHandler={actionHandler}
      />
    );
-  } else if (isOntimeDelay(data)) {
+  } else if (data.type === SupportedEvent.Block) {
    return <BlockBlock data={data} hasCursor={hasCursor} onDelete={() => actionHandler('delete')} />;
  } else if (data.type === SupportedEvent.Delay) {
    return <DelayBlock data={data} hasCursor={hasCursor} />;
  }
  return null;
@@ -25,7 +25,7 @@
 .list {
  @include editor.panel;
  height: inherit;
-  padding-inline: 0;
+  padding-left: 0;
  box-shadow: $box-shadow-right;
  flex: 1 2 auto; /* flex-grow: 1, flex-shrink: 2, flex-basis: auto */
@@ -8,14 +8,11 @@ import { cx } from '../../common/utils/styleUtils';
 import { Corner } from '../editors/editor-utils/EditorUtils';
 import RundownEventEditor from './event-editor/RundownEventEditor';
 import FinderPlacement from './placements/FinderPlacement';
 import RundownWrapper from './RundownWrapper';
 import style from './RundownExport.module.scss';
-export default memo(RundownExport);
+const RundownExport = () => {
 function RundownExport() {
  const isExtracted = window.location.pathname.includes('/rundown');
  const appMode = useAppMode((state) => state.mode);
  const hideSideBar = isExtracted && appMode === 'run';
@@ -24,7 +21,6 @@ function RundownExport() {
  return (
    <div className={classes} data-testid='panel-rundown'>
      <FinderPlacement />
      <div className={style.rundown}>
        <div className={style.list}>
          <ErrorBoundary>
@@ -44,4 +40,6 @@ function RundownExport() {
      </div>
    </div>
  );
-}
+};
 export default memo(RundownExport);
@@ -1,399 +0,0 @@
 import { EntryId, OntimeBlock, OntimeDelay, OntimeEvent, RundownEntries, SupportedEntry } from 'ontime-types';
 import { makeRundownMetadata, makeSortableList, moveDown, moveUp } from '../rundown.utils';
 describe('makeRundownMetadata()', () => {
  it('processes nested rundown data', () => {
    const selectedEventId = '12';
    const demoEvents = {
      '1': {
        id: '1',
        type: SupportedEntry.Event,
        parent: null,
        timeStart: 0,
        timeEnd: 1,
        duration: 1,
        dayOffset: 0,
        gap: 0,
        skip: false,
        linkStart: false,
      } as OntimeEvent,
      block: {
        id: 'block',
        type: SupportedEntry.Block,
        events: ['11', 'delay', '12', '13'],
        colour: 'red',
      } as OntimeBlock,
      '11': {
        id: '11',
        type: SupportedEntry.Event,
        parent: 'block',
        timeStart: 10,
        timeEnd: 11,
        duration: 1,
        dayOffset: 0,
        gap: 10,
        skip: false,
        linkStart: false,
      } as OntimeEvent,
      delay: {
        id: 'delay',
        type: SupportedEntry.Delay,
        parent: 'block',
        duration: 0,
      } as OntimeDelay,
      '12': {
        id: '12',
        type: SupportedEntry.Event,
        parent: 'block',
        timeStart: 11,
        timeEnd: 12,
        duration: 1,
        dayOffset: 0,
        gap: 0,
        skip: false,
        linkStart: true,
      } as OntimeEvent,
      '13': {
        id: '13',
        type: SupportedEntry.Event,
        parent: 'block',
        timeStart: 12,
        timeEnd: 13,
        duration: 1,
        dayOffset: 0,
        gap: 0,
        skip: false,
        linkStart: true,
      } as OntimeEvent,
      '2': {
        id: '2',
        type: SupportedEntry.Event,
        parent: null,
        timeStart: 20,
        timeEnd: 21,
        duration: 1,
        dayOffset: 0,
        gap: 7,
        skip: false,
        linkStart: false,
      } as OntimeEvent,
    };
    const { metadata, process } = makeRundownMetadata(selectedEventId);
    expect(metadata).toStrictEqual({
      previousEvent: null,
      latestEvent: null,
      previousEntryId: null,
      thisId: null,
      eventIndex: 0,
      isPast: true,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: null,
      groupColour: undefined,
    });
    expect(process(demoEvents['1'])).toStrictEqual({
      previousEvent: null,
      latestEvent: demoEvents['1'],
      previousEntryId: null,
      thisId: demoEvents['1'].id,
      eventIndex: 1, // UI indexes are 1 based
      isPast: true,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: null,
      groupColour: undefined,
    });
    expect(process(demoEvents['block'])).toMatchObject({
      previousEvent: demoEvents['1'],
      latestEvent: demoEvents['1'],
      previousEntryId: demoEvents['1'].id,
      thisId: demoEvents['block'].id,
      eventIndex: 1,
      isPast: true,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: 'block',
      groupColour: 'red',
    });
    expect(process(demoEvents['11'])).toMatchObject({
      previousEvent: demoEvents['1'],
      latestEvent: demoEvents['11'],
      previousEntryId: demoEvents['block'].id,
      thisId: demoEvents['11'].id,
      eventIndex: 2,
      isPast: true,
      isNextDay: false,
      totalGap: 10,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: 'block',
      groupColour: 'red',
    });
    expect(process(demoEvents['delay'])).toMatchObject({
      previousEvent: demoEvents['11'],
      latestEvent: demoEvents['11'],
      previousEntryId: demoEvents['11'].id,
      thisId: demoEvents['delay'].id,
      eventIndex: 2,
      isPast: true,
      isNextDay: false,
      totalGap: 10,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: 'block',
      groupColour: 'red',
    });
    expect(process(demoEvents['12'])).toMatchObject({
      previousEvent: demoEvents['11'],
      latestEvent: demoEvents['12'],
      previousEntryId: demoEvents['delay'].id,
      thisId: demoEvents['12'].id,
      eventIndex: 3,
      isPast: false,
      isNextDay: false,
      totalGap: 10,
      isLinkedToLoaded: false,
      isLoaded: true,
      groupId: 'block',
      groupColour: 'red',
    });
    expect(process(demoEvents['13'])).toMatchObject({
      previousEvent: demoEvents['12'],
      latestEvent: demoEvents['13'],
      previousEntryId: demoEvents['12'].id,
      thisId: demoEvents['13'].id,
      eventIndex: 4,
      isPast: false,
      isNextDay: false,
      totalGap: 10,
      isLinkedToLoaded: true,
      isLoaded: false,
      groupId: 'block',
      groupColour: 'red',
    });
    expect(process(demoEvents['2'])).toMatchObject({
      previousEvent: demoEvents['13'],
      latestEvent: demoEvents['2'],
      previousEntryId: demoEvents['13'].id,
      thisId: demoEvents['2'].id,
      eventIndex: 5,
      isPast: false,
      isNextDay: false,
      totalGap: 17,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: null,
      groupColour: undefined,
    });
  });
  it('populates previousEntries in blocks', () => {
    const rundownStartsWithBlock = {
      block: {
        id: 'block',
        type: SupportedEntry.Block,
        colour: 'red',
        events: ['1', '2'],
      } as OntimeBlock,
      '1': {
        id: '1',
        type: SupportedEntry.Event,
        parent: 'block',
        timeStart: 1,
        timeEnd: 2,
        duration: 1,
        dayOffset: 0,
        gap: 0,
        skip: false,
        linkStart: false,
      } as OntimeEvent,
      '2': {
        id: '2',
        type: SupportedEntry.Event,
        parent: 'block',
        timeStart: 2,
        timeEnd: 3,
        duration: 1,
        dayOffset: 0,
        gap: 0,
        skip: false,
        linkStart: false,
      } as OntimeEvent,
    };
    const { process } = makeRundownMetadata(null);
    expect(process(rundownStartsWithBlock.block)).toStrictEqual({
      previousEvent: null,
      latestEvent: null,
      previousEntryId: null,
      thisId: rundownStartsWithBlock.block.id,
      eventIndex: 0,
      isPast: false,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: rundownStartsWithBlock.block.id,
      groupColour: 'red',
    });
    expect(process(rundownStartsWithBlock['1'])).toStrictEqual({
      previousEvent: null,
      latestEvent: rundownStartsWithBlock['1'],
      previousEntryId: rundownStartsWithBlock.block.id,
      thisId: rundownStartsWithBlock['1'].id,
      eventIndex: 1,
      isPast: false,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: rundownStartsWithBlock.block.id,
      groupColour: 'red',
    });
    expect(process(rundownStartsWithBlock['2'])).toStrictEqual({
      previousEvent: rundownStartsWithBlock['1'],
      latestEvent: rundownStartsWithBlock['2'],
      previousEntryId: rundownStartsWithBlock['1'].id,
      thisId: rundownStartsWithBlock['2'].id,
      eventIndex: 2,
      isPast: false,
      isNextDay: false,
      totalGap: 0,
      isLinkedToLoaded: false,
      isLoaded: false,
      groupId: rundownStartsWithBlock.block.id,
      groupColour: 'red',
    });
  });
 });
 describe('makeSortableList()', () => {
  it('generates a list with block ends', () => {
    const order = ['block-1', '2', 'block-3', 'block-4'];
    const entries: RundownEntries = {
      'block-1': { type: SupportedEntry.Block, id: 'block-1', events: ['11'] } as OntimeBlock,
      '11': { type: SupportedEntry.Event, id: '11', parent: 'block-1' } as OntimeEvent,
      '2': { type: SupportedEntry.Event, id: '2', parent: null } as OntimeEvent,
      'block-3': { type: SupportedEntry.Block, id: 'block-3', events: ['31'] } as OntimeBlock,
      '31': { type: SupportedEntry.Event, id: '31', parent: 'block-3' } as OntimeEvent,
      'block-4': { type: SupportedEntry.Block, id: 'block-4', events: [] as string[] } as OntimeBlock,
    };
    const sortableList = makeSortableList(order, entries);
    expect(sortableList).toStrictEqual([
      'block-1',
      '11',
      'end-block-1',
      '2',
      'block-3',
      '31',
      'end-block-3',
      'block-4',
      'end-block-4',
    ]);
  });
  it('closes dangling blocks', () => {
    const order = ['block'];
    const entries: RundownEntries = {
      block: { type: SupportedEntry.Block, id: 'block-1', events: ['11', '12'] } as OntimeBlock,
      '11': { type: SupportedEntry.Event, id: '11', parent: 'block-1' } as OntimeEvent,
      '12': { type: SupportedEntry.Event, id: '12', parent: 'block-1' } as OntimeEvent,
    };
    const sortableList = makeSortableList(order, entries);
    expect(sortableList).toStrictEqual(['block-1', '11', '12', 'end-block-1']);
  });
  it('handles a list with a with just blocks', () => {
    const order = ['block-1', 'block-2'];
    const entries: RundownEntries = {
      'block-1': { type: SupportedEntry.Block, id: 'block-1', events: [] as string[] } as OntimeBlock,
      'block-2': { type: SupportedEntry.Block, id: 'block-2', events: [] as string[] } as OntimeBlock,
    };
    const sortableList = makeSortableList(order, entries);
    expect(sortableList).toStrictEqual(['block-1', 'end-block-1', 'block-2', 'end-block-2']);
  });
 });
 describe('moveUp()', () => {
  const sortableData = ['event1', 'event2', 'block1', 'event11', 'end-block1', 'block2', 'end-block2', 'event3'];
  const entries = {
    event1: { type: 'event', id: 'event1', parent: null } as OntimeEvent,
    event2: { type: 'event', id: 'event2', parent: null }as OntimeEvent,
    block1: { type: 'block', id: 'block1', events: ['event3'] } as OntimeBlock,
    event11: { type: 'event', id: 'event11', parent: 'block1' } as OntimeEvent,
    block2: { type: 'block', id: 'block2', events: [] as EntryId[] } as OntimeBlock,
    event3: { type: 'event', id: 'event3', parent: null } as OntimeEvent,
  };
  it('moves an event up in the list', () => {
    const result = moveUp('event2', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'event1', order: 'before', isBlock: false });
  })
  it.todo('disallows nesting blocks', () => {
    const result = moveUp('block2', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'block1', order: 'before', isBlock: false });
  })
  it('moves an event into a block', () => {
    const result = moveUp('event3', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'block2', order: 'insert', isBlock: true });
  })
  it('moving up from top is noop', () => {
    const result = moveUp('event1', sortableData, entries);
    expect(result).toMatchObject({ destinationId: null });
  })
 });
 describe('moveDown()', () => {
  const sortableData = ['event1', 'event2', 'block1', 'event11', 'end-block1', 'block2', 'end-block2', 'event3'];
  const entries = {
    event1: { type: 'event', id: 'event1', parent: null } as OntimeEvent,
    event2: { type: 'event', id: 'event2', parent: null }as OntimeEvent,
    block1: { type: 'block', id: 'block1', events: ['event11'] } as OntimeBlock,
    event11: { type: 'event', id: 'event11', parent: 'block1' } as OntimeEvent,
    block2: { type: 'block', id: 'block2', events: [] as EntryId[] } as OntimeBlock,
    event3: { type: 'event', id: 'event3', parent: null } as OntimeEvent,
  };
  it('moves an event down in the list', () => {
    const result = moveDown('event1', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'event2', order: 'after', isBlock: false });
  })
  it.todo('disallows nesting blocks', () => {
    const result = moveDown('block1', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'block2', order: 'before', isBlock: false });
  })
  it('moves an event into a block', () => {
    const result = moveDown('event2', sortableData, entries);
    expect(result).toStrictEqual({ destinationId: 'event11', order: 'before', isBlock: true });
  })
  it('moving down from bottom is noop', () => {
    const result = moveDown('event3', sortableData, entries);
    expect(result).toMatchObject({ destinationId: null });
  })
 });
@@ -1,7 +1,7 @@
@use '../../theme/ontimeColours' as *;
@use '../../theme/ontimeStyles' as *;
-$block-width: 32rem;
+$block-width: 33rem;
 $block-gap: 0.25rem;
 $block-element-spacing: 0.25rem;
@@ -20,23 +20,28 @@ $block-cursor-color: $orange-400;
  box-sizing: content-box;
  border: 1px solid $white-7;
  border-radius: $block-border-radius;
  margin-block: 0.25rem;
  margin-right: 0.125rem;
  position: relative;
  color: $block-text-color;
  min-width: $block-width;
 }
@mixin block-spacing() {
  padding-right: 0.5rem;
  gap: 2px;
 }
@mixin drag-style() {
  font-size: 20px;
  justify-self: center;
  opacity: 0.3;
  cursor: grab;
  transition: opacity 0.3s;
  &:hover {
    opacity: 1;
  }
  &:focus {
    box-shadow: none;
    outline: none;
@@ -1,74 +1,28 @@
@use '../blockMixins' as *;
 .block {
  @include block-spacing;
  @include block-styling;
-  overflow: hidden;
+  margin-left: 0.5rem;
  background-color: $block-bg2;
  min-width: 34rem;
  display: grid;
-  grid-template-columns: 2rem 1fr;
+  grid-template-columns: 2rem 1fr auto;
  grid-template-areas: 'binder header';
  align-items: center;
-  // TODO(style fix): groups have an extra bottom margin which interrupt colour
+  height: $secondary-block-height;
-  margin-block: 0.25rem;
+  gap: 0.5rem;
  &.hasCursor {
    outline: 1px solid $block-cursor-color;
  }
  &.expanded {
    border-radius: $block-border-radius $block-border-radius 0 0;
  }
  .binder {
    grid-area: binder;
    height: 100%;
    background-color: var(--block-color, $gray-1050);
    color: $section-white;
    font-size: 1rem;
    display: grid;
    justify-content: center;
    padding-top: 0.25rem;
  }
  .header {
    grid-area: header;
    padding-inline: 0.5rem;
    background-color: $block-bg2;
    display: flex;
    flex-direction: column;
    gap: 0.5rem;
  }
  .titleRow {
    display: flex;
    align-items: center;
    gap: 0.5rem;
  }
  .metaRow {
    display: flex;
    gap: 3rem;
    margin-bottom: 0.25rem;
  }
  .metaEntry {
    width: 4.5em;
    :first-child {
      font-size: calc(1rem - 3px);
      color: $label-gray;
    }
  }
 }
 .drag {
  @include drag-style;
-
+}
-  &.isDragging {
+
-    cursor: grabbing;
+.actionMenu {
-  }
+  justify-self: flex-end;
  &.notAllowed {
    cursor: not-allowed;
  }
 }
@@ -1,57 +1,26 @@
 import { useRef } from 'react';
-import {
+import { IoReorderTwo } from 'react-icons/io5';
  IoChevronDown,
  IoChevronUp,
  IoDuplicateOutline,
  IoFolderOpenOutline,
  IoReorderTwo,
  IoTrash,
 } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { EntryId, OntimeBlock } from 'ontime-types';
+import { OntimeBlock } from 'ontime-types';
-import { useContextMenu } from '../../../common/hooks/useContextMenu';
+import { cx } from '../../../common/utils/styleUtils';
 import { useEntryActions } from '../../../common/hooks/useEntryAction';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
 import { formatDuration, formatTime } from '../../../common/utils/time';
 import EditableBlockTitle from '../common/EditableBlockTitle';
-import { canDrop } from '../rundown.utils';
+
 import BlockDelete from './BlockDelete';
 import style from './BlockBlock.module.scss';
 interface BlockBlockProps {
  data: OntimeBlock;
  hasCursor: boolean;
-  collapsed: boolean;
+  onDelete: () => void;
  onCollapse: (collapsed: boolean, groupId: EntryId) => void;
 }
 export default function BlockBlock(props: BlockBlockProps) {
-  const { data, hasCursor, collapsed, onCollapse } = props;
+  const { data, hasCursor, onDelete } = props;
  const handleRef = useRef<null | HTMLSpanElement>(null);
  const { clone, ungroup, deleteEntry } = useEntryActions();
-  const [onContextMenu] = useContextMenu<HTMLDivElement>([
+  const handleRef = useRef<null | HTMLSpanElement>(null);
    {
      label: 'Clone Block',
      icon: IoDuplicateOutline,
      onClick: () => clone(data.id),
    },
    {
      label: 'Ungroup',
      icon: IoFolderOpenOutline,
      onClick: () => ungroup(data.id),
      isDisabled: data.events.length === 0,
    },
    {
      label: 'Delete Block',
      icon: IoTrash,
      onClick: () => deleteEntry([data.id]),
      withDivider: true,
    },
  ]);
  const {
    attributes: dragAttributes,
@@ -59,79 +28,25 @@ export default function BlockBlock(props: BlockBlockProps) {
    setNodeRef,
    transform,
    transition,
    isDragging,
    isOver,
    over,
  } = useSortable({
    id: data.id,
    data: {
      type: 'block',
    },
    animateLayoutChanges: () => false,
  });
  const binderColours = data.colour && getAccessibleColour(data.colour);
  const isValidDrop = over?.id && canDrop(over.data.current?.type, over.data.current?.parent);
  const dragStyle = {
    zIndex: isDragging ? 2 : 'inherit',
    transform: CSS.Translate.toString(transform),
    transition,
    cursor: isOver ? (isValidDrop ? 'grabbing' : 'no-drop') : 'default',
  };
  const blockClasses = cx([style.block, hasCursor ? style.hasCursor : null]);
  return (
-    <div
+    <div className={blockClasses} ref={setNodeRef} style={dragStyle}>
-      className={cx([style.block, hasCursor && style.hasCursor, !collapsed && style.expanded])}
+      <span className={style.drag} ref={handleRef} {...dragAttributes} {...dragListeners}>
-      ref={setNodeRef}
+        <IoReorderTwo />
-      onContextMenu={onContextMenu}
+      </span>
-      style={{
+      <EditableBlockTitle title={data.title} eventId={data.id} placeholder='Block title' />
-        ...(binderColours ? { '--user-bg': binderColours.backgroundColor } : {}),
+      <BlockDelete onDelete={onDelete} />
        ...dragStyle,
      }}
    >
      <div className={style.binder} style={{ ...binderColours }} tabIndex={-1}>
        <span
          className={cx([style.drag, isDragging && style.isDragging, isDragging && !isValidDrop && style.notAllowed])}
          ref={handleRef}
          {...dragAttributes}
          {...dragListeners}
        >
          <IoReorderTwo />
        </span>
      </div>
      <div className={style.header}>
        <div className={style.titleRow}>
          <EditableBlockTitle title={data.title} eventId={data.id} placeholder='Block title' />
          <IconButton
            aria-label='Collapse'
            onClick={() => onCollapse(!collapsed, data.id)}
            color='#e2e2e2' // $gray-200
            variant='ontime-ghosted'
            size='sm'
          >
            {collapsed ? <IoChevronUp /> : <IoChevronDown />}
          </IconButton>
        </div>
        <div className={style.metaRow}>
          <div className={style.metaEntry}>
            <div>Start</div>
            <div>{formatTime(data.startTime)}</div>
          </div>
          <div className={style.metaEntry}>
            <div>End</div>
            <div>{formatTime(data.endTime)}</div>
          </div>
          <div className={style.metaEntry}>
            <div>Duration</div>
            <div>{formatDuration(data.duration)}</div>
          </div>
          <div className={style.metaEntry}>
            <div>Events</div>
            <div>{data.events.length}</div>
          </div>
        </div>
      </div>
    </div>
  );
 }
@@ -0,0 +1,27 @@
 import { IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
 import { AppMode, useAppMode } from '../../../common/stores/appModeStore';
 interface BlockDeleteProps {
  onDelete: () => void;
 }
 export default function BlockDelete(props: BlockDeleteProps) {
  const { onDelete } = props;
  const mode = useAppMode((state) => state.mode);
  const isRunMode = mode === AppMode.Run;
  return (
    <IconButton
      aria-label='Delete'
      size='sm'
      icon={<IoTrash />}
      variant='ontime-subtle'
      color='#FA5656'
      onClick={onDelete}
      isDisabled={isRunMode}
    />
  );
 }
@@ -1,10 +0,0 @@
@use '../blockMixins' as *;
 .blockEnd {
  cursor: default;
  height: 0.5rem;
  background-color: var(--user-bg, $gray-1050);
  border-radius: 0 0 $block-border-radius $block-border-radius;
  margin-bottom: 0.25rem;
 }
@@ -1,42 +0,0 @@
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import style from './BlockEnd.module.scss';
 interface BlockEndProps {
  id: string;
  colour?: string;
 }
 export default function BlockEnd(props: BlockEndProps) {
  const { id, colour } = props;
  const {
    attributes: dragAttributes,
    listeners: dragListeners,
    setNodeRef,
    transform,
    transition,
  } = useSortable({
    id,
    animateLayoutChanges: () => false,
    disabled: true, // we do not want to drag end blocks
  });
  const dragStyle = {
    transform: CSS.Transform.toString(transform),
    transition,
  };
  return (
    <div
      className={style.blockEnd}
      ref={setNodeRef}
      {...dragAttributes}
      {...dragListeners}
      style={{
        ...dragStyle,
        ...(colour ? { '--user-bg': colour } : {}),
      }}
    />
  );
 }
@@ -2,7 +2,7 @@ import { useCallback, useRef } from 'react';
 import { Input } from '@chakra-ui/react';
 import useReactiveTextInput from '../../../common/components/input/text-input/useReactiveTextInput';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';
 import style from './TitleEditor.module.scss';
@@ -16,7 +16,7 @@ interface TitleEditorProps {
 export default function EditableBlockTitle(props: TitleEditorProps) {
  const { title, eventId, placeholder, className } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
  const ref = useRef<HTMLInputElement | null>(null);
  const submitCallback = useCallback(
    (text: string) => {
@@ -25,9 +25,9 @@ export default function EditableBlockTitle(props: TitleEditorProps) {
      }
      const cleanVal = text.trim();
-      updateEntry({ id: eventId, title: cleanVal });
+      updateEvent({ id: eventId, title: cleanVal });
    },
-    [title, updateEntry, eventId],
+    [title, updateEvent, eventId],
  );
  const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(title, submitCallback, ref, {
@@ -1,11 +1,11 @@
@use '../blockMixins' as *;
 .delay {
  @include block-spacing;
  @include block-styling;
  margin-left: 0.5rem;
  margin-block: 0.25rem;
  background-color: $block-bg2;
  padding-right: 0.5rem;
  display: grid;
  grid-template-columns: 2rem 1fr auto;
@@ -6,7 +6,7 @@ import { CSS } from '@dnd-kit/utilities';
 import { OntimeDelay } from 'ontime-types';
 import DelayInput from '../../../common/components/input/delay-input/DelayInput';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
+import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';
 import style from './DelayBlock.module.scss';
@@ -18,26 +18,21 @@ interface DelayBlockProps {
 export default function DelayBlock(props: DelayBlockProps) {
  const { data, hasCursor } = props;
-  const { applyDelay, deleteEntry } = useEntryActions();
+  const { applyDelay, deleteEvent } = useEventAction();
  const handleRef = useRef<null | HTMLSpanElement>(null);
  const {
    attributes: dragAttributes,
    listeners: dragListeners,
    setNodeRef,
    isDragging,
    transform,
    transition,
  } = useSortable({
    id: data.id,
    data: {
      type: 'delay',
    },
    animateLayoutChanges: () => false,
  });
  const dragStyle = {
    zIndex: isDragging ? 2 : 'inherit',
    transform: CSS.Translate.toString(transform),
    transition,
  };
@@ -53,7 +48,7 @@ export default function DelayBlock(props: DelayBlockProps) {
  };
  const cancelDelayHandler = () => {
-    deleteEntry([data.id]);
+    deleteEvent([data.id]);
  };
  const blockClasses = cx([style.delay, hasCursor ? style.hasCursor : null]);
@@ -5,7 +5,6 @@ $skip-opacity: 0.2;
 .eventBlock {
  @include block-styling;
  background-color: $block-bg;
  margin-block: 0.25rem;
  display: grid;
  grid-template-areas:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	e2c9ee31ad	bump version to 3.16.1	2025-08-15 19:54:38 +02:00
Carlos Valente	bfd85855d4	fix: prevent storage key conflicts between stages	2025-08-15 19:54:38 +02:00
Carlos Valente	20859abda9	chore: add demo images to github	2025-08-09 07:01:01 +02:00
Alex Christoffer Rasmussen	1025347c08	refactor: add version to session endpoint (#1659 )	2025-06-23 20:42:53 +02:00
Carlos Valente	43988ea12b	fix: stale ids in cuesheet (#1657 )	2025-06-23 19:56:53 +02:00
Alex Christoffer Rasmussen	722e045b20	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`.	2025-06-20 12:28:20 +02:00
Carlos Valente	ad6804019b	bump version to 3.16.0	2025-06-20 07:41:39 +02:00
Carlos Valente	cd40a6e55e	refactor: add version to session endpoint	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	08d9e24871	Remove public event feature (#1645 )	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	0649678dca	Fix: rearrange playing event (#1640 ) * creat failing test * find and pass index of eventNow in case it moved * fix cache invalidate edits should also recalculate timer * use coluor as test indicator * fixed empty cue guard Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-06-19 18:53:28 +02:00
google-labs-jules[bot]	a00ec2d02a	refactor: style tweaks to edit css modal	2025-06-19 18:53:28 +02:00
google-labs-jules[bot]	54a74ccc2a	refactor: remove usages of framer-motion	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	6f3ab274bd	Upgrade expressjs (#1633 ) * upgrade expressjs * migration * reenable test * extend timeout on download test * fixup! migration * move empty body test from controller to validator * enusre not empty * extract validation function * fixup! reenable test * remove thin controllers * disable e2e test of project file download	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	90870ecfb6	Refactor: require trigger in all events objects (#1636 ) * reqire trigger in all events * use structuredClone when cloning an event	2025-06-19 18:53:28 +02:00
google-labs-jules[bot]	b640e0e181	Fix: Correct boundary condition in applyDelay The `applyDelay` function had a condition that incorrectly used `rundown.order.length` instead of `rundownMetadata.flatEntryOrder.length` to check if a delay entry was the last in the sequence. `rundown.order` only contains top-level entries, while `flatEntryOrder` contains all entries, including those within blocks, which is the relevant list for this check. This commit corrects the condition to use `rundownMetadata.flatEntryOrder.length`. Existing tests in `rundown.dao.test.ts` (specifically the test `removes delays in last position without applying changes`) already cover this scenario and pass with the correction, ensuring the fix behaves as expected.	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	c41fe824cf	let vite be the proxy to the dev server (#1630 )	2025-06-19 18:53:28 +02:00
Carlos Valente	62c8319d70	refactor: migrate custom fields to transactions refactor: extract functions to api domain refactor: strict custom field parsing refactor: remove rundown cache utilities refactor: directory restructure	2025-06-19 18:53:28 +02:00
Carlos Valente	b1d23467a2	refactor: simplify validations	2025-06-19 18:53:28 +02:00
Carlos Valente	9a62daf047	refactor: create transaction system and apply to adding entry (#1620 ) * refactor: create transaction system and apply to adding entry * refactor: migrate edit mutations to transaction * refactor: migrate delete mutation to transaction * refactor: migrate reorder mutation to transaction * refactor: migrate apply delay to transaction * refactor: migrate swapEvents to transaction * refactor: migrate clone to transaction * refactor: migrate group/ungroup transactions * refactor: simplify mutations * refactor: migrate getters * chore: add tests to processRundown()	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	b9ab1c6fd7	Refactor: better rounding (#1594 )	2025-06-19 18:53:28 +02:00
Carlos Valente	c1054711b0	refactor: improve reorder logic	2025-06-19 18:53:28 +02:00
Carlos Valente	a4d4f29a37	chore: simplify URLs	2025-06-19 18:53:28 +02:00
Carlos Valente	2793aadea0	refactor: order is single source of truth	2025-06-19 18:53:28 +02:00
Carlos Valente	e7cfb7d9d9	refactor: refetch targets is enum	2025-06-19 18:53:28 +02:00
Carlos Valente	256a851c9b	refactor: small ux improvements - rename dissolve > ungroup - prevent ondrag when clicking - add untitled as block title fallback - move block action to context menu	2025-06-19 18:53:28 +02:00
Carlos Valente	4ab9c81cb8	refactor: remove trivially inferred numEvents	2025-06-19 18:53:28 +02:00
Carlos Valente	2f13d6c89e	feat: duplicate groups	2025-06-19 18:53:28 +02:00
Carlos Valente	f1f7bad25e	feat: create group from entry selection	2025-06-19 18:53:28 +02:00
Carlos Valente	a8b52a48f7	feat: create block from rundown empty	2025-06-19 18:53:28 +02:00
Carlos Valente	cd0999b2ab	fix: collapsed blocks dont render children	2025-06-19 18:53:28 +02:00
Carlos Valente	b4c60f3f04	refactor: type cleanup and test improvements	2025-06-19 18:53:28 +02:00
Carlos Valente	5cefad3666	feat: allow dissolving a block	2025-06-19 18:53:28 +02:00
Carlos Valente	7a6ecd8c34	fix: uncontrolled prop on controlled component	2025-06-19 18:53:28 +02:00
Carlos Valente	ba96ecfd91	refactor: improve return of reorder	2025-06-19 18:53:28 +02:00
Carlos Valente	7bed3757f2	refactor: mutations on batch elements must have IDs	2025-06-19 18:53:28 +02:00
Carlos Valente	e2e755b1d2	chore: upgrade dependencies	2025-06-19 18:53:28 +02:00
Carlos Valente	a77d23109d	refactor: extract utility to merge two arrays	2025-06-19 18:53:28 +02:00
Carlos Valente	0eb3b8d382	refactor: change network mode defaults	2025-06-19 18:53:28 +02:00
Carlos Valente	0021185288	fix: delete nested events	2025-06-19 18:53:28 +02:00
Carlos Valente	94c72ff4f6	fix: add event at end of block	2025-06-19 18:53:28 +02:00
Carlos Valente	e4c08dc9b2	refactor: make finder available in exported rundown	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	ec74af0d62	assert non null and update test (#1604 )	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	b6d72dd082	Fix project renumber (#1597 ) * fix: generateUniqueFileName * loadProject should not generate new names * update comments * extract and test getProjectNumber * spell * finish jsdoc * use getProjectNumber * cleanup loadProject * create a `incrementProjectNumber` function * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	31c311daf0	Refactor: WebSocket from flush queue to one patch (#1595 ) * change flush to one patch * remove unused types * create batch * merge patch into eventStore Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	e9b3cc6090	Refactor: ms for api calls (#1593 ) * use ms for api calls * change it in UI * update comment * rename variables * refactor: addtime api logic	2025-06-19 18:53:28 +02:00
Alex Christoffer Rasmussen	543b04a097	fix test (#1601 ) * fix test * add comment	2025-06-19 18:53:28 +02:00
Carlos Valente	d39b85b6e6	fix: rebase master	2025-06-19 18:53:28 +02:00
Carlos Valente	bbe107bb2b	chore: correct test path	2025-06-19 18:53:28 +02:00
Carlos Valente	c616240db1	refactor: extract rundown parsing refactor: implement groups in editor	2025-06-19 18:53:28 +02:00
Carlos Valente	166be66ce3	chore: improve convention entry <> event	2025-06-19 18:53:28 +02:00
Carlos Valente	4180d0a337	refactor: maintain flat orders	2025-06-19 18:53:28 +02:00
Carlos Valente	78108e316c	refactor: implement operations on nested events	2025-06-19 18:53:28 +02:00
Carlos Valente	3bb8b70915	refactor: process events in rundown	2025-06-19 18:53:28 +02:00
Carlos Valente	1c4f13a0ed	chore: improve convention entry <> event	2025-06-19 18:53:28 +02:00
Carlos Valente	3ca0abad53	chore: rename currentBlock > parent	2025-06-19 18:53:28 +02:00
Carlos Valente	030c8f897f	refactor: fix delay positioning in gaps	2025-06-19 18:53:28 +02:00
Carlos Valente	68175cfa3b	refactor(e2e): skip flaky test	2025-06-19 18:53:28 +02:00
Carlos Valente	fd8f757851	refactor: improve project loading	2025-06-19 18:53:28 +02:00
Carlos Valente	876d111c61	refactor: gather group metadata	2025-06-19 18:53:28 +02:00
Carlos Valente	730cb95c04	refactor: swap maintains schedule	2025-06-19 18:53:28 +02:00
Carlos Valente	3c388d4fb5	chore: rename files	2025-06-19 18:53:28 +02:00
Carlos Valente	2e23718d73	refactor: restructure model to contain an object of rundowns	2025-06-19 18:53:28 +02:00
Carlos Valente	89ea8c470b	refactor: clearer relationship on rundown elements	2025-06-19 18:53:28 +02:00
Carlos Valente	178640bfc4	refactor: use strict typing	2025-06-19 18:53:28 +02:00
Carlos Valente	4ed38340e0	refactor: remove stop as a possible end action	2025-06-19 18:53:28 +02:00
Carlos Valente	69eb9a5eff	refactor: restructure model to contain an object of rundowns	2025-06-19 18:53:28 +02:00
Carlos Valente	351425127a	chore: remove IDE files	2025-06-19 18:53:28 +02:00
Carlos Valente	95f2ba37cc	refactor: remove unused and legacy code - remove legacy migrations - remove unused server code - remove unused UI code	2025-06-19 18:53:28 +02:00