cleanup: millisToSeconds

rename
tweek update rate
2026-07-26 10:38:55 +00:00 · 2025-05-14 21:58:08 +02:00 · 2025-05-14 21:58:08 +02:00 · 2025-05-14 21:58:08 +02:00 · 2025-05-14 21:58:07 +02:00 · 2025-05-14 21:58:07 +02:00
472 changed files with 14928 additions and 10725 deletions
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
@@ -1,51 +0,0 @@
-<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.11.0-beta.1",
+    "version": "3.15.2",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,37 +1,40 @@
 {
  "name": "ontime-ui",
-  "version": "3.11.0-beta.1",
+  "version": "3.15.2",
  "private": true,
  "type": "module",
  "dependencies": {
    "@chakra-ui/react": "^2.7.0",
-    "@dnd-kit/core": "^6.1.0",
-    "@dnd-kit/sortable": "^8.0.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.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.13.3",
-    "@react-icons/all-files": "^4.1.0",
+    "@mantine/hooks": "^7.17.2",
    "@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.20.5",
+    "@tanstack/react-table": "^8.21.3",
    "autosize": "^6.0.1",
    "axios": "^1.2.0",
    "color": "^4.2.3",
    "csv-stringify": "^6.4.5",
    "framer-motion": "^10.10.0",
+    "prismjs": "^1.29.0",
    "react": "^18.3.1",
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
    "react-hook-form": "^7.53.1",
+    "react-icons": "5.4.0",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
+    "react-simple-code-editor": "^0.14.1",
    "web-vitals": "^3.1.1",
-    "zustand": "^4.5.2"
+    "zustand": "^5.0.3"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -64,6 +67,7 @@
    "@sentry/vite-plugin": "^2.16.1",
    "@tanstack/eslint-plugin-query": "^5.8.4",
    "@types/color": "^3.0.3",
+    "@types/prismjs": "^1.26.5",
    "@types/react": "^18.0.26",
    "@types/react-dom": "^18.0.10",
    "@typescript-eslint/eslint-plugin": "catalog:",
@@ -27,9 +27,9 @@ const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-tim
 const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
 const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));

-const Backstage = React.lazy(() => import('./features/viewers/backstage/Backstage'));
+const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
-const Public = React.lazy(() => import('./features/viewers/public/Public'));
+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'));
@@ -44,6 +44,8 @@ const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
 const STimeline = withPreset(withData(Timeline));
+const PCuesheet = withPreset(Cuesheet);
+const POperator = withPreset(Operator);

 const EditorFeatureWrapper = React.lazy(() => import('./features/EditorFeatureWrapper'));
 const RundownPanel = React.lazy(() => import('./features/rundown/RundownExport'));
@@ -155,8 +157,15 @@ export default function AppRouter() {

        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
-        <Route path='/cuesheet' element={<Cuesheet />} />
-        <Route path='/op' element={<Operator />} />
+        <Route path='/cuesheet' element={<PCuesheet />} />
+        <Route
+          path='/op'
+          element={
+            <ViewLoader>
+              <POperator />
+            </ViewLoader>
+          }
+        />

        {/*/!* Protected Routes - Elements *!/*/}
        <Route
@@ -0,0 +1,30 @@
+import axios from 'axios';
+
+import { apiEntryUrl } from './constants';
+
+const assetsPath = `${apiEntryUrl}/assets`;
+
+/**
+ * HTTP request to get css contents
+ */
+export async function getCSSContents(): Promise<string> {
+  const res = await axios.get(`${assetsPath}/css`);
+  return res.data;
+}
+
+/**
+ * HTTP request to post css contents
+ */
+export async function postCSSContents(css: string): Promise<void> {
+  await axios.post(`${assetsPath}/css`, {
+    css,
+  });
+}
+
+/**
+ * HTTP request to restore default css
+ */
+export async function restoreCSSContents(): Promise<string> {
+  const res = await axios.post(`${assetsPath}/css/restore`);
+  return res.data;
+}
@@ -10,19 +10,16 @@ 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'];
+export const REPORT = ['report'];

 // API URLs
 export const apiEntryUrl = `${serverURL}/data`;

-export const projectDataURL = `${serverURL}/project`;
-export const rundownURL = `${serverURL}/events`;
-export const ontimeURL = `${serverURL}/ontime`;
+const userAssetsPath = 'user';
+const cssOverridePath = 'styles/override.css';

-export const userAssetsPath = 'user';
-export const cssOverridePath = 'styles/override.css';
 export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
 export const projectLogoPath = `${serverURL}/${userAssetsPath}/logo`;
@@ -1,7 +1,8 @@
 import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';

-import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
+import { makeTable } from '../../views/cuesheet/cuesheet.utils';
+import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../utils/csv';

 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -39,10 +40,12 @@ export async function downloadProject(fileName: string) {
 export async function downloadCSV(fileName: string = 'rundown') {
  try {
    const { data, name } = await fileDownload(fileName);
-    const { project, rundown, customFields } = data;
+    const { project, rundowns, customFields } = data;

-    const sheetData = makeTable(project, rundown, customFields);
-    const fileContent = makeCSV(sheetData);
+    const flatRundowns = aggregateRundowns(rundowns);
+    const sheetData = makeTable(project, flatRundowns, customFields);
+
+    const fileContent = makeCSVFromArrayOfArrays(sheetData);

    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
    downloadBlob(blob, `${name}.csv`);
@@ -1,16 +1,11 @@
 import axios, { AxiosResponse } from 'axios';
-import { CustomFields, OntimeRundown } from 'ontime-types';
+import { CustomFields, Rundown } 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
@@ -34,6 +29,10 @@ 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,
@@ -0,0 +1,26 @@
+import axios from 'axios';
+import { OntimeReport } from 'ontime-types';
+
+import { ontimeQueryClient } from '../../common/queryClient';
+
+import { apiEntryUrl, REPORT } from './constants';
+
+export const reportUrl = `${apiEntryUrl}/report`;
+
+/**
+ * HTTP request to fetch all reports
+ */
+export async function fetchReport(): Promise<OntimeReport> {
+  const res = await axios.get(`${reportUrl}/`);
+  return res.data;
+}
+
+export async function deleteReport(id: string) {
+  await axios.delete(`${reportUrl}/${id}`);
+  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
+}
+
+export async function deleteAllReport() {
+  await axios.delete(`${reportUrl}/all`);
+  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
+}
@@ -1,29 +1,45 @@
 import axios, { AxiosResponse } from 'axios';
-import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
+import {
+  EntryId,
+  MessageResponse,
+  OntimeEntry,
+  OntimeEvent,
+  ProjectRundownsList,
+  Rundown,
+  TransientEventPayload,
+} from 'ontime-types';

 import { apiEntryUrl } from './constants';

 const rundownPath = `${apiEntryUrl}/rundown`;

 /**
- * HTTP request to fetch all events
+ * HTTP request to fetch a list of existing rundowns
 */
-export async function fetchNormalisedRundown(): Promise<RundownCached> {
-  const res = await axios.get(`${rundownPath}/normalised`);
+export async function fetchProjectRundownList(): Promise<ProjectRundownsList> {
+  const res = await axios.get(`${rundownPath}/`);
  return res.data;
 }

 /**
- * HTTP request to post new event
+ * HTTP request to fetch all events
 */
-export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function fetchCurrentRundown(): Promise<Rundown> {
+  const res = await axios.get(`${rundownPath}/current`);
+  return res.data;
+}
+
+/**
+ * HTTP request to post new entry
+ */
+export async function postAddEntry(data: TransientEventPayload): Promise<AxiosResponse<OntimeEntry>> {
  return axios.post(rundownPath, data);
 }

 /**
- * HTTP request to put new event
+ * HTTP request to edit an entry
 */
-export async function requestPutEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function putEditEntry(data: Partial<OntimeEntry>): Promise<AxiosResponse<OntimeEntry>> {
  return axios.put(rundownPath, data);
 }

@@ -33,9 +49,9 @@ type BatchEditEntry = {
 };

 /**
- * HTTP request to put multiple events
+ * HTTP request to edit multiple events
 */
-export async function requestBatchPutEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
+export async function putBatchEditEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
  return axios.put(`${rundownPath}/batch`, data);
 }

@@ -46,9 +62,9 @@ export type ReorderEntry = {
 };

 /**
- * HTTP request to reorder events
+ * HTTP request to reorder an entry
 */
-export async function requestReorderEvent(data: ReorderEntry): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function patchReorderEntry(data: ReorderEntry): Promise<AxiosResponse<OntimeEntry>> {
  return axios.patch(`${rundownPath}/reorder`, data);
 }

@@ -67,15 +83,15 @@ export async function requestEventSwap(data: SwapEntry): Promise<AxiosResponse<M
 /**
 * HTTP request to request application of delay
 */
-export async function requestApplyDelay(eventId: string): Promise<AxiosResponse<MessageResponse>> {
-  return axios.patch(`${rundownPath}/applydelay/${eventId}`);
+export async function requestApplyDelay(delayId: string): Promise<AxiosResponse<MessageResponse>> {
+  return axios.patch(`${rundownPath}/applydelay/${delayId}`);
 }

 /**
- * HTTP request to delete given event
+ * HTTP request to delete entries
 */
-export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(rundownPath, { data: { ids: eventIds } });
+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, OntimeRundown } from 'ontime-types';
+import { AuthenticationStatus, CustomFields, Rundown } 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: OntimeRundown;
+  rundown: Rundown;
  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 unrwap a potential axios error
+ * Utility unwrap a potential axios error
 * @param error
 * @returns
 */
@@ -34,7 +34,7 @@ export function maybeAxiosError(error: unknown) {
 }

 /**
- * Utility unrwaps a potential axios error and sends to logger
+ * Utility unwraps a potential axios error and sends to logger
 * @param prepend
 * @param error
 */
@@ -1,12 +0,0 @@
-@use "../../../theme/mixins" as *;
-
-.link {
-  @include action-link;
-  font-size: $inner-section-text-size;
-}
-
-.linkIcon {
-  margin-left: $element-inner-spacing;
-  display: inline-block;
-  @include rotate-fourty-five;
-}
@@ -1,26 +0,0 @@
-import { MouseEvent, ReactNode } from 'react';
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-
-import { openLink } from '../../utils/linkUtils';
-
-import style from './AppLink.module.scss';
-
-interface AppLinkProps {
-  href: string;
-  children: ReactNode;
-}
-
-export default function AppLink(props: AppLinkProps) {
-  const { href, children } = props;
-
-  const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
-    event.preventDefault();
-    openLink(href);
-  };
-
-  return (
-    <a href='#!' target='_blank' rel='noreferrer' className={style.link} onClick={handleClick}>
-      {children} <IoArrowUp className={style.linkIcon} />
-    </a>
-  );
-}
@@ -0,0 +1,26 @@
+.subtle {
+  aspect-ratio: 1;
+  height: 2rem;
+  height: 2rem;
+  display: grid;
+  place-content: center;
+
+  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 {
+    background: $gray-1100;
+    border-color: $gray-1250;
+  }
+
+  &:disabled {
+    background: $gray-1050;
+  }
+}
@@ -0,0 +1,14 @@
+import { ButtonHTMLAttributes } from 'react';
+
+import { cx } from '../../utils/styleUtils';
+
+import style from './IconButton.module.scss';
+
+export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
+  const { className, children, ...buttonProps } = props;
+  return (
+    <button className={cx([style.subtle, className])} {...buttonProps}>
+      {children}
+    </button>
+  );
+}
@@ -0,0 +1,24 @@
+.textEntry {
+  grid-area: input;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  color: $label-gray;
+}
+
+.inlineEntry {
+  display: grid;
+  grid-template-areas:
+    'label label'
+    'input btn';
+  grid-template-columns: 1fr auto;
+  column-gap: 0.5rem;
+}
+
+.redirect {
+  grid-area: btn;
+}
+
+.label {
+  color: $label-gray;
+}
@@ -1,64 +1,125 @@
 import { useState } from 'react';
+import { IoArrowForward } from 'react-icons/io5';
 import {
-  Button,
+  IconButton,
  Input,
-  InputGroup,
-  InputLeftAddon,
  Modal,
  ModalBody,
  ModalCloseButton,
  ModalContent,
-  ModalFooter,
  ModalHeader,
  ModalOverlay,
+  Select,
 } from '@chakra-ui/react';

+import { navigatorConstants } from '../../../viewerConfig';
 import { setClientRemote } from '../../hooks/useSocket';
+import useUrlPresets from '../../hooks-query/useUrlPresets';
+import Info from '../info/Info';
+import AppLink from '../link/app-link/AppLink';
+
+import style from './RedirectClientModal.module.scss';

 interface RedirectClientModalProps {
  id: string;
-  name?: string;
-  path?: string;
+  name: string;
+  currentPath: string;
+  origin: string;
  isOpen: boolean;
  onClose: () => void;
 }

 export function RedirectClientModal(props: RedirectClientModalProps) {
-  const { id, isOpen, name = '', path: currentPath = '', onClose } = props;
+  const { id, isOpen, name, currentPath, origin, onClose } = props;
+  const { data } = useUrlPresets();
  const [path, setPath] = useState(currentPath);
+  const [selected, setSelected] = useState('/');

  const { setRedirect } = setClientRemote;

-  const handleRedirect = () => {
-    if (path !== currentPath && path !== '') {
-      setRedirect({ target: id, redirect: path });
+  const handleRedirect = (newPath: string) => {
+    if (newPath === '/' || newPath === currentPath) {
+      return;
    }
+    setRedirect({ target: id, redirect: newPath });
    onClose();
  };

-  const host = window.location.origin;
-  const canSubmit = path !== currentPath && path !== '';
+  const enabledPresets = data.filter((preset) => preset.enabled);

  return (
    <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
      <ModalOverlay />
-      <ModalContent>
+      <ModalContent maxWidth='max(480px, 35vw)'>
        <ModalHeader>Redirect: {name}</ModalHeader>
        <ModalCloseButton />
        <ModalBody>
-          <InputGroup variant='ontime-filled' size='md'>
-            <InputLeftAddon>{host}</InputLeftAddon>
-            <Input placeholder='minimal?key=0000ffff' value={path} onChange={(event) => setPath(event.target.value)} />
-          </InputGroup>
+          <Info>
+            Remotely redirect the client to a different URL. <br />
+            Either by selecting a URL Preset or entering a custom path.
+            <br />
+            <br />
+            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
+          </Info>
+          <div>
+            <span className={style.label}>Select View or URL Preset</span>
+            <div className={style.textEntry}>
+              <Select
+                size='md'
+                variant='ontime'
+                isDisabled={enabledPresets.length === 0}
+                onChange={(event) => setSelected(event.target.value)}
+              >
+                <option value='/'>Select view or preset</option>
+                {navigatorConstants.map((view) => {
+                  return (
+                    <option key={view.url} value={`/${view.url}`}>
+                      {view.label}
+                    </option>
+                  );
+                })}
+                {enabledPresets.map((preset) => {
+                  return (
+                    <option key={preset.pathAndParams} value={preset.pathAndParams}>
+                      {`Preset: ${preset.alias}`}
+                    </option>
+                  );
+                })}
+              </Select>
+              <IconButton
+                variant='ontime-filled'
+                size='md'
+                aria-label='Redirect to preset'
+                className={style.redirect}
+                icon={<IoArrowForward />}
+                isDisabled={enabledPresets.length === 0 || selected === '/'}
+                onClick={() => handleRedirect(selected)}
+              />
+            </div>
+          </div>
+          <div className={style.inlineEntry}>
+            <span className={style.label}>Enter custom path</span>
+            <label className={style.textEntry}>
+              {origin}
+              <Input
+                variant='ontime-filled'
+                size='md'
+                placeholder='eg. /minimal?key=0000ffff'
+                value={path}
+                onChange={(event) => setPath(event.target.value)}
+              />
+            </label>
+            <IconButton
+              variant='ontime-filled'
+              size='md'
+              aria-label='Redirect'
+              isDisabled={path === currentPath || path === ''}
+              className={style.redirect}
+              icon={<IoArrowForward />}
+              onClick={() => handleRedirect(path)}
+            />
+          </div>
        </ModalBody>
-        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
-            Submit
-          </Button>
-        </ModalFooter>
      </ModalContent>
    </Modal>
  );
@@ -2,8 +2,8 @@
 // https://github.com/lukasbach/chakra-ui-contextmenu/blob/main/src/ContextMenu.tsx

 import { ReactElement } from 'react';
+import { IconType } from 'react-icons';
 import { Menu, MenuButton, MenuGroup, MenuList } from '@chakra-ui/react';
-import { IconType } from '@react-icons/all-files';
 import { create } from 'zustand';

 import { ContextMenuOption } from './ContextMenuOption';
@@ -23,7 +23,7 @@ export type OptionWithoutGroup = {
  withDivider?: boolean;
 };

-export type OptionWithGroup = {
+type OptionWithGroup = {
  label: string;
  group: Omit<OptionWithoutGroup, 'isGroup'>[];
 };
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
+import { IoCheckmark } from 'react-icons/io5';
+import { IoCopy } from 'react-icons/io5';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';
-import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
-import { IoCopy } from '@react-icons/all-files/io5/IoCopy';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { Size } from '../../models/Util.type';
@@ -1,6 +1,5 @@
+import { IoChevronDown, IoChevronUp } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
-import { IoChevronUp } from '@react-icons/all-files/io5/IoChevronUp';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { millisToDelayString } from '../../utils/dateConfig';
@@ -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 { runtimeStore } from '@/common/stores/runtime';
-import { hasConnected, reconnectAttempts, shouldReconnect } from '@/common/utils/socket';
+import { hasConnected, reconnectAttempts } from '../../../common/utils/socket';
+import { runtimeStore } from '../../stores/runtime';

 import style from './ErrorBoundary.module.scss';

@@ -26,17 +26,22 @@ class ErrorBoundary extends React.Component {
      error,
      errorInfo: info,
    });
+    this.reportContent = `${error} ${info.componentStack}`;
+
+    const appState = runtimeStore.getState();
+    if (appState.ping < 0) {
+      return;
+    }

    Sentry.withScope((scope) => {
      scope.setExtras({
        error,
-        store: runtimeStore.getState(),
-        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
+        store: appState,
+        hasSocket: { hasConnected, reconnectAttempts },
      });
      const eventId = Sentry.captureException(error);
      this.setState({ eventId, info });
    });
-    this.reportContent = `${error} ${info.componentStack}`;
  }

  render() {
@@ -2,14 +2,19 @@
  display: flex;
  align-items: center;
  gap: $element-spacing;
-  padding: 1rem;
-  margin-bottom: 1rem;

-  background-color: $gray-1100;
-  border-radius: 2px;
-  font-size: $inner-section-text-size;
+  background-color: $gray-1200;
+  border-radius: 3px;
+  font-size: $text-body-size;
+  padding: 1rem;
+
+  .content {
+    color: $gray-200;
+  }

  svg {
+    min-width: 1.5rem;
+    align-self: start;
    font-size: 1.5rem;
    color: $info-blue;
  }
@@ -1,13 +1,21 @@
 import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
+import { IoAlertCircle } from 'react-icons/io5';
+
+import { cx } from '../../utils/styleUtils';

 import style from './Info.module.scss';

-export default function Info({ children }: PropsWithChildren) {
+interface InfoProps {
+  className?: string;
+}
+
+export default function Info(props: PropsWithChildren<InfoProps>) {
+  const { className, children } = props;
+
  return (
-    <div className={style.infoLabel}>
+    <div className={cx([style.infoLabel, className])}>
      <IoAlertCircle />
-      {children}
+      <div>{children}</div>
    </div>
  );
 }
@@ -1,4 +1,4 @@
-import { IoBan } from '@react-icons/all-files/io5/IoBan';
+import { IoBan } from 'react-icons/io5';

 import { cx } from '../../../utils/styleUtils';

@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
+import { IoEyedrop } from 'react-icons/io5';
 import { ViewSettings } from 'ontime-types';

-import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
-import { debounce } from '../../../../common/utils/debounce';
+import { debounce } from '../../../utils/debounce';
 import { cx, getAccessibleColour } from '../../../utils/styleUtils';
+import PopoverPicker from '../popover-picker/PopoverPicker';

 import style from './SwatchSelect.module.scss';

@@ -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 { useEventAction } from '../../../hooks/useEventAction';
+import { useEntryActions } from '../../../hooks/useEntryAction';

 import style from './DelayInput.module.scss';

@@ -13,7 +13,7 @@ interface DelayInputProps {

 export default function DelayInput(props: DelayInputProps) {
  const { eventId, duration } = props;
-  const { updateEvent } = useEventAction();
+  const { updateEntry } = useEntryActions();

  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) => {
-    updateEvent({
+    updateEntry({
      id: eventId,
      duration: value,
    });
@@ -17,6 +17,7 @@ export default function useReactiveTextInput(
    submitOnCtrlEnter?: boolean;
    onCancelUpdate?: () => void;
    allowSubmitSameValue?: boolean;
+    allowKeyboardNavigation?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -58,7 +59,14 @@ export default function useReactiveTextInput(
          setText(cleanVal);
        }
      }
-      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+
+      setTimeout(() => {
+        if (options?.allowKeyboardNavigation) {
+          ref.current?.parentElement?.focus(); // Focus on parent element to continue keyboard navigation
+        } else {
+          ref.current?.blur();
+        }
+      }); // Immediate timeout to ensure text is set before blurring
    },
    [initialText, options, ref, submitCallback],
  );
@@ -70,12 +78,25 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
+    // force the text to be the initial value
+    if (ref.current) {
+      ref.current.value = initialText;
+    }
    options?.onCancelUpdate?.();
-    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before blurring
  }, [initialText, options, ref]);

  const keyHandler = useMemo(() => {
-    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
+    const hotKeys: HotkeyItem[] = [
+      [
+        'Escape',
+        (event) => {
+          event.preventDefault();
+          handleEscape();
+        },
+        { preventDefault: true },
+      ],
+    ];

    if (options?.submitOnEnter) {
      hotKeys.push(['Enter', () => handleSubmit(text)]);
@@ -84,7 +105,22 @@ export default function useReactiveTextInput(
    if (options?.submitOnCtrlEnter) {
      hotKeys.push(['mod + Enter', () => handleSubmit(text)]);
    }
-    return getHotkeyHandler(hotKeys);
+
+    const hotKeyHandler = getHotkeyHandler(hotKeys);
+
+    return (event: KeyboardEvent<HTMLElement>) => {
+      // allow moving in input field with arrow keys
+      if (
+        event.key === 'ArrowLeft' ||
+        event.key === 'ArrowRight' ||
+        event.key === 'ArrowUp' ||
+        event.key === 'ArrowDown'
+      ) {
+        event.stopPropagation();
+      }
+
+      hotKeyHandler(event);
+    };
  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
@@ -0,0 +1,11 @@
+.link {
+  color: $label-gray;
+  font-size: $text-body-size;
+  text-decoration: underline;
+  text-underline-offset: 2px;
+  color: $blue-400;
+
+  &:hover {
+    color: $blue-500;
+  }
+}
@@ -0,0 +1,25 @@
+import { type PropsWithChildren } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import style from './AppLink.module.scss';
+
+interface AppLinkProps {
+  search: string;
+}
+
+/**
+ * Component used to navigate to an editor link inside the same window
+ * Handles the path to respect Ontime Clouds base URL
+ */
+export default function AppLink(props: PropsWithChildren<AppLinkProps>) {
+  const { search, children } = props;
+  const navigate = useNavigate();
+
+  const handleClick = () => navigate({ search });
+
+  return (
+    <button onClick={handleClick} className={style.link}>
+      {children}
+    </button>
+  );
+}
@@ -1,8 +1,8 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
+import { IoOpenOutline } from 'react-icons/io5';

-import { openLink } from '../../utils/linkUtils';
-import { cx } from '../../utils/styleUtils';
+import { openLink } from '../../../utils/linkUtils';
+import { cx } from '../../../utils/styleUtils';

 import style from './ExternalLink.module.scss';

@@ -14,7 +14,6 @@ interface ExternalLinkProps {

 export default function ExternalLink(props: ExternalLinkProps) {
  const { href, inline, children } = props;
-  const classes = cx([style.link, inline ? style.inline : null]);

  const handleClick = (event: MouseEvent) => {
    event.preventDefault();
@@ -22,8 +21,14 @@ export default function ExternalLink(props: ExternalLinkProps) {
  };

  return (
-    <a href='#!' target='_blank' rel='noreferrer' className={classes} onClick={handleClick}>
-      {children} <IoOpenOutline />
+    <a
+      href='#!'
+      target='_blank'
+      rel='noreferrer'
+      className={cx([style.link, inline && style.inline])}
+      onClick={handleClick}
+    >
+      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
    </a>
  );
 }
@@ -1,45 +0,0 @@
-$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;
-  }
-}
@@ -1,9 +0,0 @@
-import style from './LoaderOverlay.module.scss';
-
-export default function LoaderOverlay() {
-  return (
-    <div className={style.overlay}>
-      <span className={style.loader} />
-    </div>
-  );
-}
@@ -1,7 +1,8 @@
-import { IoApps } from '@react-icons/all-files/io5/IoApps';
-import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
+import { IoApps } from 'react-icons/io5';
+import { IoSettingsOutline } from 'react-icons/io5';

-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
+import { cx } from '../../utils/styleUtils';

 import style from './NavigationMenu.module.scss';

@@ -15,7 +16,7 @@ export default function FloatingNavigation(props: FloatingNavigationProps) {
  const isButtonShown = useFadeOutOnInactivity();

  return (
-    <div className={`${style.buttonContainer} ${!isButtonShown ? style.hidden : ''}`}>
+    <div className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}>
      <button
        onClick={toggleMenu}
        aria-label='toggle menu'
@@ -7,24 +7,38 @@ $icon-color: $ui-white;
 $button-bg: $gray-1050;
 $button-size: 3rem;

+.fadeable {
+  opacity: 1;
+
+  transition-property: opacity;
+  transition-duration: 0.3s;
+
+  &.hidden {
+    opacity: 0;
+  }
+}
+
+.lockIcon {
+  font-size: 1.5rem;
+  color: $active-indicator;
+  padding: 0.5em;
+
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: 12;
+}
+
 .buttonContainer {
  display: flex;
  flex-direction: column;
  row-gap: 1rem;
  padding: 0.5em;

-  transition-property: opacity;
-  transition-duration: 0.3s;
-
-  opacity: 1;
  position: fixed;
  left: 0;
  top: 0;
  z-index: 12;
-
-  &.hidden {
-    opacity: 0;
-  }
 }

 .button {
@@ -38,16 +52,6 @@ $button-size: 3rem;
  border-radius: 3px;
 }

-.lockIcon {
-  font-size: 1.5rem;
-  display: grid;
-  place-content: center;
-  border-radius: 3px;
-  background-color: transparent;
-  color: $active-indicator;
-  cursor: default;
-}
-
 .navButton {
  @extend .button;
  z-index: 3;
@@ -1,5 +1,6 @@
 import { memo, PropsWithChildren } from 'react';
 import { createPortal } from 'react-dom';
+import { IoArrowUp, IoContract, IoExpand, IoLockClosedOutline, IoSwapVertical } from 'react-icons/io5';
 import { Link, useLocation } from 'react-router-dom';
 import {
  Drawer,
@@ -11,11 +12,6 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';
 import { useFullscreen } from '@mantine/hooks';
-import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-import { IoContract } from '@react-icons/all-files/io5/IoContract';
-import { IoExpand } from '@react-icons/all-files/io5/IoExpand';
-import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
-import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

 import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
@@ -1,16 +0,0 @@
-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 { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
+import { IoLockClosedOutline } from 'react-icons/io5';

-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
+import { cx } from '../../utils/styleUtils';

 import style from './NavigationMenu.module.scss';

@@ -8,8 +9,8 @@ export default function ViewLockedIcon() {
  const isLockIconShown = useFadeOutOnInactivity();

  return (
-    <div className={`${style.buttonContainer} ${!isLockIconShown ? style.hidden : ''}`}>
-      <IoLockClosedOutline className={style.lockIcon} />
+    <div className={cx([style.fadeable, style.lockIcon, !isLockIconShown && style.hidden])}>
+      <IoLockClosedOutline />
    </div>
  );
 }
@@ -1,23 +1,20 @@
-import { memo, useCallback } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { memo } from 'react';
 import { useDisclosure } from '@chakra-ui/react';

-import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
-
 import FloatingNavigation from './FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
+import useViewEditor from './useViewEditor';
 import ViewLockedIcon from './ViewLockedIcon';

-function ViewNavigationMenu() {
-  const [searchParams, setSearchParams] = useSearchParams();
+interface ViewNavigationMenuProps {
+  isLockable?: boolean;
+}
+
+function ViewNavigationMenu(props: ViewNavigationMenuProps) {
+  const { isLockable } = props;
+
  const { isOpen: isMenuOpen, onOpen: onMenuOpen, onClose: onMenuClose } = useDisclosure();
-
-  const isViewLocked = isStringBoolean(searchParams.get('locked'));
-
-  const showEditFormDrawer = useCallback(() => {
-    searchParams.set('edit', 'true');
-    setSearchParams(searchParams);
-  }, [searchParams, setSearchParams]);
+  const { showEditFormDrawer, isViewLocked } = useViewEditor({ isLockable });

  const toggleMenu = () => (isMenuOpen ? onMenuClose() : onMenuOpen());

@@ -0,0 +1,26 @@
+import { useCallback, useMemo } from 'react';
+import { useSearchParams } from 'react-router-dom';
+
+import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
+
+interface EditorVisibilityOptions {
+  isLockable?: boolean;
+}
+
+export default function useViewEditor({ isLockable }: EditorVisibilityOptions) {
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const showEditFormDrawer = useCallback(() => {
+    searchParams.set('edit', 'true');
+    setSearchParams(searchParams);
+  }, [searchParams, setSearchParams]);
+
+  const isViewLocked = useMemo(() => {
+    if (!isLockable) {
+      return false;
+    }
+    return isStringBoolean(searchParams.get('locked'));
+  }, [isLockable, searchParams]);
+
+  return { showEditFormDrawer, isViewLocked };
+}
@@ -1,7 +1,5 @@
+import { IoPause, IoPlay, IoStop } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
-import { IoPause } from '@react-icons/all-files/io5/IoPause';
-import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
-import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { Playback } from 'ontime-types';

 import { tooltipDelayFast } from '../../../ontimeConfig';
@@ -9,10 +9,6 @@ $progress-bar-br: 3px;
  border-radius: $progress-bar-br;
  background-color: var(--timer-progress-bg-override, $viewer-card-bg-color);
  overflow: clip;
-
-  &--hidden {
-    display: none;
-  }
 }

 .progress-bar__indicator {
@@ -7,16 +7,15 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
-  hidden?: boolean;
  className?: string;
 }

 export default function ProgressBar(props: ProgressBarProps) {
-  const { current, duration, hidden, className = '' } = props;
+  const { current, duration, className } = props;
  const progress = getProgress(current, duration);

  return (
-    <div className={`progress-bar__bg ${hidden ? 'progress-bar__bg--hidden' : ''} ${className}`}>
+    <div className={`progress-bar__bg ${className}`}>
      <div className='progress-bar__indicator' style={{ width: `${progress}%` }} />
    </div>
  );
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
+import { IoCheckmark } from 'react-icons/io5';
 import { IconButton, PinInput, PinInputField } from '@chakra-ui/react';
-import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';

 import style from './ProtectRoute.module.scss';

@@ -1,76 +0,0 @@
-@use '../../../theme/viewerDefs' as *;
-
-.schedule {
-  width: 100%;
-  border-spacing: 50px;
-
-  .entry {
-    font-size: clamp(16px, 1.5vw, 24px);
-
-    .entry-colour {
-      background-color: var(--card-background-color-override, $viewer-card-bg-color);
-      height: clamp(8px, 0.75vw, 12px);
-      width: clamp(8px, 0.75vw, 12px);
-      border-radius: 6px;
-      display: inline-block;
-    }
-
-    .entry-times {
-      font-family: $viewer-font-family;
-      color: var(--secondary-color-override, $viewer-secondary-color);
-      font-weight: 300;
-      letter-spacing: 0.05em;
-      display: flex;
-      align-items: center;
-      gap: 8px;
-    }
-
-    .entry-title {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .entry-secondary {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    &:not(:last-child) {
-      padding-bottom: 8px;
-    }
-
-    &--past {
-      color: var(--secondary-color-override, $viewer-secondary-color);
-    }
-
-    &--now {
-      .entry-title {
-        color: var(--accent-color-override, $accent-color);
-        font-weight: 600;
-      }
-    }
-
-    &.skip {
-      text-decoration: line-through;
-    }
-  }
-}
-
-.schedule-nav {
-  display: flex;
-  justify-content: flex-end;
-
-  .schedule-nav__item {
-    background-color: var(--card-background-color-override, $viewer-card-bg-color);
-    width: 12px;
-    height: 12px;
-    border-radius: 6px;
-    margin-left: 8px;
-
-    &--selected {
-      background-color: var(--color-override, $viewer-color);
-    }
-  }
-}
@@ -1,52 +0,0 @@
-import { useSchedule } from './ScheduleContext';
-import ScheduleItem from './ScheduleItem';
-
-import './Schedule.scss';
-
-interface ScheduleProps {
-  isProduction?: boolean;
-  className?: string;
-}
-
-export default function Schedule({ isProduction, className }: ScheduleProps) {
-  const { paginatedEvents, selectedEventId, isBackstage, scheduleType } = useSchedule();
-
-  // TODO: design a nice placeholder for empty schedules
-  if (paginatedEvents?.length < 1) {
-    return null;
-  }
-
-  let selectedState: 'past' | 'now' | 'future' = 'past';
-
-  return (
-    <ul className={`schedule ${className}`}>
-      {paginatedEvents.map((event) => {
-        if (scheduleType === 'past' || scheduleType === 'future') {
-          selectedState = scheduleType;
-        } else {
-          if (event.id === selectedEventId) {
-            selectedState = 'now';
-          } else if (selectedState === 'now') {
-            selectedState = 'future';
-          }
-        }
-
-        const timeStart = isProduction ? event.timeStart + (event?.delay ?? 0) : event.timeStart;
-        const timeEnd = isProduction ? event.timeEnd + (event?.delay ?? 0) : event.timeEnd;
-
-        return (
-          <ScheduleItem
-            key={event.id}
-            selected={selectedState}
-            timeStart={timeStart}
-            timeEnd={timeEnd}
-            title={event.title}
-            colour={isBackstage ? event.colour : ''}
-            backstageEvent={!event.isPublic}
-            skip={event.skip}
-          />
-        );
-      })}
-    </ul>
-  );
-}
@@ -1,102 +0,0 @@
-import { createContext, PropsWithChildren, useContext, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { OntimeEvent } from 'ontime-types';
-
-import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
-import { useInterval } from '../../hooks/useInterval';
-
-interface ScheduleContextState {
-  events: OntimeEvent[];
-  paginatedEvents: OntimeEvent[];
-  selectedEventId: string | null;
-  scheduleType: 'past' | 'now' | 'future';
-  numPages: number;
-  visiblePage: number;
-  isBackstage: boolean;
-}
-
-const ScheduleContext = createContext<ScheduleContextState | undefined>(undefined);
-
-interface ScheduleProviderProps {
-  events: OntimeEvent[];
-  selectedEventId: string | null;
-  isBackstage?: boolean;
-  time?: number;
-}
-
-const numEventsPerPage = 8;
-
-export const ScheduleProvider = ({
-  children,
-  events,
-  selectedEventId,
-  isBackstage = false,
-  time = 10,
-}: PropsWithChildren<ScheduleProviderProps>) => {
-  const [visiblePage, setVisiblePage] = useState(0);
-  const [searchParams] = useSearchParams();
-
-  // look for overrides from views
-  const hidePast = isStringBoolean(searchParams.get('hidePast'));
-  const stopCycle = isStringBoolean(searchParams.get('stopCycle'));
-  const eventsPerPage = Number(searchParams.get('eventsPerPage') ?? numEventsPerPage);
-
-  let selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);
-
-  const viewEvents = [...events];
-  if (hidePast) {
-    // we want to show the event after the next
-    viewEvents.splice(0, selectedEventIndex + 2);
-    selectedEventIndex = 0;
-  }
-
-  const numPages = Math.ceil(viewEvents.length / eventsPerPage);
-  const eventStart = eventsPerPage * visiblePage;
-  const eventEnd = eventsPerPage * (visiblePage + 1);
-  const paginatedEvents = viewEvents.slice(eventStart, eventEnd);
-
-  const resolveScheduleType = () => {
-    if (selectedEventIndex >= eventStart && selectedEventIndex < eventEnd) {
-      return 'now';
-    }
-    if (selectedEventIndex > eventEnd) {
-      return 'past';
-    }
-    return 'future';
-  };
-  const scheduleType = resolveScheduleType();
-
-  // every SCROLL_TIME go to the next array
-  useInterval(() => {
-    if (stopCycle) {
-      setVisiblePage(0);
-    } else if (events.length > eventsPerPage) {
-      const next = (visiblePage + 1) % numPages;
-      setVisiblePage(next);
-    }
-  }, time * 1000);
-
-  return (
-    <ScheduleContext.Provider
-      value={{
-        events,
-        paginatedEvents,
-        selectedEventId,
-        scheduleType,
-        numPages,
-        visiblePage,
-        isBackstage,
-      }}
-    >
-      {children}
-    </ScheduleContext.Provider>
-  );
-};
-
-export const useSchedule = () => {
-  const context = useContext(ScheduleContext);
-  if (!context) {
-    throw new Error('useSchedule() can only be used inside a ScheduleContext');
-  }
-  return context;
-};
@@ -1,43 +0,0 @@
-import SuperscriptTime from '../../../features/viewers/common/superscript-time/SuperscriptTime';
-import { formatTime } from '../../utils/time';
-
-import './Schedule.scss';
-
-const formatOptions = {
-  format12: 'hh:mm a',
-  format24: 'HH:mm',
-};
-
-interface ScheduleItemProps {
-  selected: 'past' | 'now' | 'future';
-  timeStart: number;
-  timeEnd: number;
-  title: string;
-  backstageEvent: boolean;
-  colour: string;
-  skip: boolean;
-}
-
-export default function ScheduleItem(props: ScheduleItemProps) {
-  const { selected, timeStart, timeEnd, title, backstageEvent, colour, skip } = props;
-
-  const start = formatTime(timeStart, formatOptions);
-  const end = formatTime(timeEnd, formatOptions);
-  const userColour = colour !== '' ? colour : '';
-  const selectStyle = `entry--${selected}`;
-
-  return (
-    <li className={`entry ${selectStyle} ${skip ? 'skip' : ''}`}>
-      <div className='entry-times'>
-        <span className='entry-colour' style={{ backgroundColor: userColour }} />
-        <div style={{ display: 'flex' }}>
-          <SuperscriptTime time={start} />
-          {' → '}
-          <SuperscriptTime time={end} />
-          {backstageEvent ? '*' : ''}
-        </div>
-      </div>
-      <div className='entry-title'>{title}</div>
-    </li>
-  );
-}
@@ -1,23 +0,0 @@
-import { useSchedule } from './ScheduleContext';
-
-import './Schedule.scss';
-
-interface ScheduleNavProps {
-  className?: string;
-}
-
-export default function ScheduleNav({ className }: ScheduleNavProps) {
-  const { numPages, visiblePage } = useSchedule();
-
-  return (
-    <div className={`schedule-nav ${className}`}>
-      {numPages > 1 &&
-        [...Array(numPages).keys()].map((i) => (
-          <div
-            key={i}
-            className={i === visiblePage ? 'schedule-nav__item schedule-nav__item--selected' : 'schedule-nav__item'}
-          />
-        ))}
-    </div>
-  );
-}
@@ -5,7 +5,7 @@

  .empty {
    width: 100%;
-    opacity: 0.6;
+    opacity: 0.8;
  }

  .text {
@@ -1,18 +1,20 @@
 import { CSSProperties } from 'react';

 import EmptyImage from '../../../assets/images/empty.svg?react';
+import { cx } from '../../utils/styleUtils';

 import style from './Empty.module.scss';

 interface EmptyProps {
  text?: string;
  style?: CSSProperties;
+  className?: string;
 }

 export default function Empty(props: EmptyProps) {
-  const { text, ...rest } = props;
+  const { text, className, ...rest } = props;
  return (
-    <div className={style.emptyContainer} {...rest}>
+    <div className={cx([style.emptyContainer, className])} {...rest}>
      <EmptyImage className={style.empty} />
      {text && <span className={style.text}>{text}</span>}
    </div>
@@ -1,8 +1,5 @@
@use '../../../theme/viewerDefs' as *;

-$title-primary-size: clamp(1.5rem, 3vw, 3rem);
-$title-secondary-size: clamp(1rem, 2vw, 2.25rem);
-
 .title-card {
  position: relative;
  display: flex;
@@ -10,21 +7,23 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);
 }

 .title-card__title,
-.title-card__secondary {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.title-card__title {
+.title-card__placeholder {
  font-weight: 600;
-  font-size: $title-primary-size;
-  color: var(--color-override, $viewer-color);
+  font-size: $title-font-size;
  line-height: 1.2em;
 }

+.title-card__title {
+  color: var(--color-override, $viewer-color);
+  padding-right: 1em;
+}
+
+.title-card__placeholder {
+  color: var(--label-color-override, $viewer-label-color);
+}
+
 .title-card__secondary {
-  font-size: $title-secondary-size;
+  font-size: $base-font-size;
  color: var(--secondary-color-override, $viewer-secondary-color);
  line-height: 1.2em;
 }
@@ -35,7 +34,6 @@ $title-secondary-size: clamp(1rem, 2vw, 2.25rem);
  top: 0.5rem;
  font-size: $timer-label-size;
  color: var(--secondary-color-override, $viewer-secondary-color);
-  margin-left: auto;
  text-transform: uppercase;

  &--accent {
@@ -1,6 +1,7 @@
 import { ForwardedRef, forwardRef } from 'react';

 import { useTranslation } from '../../../translation/TranslationProvider';
+import { cx } from '../../utils/styleUtils';

 import './TitleCard.scss';

@@ -18,9 +19,9 @@ const TitleCard = forwardRef((props: TitleCardProps, ref: ForwardedRef<HTMLDivEl
  const accent = label === 'now';

  return (
-    <div className={`title-card ${className}`} ref={ref}>
+    <div className={cx(['title-card', className])} ref={ref}>
      <span className='title-card__title'>{title}</span>
-      <span className={accent ? 'title-card__label title-card__label--accent' : 'title-card__label'}>
+      <span className={cx(['title-card__label', accent && 'title-card__label--accent'])}>
        {label && getLocalizedString(`common.${label}`)}
      </span>
      <div className='title-card__secondary'>{secondary}</div>
@@ -0,0 +1,5 @@
+.viewLogo {
+  max-width: 100%;
+  max-height: 75px;
+  display: block;
+}
@@ -1,5 +1,7 @@
 import { projectLogoPath } from '../../api/constants';

+import './ViewLogo.scss';
+
 interface ViewLogoProps {
  name: string;
  className: string;
@@ -7,5 +9,11 @@ interface ViewLogoProps {

 export default function ViewLogo(props: ViewLogoProps) {
  const { name, className } = props;
-  return <img src={`${projectLogoPath}/${name}`} className={className} />;
+
+  // we wrap the image in a div to help maintain the aspect ratio
+  return (
+    <div className={className}>
+      <img alt='' src={`${projectLogoPath}/${name}`} className='viewLogo' />
+    </div>
+  );
 }
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { IoChevronDown } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import {
  Button,
@@ -13,7 +14,6 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';

@@ -119,16 +119,16 @@ function MultiOption(props: EditFormMultiOptionProps) {
        <MenuButton as={Button} variant='ontime-subtle-white' position='relative' width='fit-content' fontWeight={400}>
          {paramField.title} <IoChevronDown style={{ display: 'inline' }} />
        </MenuButton>
-        <MenuList>
+        <MenuList overflow='auto' maxHeight='200px'>
          <MenuOptionGroup
            type='checkbox'
            value={paramState}
            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
          >
            {Object.values(paramField.values).map((option) => {
-              const { value, label } = option;
+              const { value, label, colour } = option;
              return (
-                <MenuItemOption value={value} key={value}>
+                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
                  {label}
                </MenuItemOption>
              );
@@ -16,3 +16,7 @@
  overflow-y: scroll;
  padding-right: 0.5rem;
 }
+
+.info {
+  margin-bottom: 1rem;
+}
@@ -12,7 +12,7 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

-import useViewSettings from '../../../common/hooks-query/useViewSettings';
+import useViewSettings from '../../hooks-query/useViewSettings';
 import Info from '../info/Info';

 import { ViewOption } from './types';
@@ -132,7 +132,9 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
        </DrawerHeader>

        <DrawerBody>
-          {viewSettings.overrideStyles && <Info>This view style is being modified by a custom CSS file.</Info>}
+          {viewSettings.overrideStyles && (
+            <Info className={style.info}>This view style is being modified by a custom CSS file.</Info>
+          )}
          <form id='edit-params-form' onSubmit={onParamsFormSubmit} className={style.sectionList}>
            {viewOptions.map((section) => (
              <ViewParamsSection
@@ -1,5 +1,5 @@
+import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { cx } from '../../utils/styleUtils';

@@ -0,0 +1,45 @@
+import { CustomFields } from 'ontime-types';
+
+import { makeOptionsFromCustomFields } from '../constants';
+
+describe('makeOptionsFromCustomFields', () => {
+  const testCustomFields: CustomFields = {
+    field1: { label: 'Field 1', colour: 'red', type: 'string' },
+    field2: { label: 'Field 2', colour: 'blue', type: 'string' },
+  };
+
+  it('creates a record of keys for the given custom fields', () => {
+    const result = makeOptionsFromCustomFields(testCustomFields);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+    });
+  });
+
+  it('appends additional data', () => {
+    const additionalData = {
+      test1: 'test1',
+      test2: 'test2',
+    };
+    const result = makeOptionsFromCustomFields(testCustomFields, additionalData);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+      test1: 'test1',
+      test2: 'test2',
+    });
+  });
+
+  it('filtersImageTypes', () => {
+    const customFieldsWIthImage: CustomFields = {
+      ...testCustomFields,
+      field3: { label: 'Field 3', colour: 'green', type: 'image' },
+    };
+
+    const result = makeOptionsFromCustomFields(customFieldsWIthImage);
+    expect(result).toStrictEqual({
+      'custom-field1': 'Custom: Field 1',
+      'custom-field2': 'Custom: Field 2',
+    });
+  });
+});
@@ -1,17 +1,34 @@
 import { CustomFields } from 'ontime-types';

-import type { ParamField } from './types';
+import type { MultiselectOptions, ParamField } from './types';

 export const makeOptionsFromCustomFields = (
  customFields: CustomFields,
-  additionalOptions: Record<string, string> = {},
+  additionalOptions: Readonly<Record<string, string>> = {},
+  filterImageType = true,
 ) => {
-  return Object.entries(customFields).reduce((options, [key, value]) => {
+  const options = { ...additionalOptions };
+  for (const [key, value] of Object.entries(customFields)) {
+    if (filterImageType && value.type === 'image') {
+      continue;
+    }
+
    options[`custom-${key}`] = `Custom: ${value.label}`;
-    return options;
-  }, additionalOptions);
+  }
+  return options;
 };

+export function makeCustomFieldSelectOptions(customFields: CustomFields, filterImageType = true): MultiselectOptions {
+  const options: MultiselectOptions = {};
+  for (const [key, value] of Object.entries(customFields)) {
+    if (filterImageType && value.type === 'image') {
+      continue;
+    }
+    options[key] = { value: key, label: value.label, colour: value.colour };
+  }
+  return options;
+}
+
 export const getTimeOption = (timeFormat: string): ParamField => {
  const placeholder = `${timeFormat} (default)`;
  return {
@@ -12,9 +12,11 @@ type OptionsField = {
  defaultValue?: string;
 };

+type MultiselectOption = { value: string; label: string; colour: string };
+export type MultiselectOptions = Record<string, MultiselectOption>;
 type MultiOptionsField = {
  type: 'multi-option';
-  values: Record<string, { value: string; label: string; colour: string }>;
+  values: MultiselectOptions;
  defaultValue?: string;
 };

@@ -1,32 +0,0 @@
-// 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,11 +1,9 @@
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
-import { editAutomationSettings, getAutomationSettings } from '../api/automation';
+import { 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({
@@ -20,15 +18,3 @@ 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: '',
 };

-export function useProjectList() {
+function useProjectList() {
  const { data, status, refetch } = useQuery({
    queryKey: PROJECT_LIST,
    queryFn: getProjects,
@@ -0,0 +1,20 @@
+import { useQuery } from '@tanstack/react-query';
+import { OntimeReport } from 'ontime-types';
+import { MILLIS_PER_HOUR } from 'ontime-utils';
+
+import { REPORT } from '../api/constants';
+import { fetchReport } from '../api/report';
+
+export default function useReport() {
+  const { data, refetch } = useQuery<OntimeReport>({
+    queryKey: REPORT,
+    queryFn: fetchReport,
+    placeholderData: (previousData, _previousQuery) => previousData,
+    retry: 5,
+    retryDelay: (attempt) => attempt * 2500,
+    networkMode: 'always',
+    staleTime: MILLIS_PER_HOUR,
+  });
+
+  return { data: data ?? {}, refetch };
+}
@@ -1,20 +1,30 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';
+import { OntimeEntry, Rundown } from 'ontime-types';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
-import { fetchNormalisedRundown } from '../api/rundown';
+import { fetchCurrentRundown } from '../api/rundown';

 import useProjectData from './useProjectData';

 // revision is -1 so that the remote revision is higher
-const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };
+const cachedRundownPlaceholder: Rundown = {
+  id: 'default',
+  title: '',
+  order: [],
+  flatOrder: [],
+  entries: {},
+  revision: -1,
+};

+/**
+ * Normalised rundown data
+ */
 export default function useRundown() {
-  const { data, status, isError, refetch, isFetching } = useQuery<RundownCached>({
+  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
    queryKey: RUNDOWN,
-    queryFn: fetchNormalisedRundown,
+    queryFn: fetchCurrentRundown,
    placeholderData: (previousData, _previousQuery) => previousData,
    retry: 5,
    retryDelay: (attempt) => attempt * 2500,
@@ -24,22 +34,26 @@ export default function useRundown() {
  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
 }

+/**
+ * Provides access to a flat rundown
+ * built from the order and rundown fields
+ */
 export function useFlatRundown() {
  const { data, status } = useRundown();
  const { data: projectData } = useProjectData();

  const loadedProject = useRef<string>('');
  const [prevRevision, setPrevRevision] = useState<number>(-1);
-  const [flatRunDown, setFlatRunDown] = useState<OntimeRundown>([]);
+  const [flatRundown, setFlatRundown] = useState<OntimeEntry[]>([]);

  // update data whenever the revision changes
  useEffect(() => {
    if (data.revision !== -1 && data.revision !== prevRevision) {
-      const flatRundown = data.order.map((id) => data.rundown[id]);
-      setFlatRunDown(flatRundown);
+      const flatRundown = data.order.map((id) => data.entries[id]);
+      setFlatRundown(flatRundown);
      setPrevRevision(data.revision);
    }
-  }, [data.order, data.revision, data.rundown, prevRevision]);
+  }, [data.entries, data.order, data.revision, prevRevision]);

  // TODO: should we have a project id field?
  // invalidate current version if project changes
@@ -50,5 +64,17 @@ 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) {
+  const { data, status } = useFlatRundown();
+  const filteredData = useMemo(() => {
+    return data.filter(cb);
+  }, [data, cb]);
+
+  return { data: filteredData, status };
 }
@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
+import { useShallow } from 'zustand/shallow';

 import { useClientStore } from '../stores/clientStore';
 import { socketSendJson } from '../utils/socket';
@@ -9,10 +10,12 @@ import { useIsOnline } from './useSocket';
 export const useClientPath = () => {
  const navigate = useNavigate();
  const { pathname, search } = useLocation();
-  const { redirect, setRedirect } = useClientStore((store) => ({
-    redirect: store.redirect,
-    setRedirect: store.setRedirect,
-  }));
+  const { redirect, setRedirect } = useClientStore(
+    useShallow((store) => ({
+      redirect: store.redirect,
+      setRedirect: store.setRedirect,
+    })),
+  );
  const isOnline = useIsOnline();

  // notify of client path changes
@@ -1,29 +1,30 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
+  EntryId,
  isOntimeEvent,
+  MaybeString,
  OntimeBlock,
-  OntimeDelay,
+  OntimeEntry,
  OntimeEvent,
-  OntimeRundownEntry,
-  RundownCached,
+  Rundown,
  TimeField,
  TimeStrategy,
  TransientEventPayload,
 } from 'ontime-types';
-import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
+import { dayInMs, generateId, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';

 import { RUNDOWN } from '../api/constants';
 import {
+  deleteEntries,
+  patchReorderEntry,
+  postAddEntry,
+  putBatchEditEvents,
+  putEditEntry,
  ReorderEntry,
  requestApplyDelay,
-  requestBatchPutEvents,
-  requestDelete,
  requestDeleteAll,
  requestEventSwap,
-  requestPostEvent,
-  requestPutEvent,
-  requestReorderEvent,
  SwapEntry,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
@@ -31,18 +32,18 @@ import { useEditorSettings } from '../stores/editorSettings';

 export type EventOptions = Partial<{
  // options to any new block (event / delay / block)
-  after: string;
-  before: string;
+  after: MaybeString;
+  before: MaybeString;
  // options to blocks of type OntimeEvent
  defaultPublic: boolean;
  linkPrevious: boolean;
-  lastEventId: string;
+  lastEventId: MaybeString;
 }>;

 /**
- * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
+ * Gather utilities for actions on entries
 */
-export const useEventAction = () => {
+export const useEntryActions = () => {
  const queryClient = useQueryClient();
  const {
    defaultPublic,
@@ -55,12 +56,24 @@ export const useEventAction = () => {
    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 event
+   * Calls mutation to add new entry
   * @private
   */
-  const _addEventMutation = useMutation({
-    mutationFn: requestPostEvent,
+  const _addEntryMutation = useMutation({
+    // TODO(v4): optimistic create entry
+    mutationFn: postAddEntry,
    onSettled: () => {
      queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
@@ -68,14 +81,14 @@ export const useEventAction = () => {
  });

  /**
-   * Adds an event to rundown
+   * Adds an entry to rundown
   */
-  const addEvent = useCallback(
-    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
-      const newEvent: TransientEventPayload = { ...event };
+  const addEntry = useCallback(
+    async (entry: Partial<OntimeEntry>, options?: EventOptions) => {
+      const newEntry: TransientEventPayload = { ...entry, id: generateId() };

      // ************* CHECK OPTIONS specific to events
-      if (isOntimeEvent(newEvent)) {
+      if (isOntimeEvent(newEntry)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
@@ -85,66 +98,60 @@ export const useEventAction = () => {
          linkPrevious: options?.linkPrevious ?? linkPrevious,
        };

-        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
-          newEvent.linkStart = applicationOptions.lastEventId;
-        } else if (applicationOptions?.lastEventId) {
+        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];
+          const rundownData = queryClient.getQueryData<Rundown>(RUNDOWN)!;
+          const previousEvent = rundownData.entries[applicationOptions.lastEventId];
          if (isOntimeEvent(previousEvent)) {
-            newEvent.timeStart = previousEvent.timeEnd;
+            newEntry.timeStart = previousEvent.timeEnd;
          }
        }

        // Override event with options from editor settings
-        if (applicationOptions.defaultPublic) {
-          newEvent.isPublic = true;
+        newEntry.linkStart = applicationOptions.linkPrevious;
+        newEntry.isPublic = applicationOptions.defaultPublic;
+
+        if (newEntry.duration === undefined && newEntry.timeEnd === undefined) {
+          newEntry.duration = parseUserTime(defaultDuration);
        }

-        if (newEvent.duration === undefined && newEvent.timeEnd === undefined) {
-          newEvent.duration = parseUserTime(defaultDuration);
+        if (newEntry.timeDanger === undefined) {
+          newEntry.timeDanger = parseUserTime(defaultDangerTime);
        }

-        if (newEvent.timeDanger === undefined) {
-          newEvent.timeDanger = parseUserTime(defaultDangerTime);
+        if (newEntry.timeWarning === undefined) {
+          newEntry.timeWarning = parseUserTime(defaultWarnTime);
        }

-        if (newEvent.timeWarning === undefined) {
-          newEvent.timeWarning = parseUserTime(defaultWarnTime);
+        if (newEntry.timerType === undefined) {
+          newEntry.timerType = defaultTimerType;
        }

-        if (newEvent.timerType === undefined) {
-          newEvent.timerType = defaultTimerType;
+        if (newEntry.endAction === undefined) {
+          newEntry.endAction = defaultEndAction;
        }

-        if (newEvent.endAction === undefined) {
-          newEvent.endAction = defaultEndAction;
-        }
-
-        if (newEvent.timeStrategy === undefined) {
-          newEvent.timeStrategy = defaultTimeStrategy;
+        if (newEntry.timeStrategy === undefined) {
+          newEntry.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;
+        (newEntry as TransientEventPayload).after = options.after;
      }
      if (options?.before) {
-        // @ts-expect-error -- not sure how to type this, <before> is a transient property
-        newEvent.before = options.before;
+        (newEntry as TransientEventPayload).before = options.before;
      }

      try {
-        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
+        await _addEntryMutation.mutateAsync(newEntry);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
    },
    [
-      _addEventMutation,
+      _addEntryMutation,
      defaultDangerTime,
      defaultDuration,
      defaultEndAction,
@@ -158,26 +165,33 @@ export const useEventAction = () => {
  );

  /**
-   * Calls mutation to update existing event
+   * Calls mutation to update existing entry
   * @private
   */
-  const _updateEventMutation = useMutation({
-    mutationFn: requestPutEvent,
+  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<RundownCached>(RUNDOWN);
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      const eventId = newEvent.id;

      if (previousData && eventId) {
        // optimistically update object
-        const newRundown = { ...previousData.rundown };
+        const newRundown = { ...previousData.entries };
        // @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 });
+        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
@@ -185,7 +199,7 @@ export const useEventAction = () => {
    },
    // Mutation fails, rollback undoes optimist update
    onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
@@ -196,35 +210,35 @@ export const useEventAction = () => {
  });

  /**
-   * Updates existing event
+   * Updates existing entry
   */
-  const updateEvent = useCallback(
-    async (event: Partial<OntimeRundownEntry>) => {
+  const updateEntry = useCallback(
+    async (event: Partial<OntimeEntry>) => {
      try {
-        await _updateEventMutation.mutateAsync(event);
+        await _updateEntryMutation.mutateAsync(event);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
    },
-    [_updateEventMutation],
+    [_updateEntryMutation],
  );

  const updateCustomField = useCallback(
-    async (eventId: string, field: string, value: string) => {
-      updateEvent({ id: eventId, custom: { [field]: value } });
+    async (entryId: EntryId, field: string, value: string) => {
+      updateEntry({ id: entryId, custom: { [field]: value } });
    },
-    [updateEvent],
+    [updateEntry],
  );

  /**
   * Updates time of existing event
-   * @param eventId {string} - id of the 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: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
+    async (eventId: EntryId, field: TimeField, value: string, lockOnUpdate?: boolean) => {
      // an empty value with no lock has no domain validity
      if (!lockOnUpdate && value === '') {
        return;
@@ -246,7 +260,7 @@ export const useEventAction = () => {
          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.linkStart = value === '';
          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
        }
      } else {
@@ -254,7 +268,7 @@ export const useEventAction = () => {
      }

      try {
-        await _updateEventMutation.mutateAsync(newEvent);
+        await _updateEntryMutation.mutateAsync(newEvent);
      } catch (error) {
        logAxiosError('Error updating event', error);
      }
@@ -285,9 +299,9 @@ export const useEventAction = () => {
       * Utility function to get the previous event end time
       */
      function getPreviousEnd(): number {
-        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
+        const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);

-        if (!cachedRundown?.order || !cachedRundown?.rundown) {
+        if (!cachedRundown?.order || !cachedRundown?.entries) {
          return 0;
        }

@@ -297,7 +311,7 @@ export const useEventAction = () => {
        }
        let previousEnd = 0;
        for (let i = index - 1; i >= 0; i--) {
-          const event = cachedRundown.rundown[cachedRundown.order[i]];
+          const event = cachedRundown.entries[cachedRundown.order[i]];
          if (isOntimeEvent(event)) {
            previousEnd = event.timeEnd;
            break;
@@ -306,7 +320,7 @@ export const useEventAction = () => {
        return previousEnd;
      }
    },
-    [_updateEventMutation, queryClient],
+    [_updateEntryMutation, queryClient],
  );

  /**
@@ -314,17 +328,17 @@ export const useEventAction = () => {
   * @private
   */
  const _batchUpdateEventsMutation = useMutation({
-    mutationFn: requestBatchPutEvents,
+    mutationFn: putBatchEditEvents,
    onMutate: async ({ ids, data }) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });

      // Snapshot the previous value
-      const previousEvents = queryClient.getQueryData<RundownCached>(RUNDOWN);
+      const previousRundown = queryClient.getQueryData<Rundown>(RUNDOWN);

-      if (previousEvents) {
+      if (previousRundown) {
        const eventIds = new Set(ids);
-        const newRundown = { ...previousEvents.rundown };
+        const newRundown = { ...previousRundown.entries };

        eventIds.forEach((eventId) => {
          if (Object.hasOwn(newRundown, eventId)) {
@@ -338,16 +352,24 @@ export const useEventAction = () => {
          }
        });

-        queryClient.setQueryData(RUNDOWN, { order: previousEvents.order, rundown: newRundown, revision: -1 });
+        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 and new events
-      return { previousEvents };
+
+      // Return a context with the previous rundown
+      return { previousRundown };
    },
    onSettled: async () => {
      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
    },
    onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousEvents);
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousRundown);
    },
    networkMode: 'always',
  });
@@ -364,30 +386,29 @@ export const useEventAction = () => {
  );

  /**
-   * Calls mutation to delete an event
+   * Calls mutation to delete an entry
   * @private
   */
-  const _deleteEventMutation = useMutation({
-    mutationFn: requestDelete,
+  const _deleteEntryMutation = useMutation({
+    mutationFn: deleteEntries,
    // we optimistically update here
-    onMutate: async (eventIds: string[]) => {
+    onMutate: async (entryIds: EntryId[]) => {
      // cancel ongoing queries
      await queryClient.cancelQueries({ queryKey: RUNDOWN });

      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
+      const previousData = queryClient.getQueryData<Rundown>(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];
-        }
+        const { entries, order, flatOrder } = optimisticDeleteEntries(entryIds, previousData);

-        queryClient.setQueryData(RUNDOWN, {
-          order: newOrder,
-          rundown: newRundown,
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order,
+          flatOrder,
+          entries,
          revision: -1,
        });
      }
@@ -397,8 +418,8 @@ export const useEventAction = () => {
    },

    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
+    onError: (_error, _entryIds, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
@@ -409,24 +430,24 @@ export const useEventAction = () => {
  });

  /**
-   * Deletes an event form the list
+   * Deletes an event entry from the rundown
   */
-  const deleteEvent = useCallback(
-    async (eventIds: string[]) => {
+  const deleteEntry = useCallback(
+    async (entryIds: EntryId[]) => {
      try {
-        await _deleteEventMutation.mutateAsync(eventIds);
+        await _deleteEntryMutation.mutateAsync(entryIds);
      } catch (error) {
        logAxiosError('Error deleting event', error);
      }
    },
-    [_deleteEventMutation],
+    [_deleteEntryMutation],
  );

  /**
   * Calls mutation to delete all events
   * @private
   */
-  const _deleteAllEventsMutation = useMutation({
+  const _deleteAllEntriesMutation = useMutation({
    mutationFn: requestDeleteAll,
    // we optimistically update here
    onMutate: async () => {
@@ -434,18 +455,25 @@ export const useEventAction = () => {
      await queryClient.cancelQueries({ queryKey: RUNDOWN });

      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);

      // optimistically update object
-      queryClient.setQueryData(RUNDOWN, { rundown: {}, order: [], revision: -1 });
+      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 undos optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.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
@@ -456,15 +484,15 @@ export const useEventAction = () => {
  });

  /**
-   * Deletes all events from list
+   * Deletes all entries in the rundown
   */
-  const deleteAllEvents = useCallback(async () => {
+  const deleteAllEntries = useCallback(async () => {
    try {
-      await _deleteAllEventsMutation.mutateAsync();
+      await _deleteAllEntriesMutation.mutateAsync();
    } catch (error) {
      logAxiosError('Error deleting events', error);
    }
-  }, [_deleteAllEventsMutation]);
+  }, [_deleteAllEntriesMutation]);

  /**
   * Calls mutation to apply a delay
@@ -480,7 +508,7 @@ export const useEventAction = () => {
  });

  /**
-   * Applies a given delay block
+   * Applies a given delay
   */
  const applyDelay = useCallback(
    async (delayEventId: string) => {
@@ -494,24 +522,30 @@ export const useEventAction = () => {
  );

  /**
-   * Calls mutation to reorder an event
+   * Calls mutation to reorder an entry
   * @private
   */
-  const _reorderEventMutation = useMutation({
-    mutationFn: requestReorderEvent,
+  const _reorderEntryMutation = useMutation({
+    mutationFn: patchReorderEntry,
    // 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);
+      const previousData = queryClient.getQueryData<Rundown>(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 });
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order: newOrder,
+          flatOrder: previousData.flatOrder,
+          entries: previousData.entries,
+          revision: -1,
+        });
      }

      // Return a context with the previous and new events
@@ -519,8 +553,8 @@ export const useEventAction = () => {
    },

    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
+    onError: (_error, _data, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
@@ -531,22 +565,22 @@ export const useEventAction = () => {
  });

  /**
-   * Reorders a given event
+   * Reorders a given entry
   */
-  const reorderEvent = useCallback(
-    async (eventId: string, from: number, to: number) => {
+  const reorderEntry = useCallback(
+    async (entryId: string, from: number, to: number) => {
      try {
        const reorderObject: ReorderEntry = {
-          eventId,
+          eventId: entryId,
          from,
          to,
        };
-        await _reorderEventMutation.mutateAsync(reorderObject);
+        await _reorderEntryMutation.mutateAsync(reorderObject);
      } catch (error) {
        logAxiosError('Error re-ordering event', error);
      }
    },
-    [_reorderEventMutation],
+    [_reorderEntryMutation],
  );

  /**
@@ -561,22 +595,29 @@ export const useEventAction = () => {
      await queryClient.cancelQueries({ queryKey: RUNDOWN });

      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
      if (previousData) {
        // optimistically update object
-        const newRundown = { ...previousData.rundown };
-        const eventA = previousData.rundown[from];
-        const eventB = previousData.rundown[to];
+        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);
+        const [newA, newB] = swapEventData(eventA, eventB);
        newRundown[from] = newA;
        newRundown[to] = newB;

-        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
+        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
@@ -585,7 +626,7 @@ export const useEventAction = () => {

    // Mutation fails, rollback undoes optimist update
    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
    },
    // Mutation finished, failed or successful
    // Fetch anyway, just to be sure
@@ -610,15 +651,45 @@ export const useEventAction = () => {
  );

  return {
-    addEvent,
+    addEntry,
    applyDelay,
    batchUpdateEvents,
-    deleteEvent,
-    deleteAllEvents,
-    reorderEvent,
+    deleteEntry,
+    deleteAllEntries,
+    getEntryById,
+    reorderEntry,
    swapEvents,
-    updateEvent,
+    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 (isOntimeEvent(entry) && entry.parent) {
+      const parent = entries[entry.parent] as OntimeBlock;
+      parent.events = parent.events.filter((event) => event !== entry.id);
+      parent.numEvents -= 1;
+    } else {
+      order = order.filter((id) => id !== entry.id);
+    }
+
+    delete entries[entry.id];
+    flatOrder = flatOrder.filter((id) => id !== entry.id);
+  }
+
+  return { entries, order, flatOrder };
+}
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';

-import { throttle } from '../../common/utils/throttle';
+import { throttle } from '../utils/throttle';
+

 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
@@ -1,27 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-/**
- * @description utility hook to around setInterval
- * @param callback
- * @param delay
- */
-export const useInterval = (callback, delay) => {
-  const savedCallback = useRef();
-
-  useEffect(() => {
-    savedCallback.current = callback;
-  }, [callback]);
-
-  useEffect(() => {
-    /**
-     * @description function to be called
-     */
-    function tick() {
-      savedCallback.current();
-    }
-    if (delay !== null) {
-      const id = setInterval(tick, delay);
-      return () => clearInterval(id);
-    }
-  }, [delay]);
-};
@@ -12,7 +12,7 @@ type noop = (this: any, ...args: any[]) => any;

 type PickFunction<T extends noop> = (this: ThisParameterType<T>, ...args: Parameters<T>) => ReturnType<T>;

-export const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';
+const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';

 export default function useMemoisedFn<T extends noop>(fn: T) {
  if (isDev) {
@@ -1,75 +1,56 @@
-import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
+import { OffsetMode, RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';

 import { useRuntimeStore } from '../stores/runtime';
 import { socketSendJson } from '../utils/socket';

+const createSelector =
+  <T>(selector: (state: RuntimeStore) => T) =>
+  () =>
+    useRuntimeStore(selector);
+
 export const setClientRemote = {
  setIdentify: (payload: { target: string; identify: boolean }) => socketSendJson('client', payload),
  setRedirect: (payload: { target: string; redirect: string }) => socketSendJson('client', payload),
  setClientName: (payload: { target: string; rename: string }) => socketSendJson('client', payload),
 };

-export const useRundownEditor = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventId: state.eventNow?.id ?? null,
-    nextEventId: state.eventNext?.id ?? null,
-  });
+export const useRundownEditor = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventId: state.eventNow?.id ?? null,
+  nextEventId: state.eventNext?.id ?? null,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useOperator = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventId: state.eventNow?.id ?? null,
+}));

-export const useOperator = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventId: state.eventNow?.id ?? null,
-  });
+export const useTimerViewControl = createSelector((state: RuntimeStore) => ({
+  blackout: state.message.timer.blackout,
+  blink: state.message.timer.blink,
+  secondarySource: state.message.timer.secondarySource,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useTimerMessageInput = createSelector((state: RuntimeStore) => ({
+  text: state.message.timer.text,
+  visible: state.message.timer.visible,
+}));

-export const useTimerViewControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    blackout: state.message.timer.blackout,
-    blink: state.message.timer.blink,
-    secondarySource: state.message.timer.secondarySource,
-  });
+export const useExternalMessageInput = createSelector((state: RuntimeStore) => ({
+  text: state.message.external,
+  visible: state.message.timer.secondarySource === 'external',
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useTimerMessageInput = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    text: state.message.timer.text,
-    visible: state.message.timer.visible,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useExternalMessageInput = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    text: state.message.external,
-    visible: state.message.timer.secondarySource === 'external',
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useMessagePreview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    blink: state.message.timer.blink,
-    blackout: state.message.timer.blackout,
-    phase: state.timer.phase,
-    showAuxTimer: state.message.timer.secondarySource === 'aux',
-    showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
-    showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
-    timerType: state.eventNow?.timerType ?? null,
-    countToEnd: state.eventNow?.countToEnd ?? false,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const useMessagePreview = createSelector((state: RuntimeStore) => ({
+  blink: state.message.timer.blink,
+  blackout: state.message.timer.blackout,
+  phase: state.timer.phase,
+  showAuxTimer: state.message.timer.secondarySource === 'aux',
+  showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
+  showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
+  timerType: state.eventNow?.timerType ?? null,
+  countToEnd: state.eventNow?.countToEnd ?? false,
+}));

 export const setMessage = {
  timerText: (payload: string) => socketSendJson('message', { timer: { text: payload } }),
@@ -81,16 +62,12 @@ export const setMessage = {
    socketSendJson('message', { timer: { secondarySource: payload } }),
 };

-export const usePlaybackControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    numEvents: state.runtime.numEvents,
-    timerPhase: state.timer.phase,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const usePlaybackControl = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  selectedEventIndex: state.runtime.selectedEventIndex,
+  numEvents: state.runtime.numEvents,
+  timerPhase: state.timer.phase,
+}));

 export const setPlayback = {
  start: () => socketSendJson('start'),
@@ -114,32 +91,12 @@ export const setPlayback = {
  },
 };

-export const useInfoPanel = () => {
-  const featureSelector = (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);

-  return useRuntimeStore(featureSelector);
-};
-
-export const useAuxTimerTime = () => {
-  const featureSelector = (state: RuntimeStore) => state.auxtimer1.current;
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const useAuxTimerControl = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.auxtimer1.playback,
-    direction: state.auxtimer1.direction,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
+  playback: state.auxtimer1.playback,
+  direction: state.auxtimer1.direction,
+}));

 export const setAuxTimer = {
  start: () => socketSendJson('auxtimer', { '1': SimplePlayback.Start }),
@@ -149,20 +106,13 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

-export const useSelectedEventId = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    selectedEventId: state.eventNow?.id ?? null,
-  });
+export const useSelectedEventId = createSelector((state: RuntimeStore) => ({
+  selectedEventId: state.eventNow?.id ?? null,
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useCurrentBlockId = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    currentBlockId: state.currentBlock.block?.id ?? null,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useCurrentBlockId = createSelector((state: RuntimeStore) => ({
+  currentBlockId: state.currentBlock.block?.id ?? null,
+}));

 export const setEventPlayback = {
  loadEvent: (id: string) => socketSendJson('load', { id }),
@@ -171,81 +121,76 @@ export const setEventPlayback = {
  pause: () => socketSendJson('pause'),
 };

-export const useTimer = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    ...state.timer,
-  });
+export const useTimer = createSelector((state: RuntimeStore) => ({
+  ...state.timer,
+}));

-  return useRuntimeStore(featureSelector);
-};
-
-export const useClock = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    clock: state.clock,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useClock = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+}));

 /** Used by the progress bar components */
-export const useProgressData = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    current: state.timer.current,
-    duration: state.timer.duration,
-    timeWarning: state.eventNow?.timeWarning ?? null,
-    timeDanger: state.eventNow?.timeDanger ?? null,
-  });
-  return useRuntimeStore(featureSelector);
-};
+export const useProgressData = createSelector((state: RuntimeStore) => ({
+  current: state.timer.current,
+  duration: state.timer.duration,
+  timeWarning: state.eventNow?.timeWarning ?? null,
+  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,
+  plannedEnd: state.runtime.plannedEnd,
+  expectedEnd: state.runtime.expectedEnd,
+}));

-export const useRuntimeOverview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    plannedStart: state.runtime.plannedStart,
-    actualStart: state.runtime.actualStart,
-    plannedEnd: state.runtime.plannedEnd,
-    expectedEnd: state.runtime.expectedEnd,
-  });
+export const useRuntimePlaybackOverview = createSelector((state: RuntimeStore) => ({
+  playback: state.timer.playback,
+  clock: state.clock,

-  return useRuntimeStore(featureSelector);
-};
+  numEvents: state.runtime.numEvents,
+  selectedEventIndex: state.runtime.selectedEventIndex,
+  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,

-export const useRuntimePlaybackOverview = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    clock: state.clock,
+  currentBlock: state.currentBlock,
+}));

-    numEvents: state.runtime.numEvents,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    offset: state.runtime.offset,
+export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+  offset: state.runtime.offset,
+}));

-    currentBlock: state.currentBlock,
-  });
+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, //The day of the currently running event
+  actualStart: state.runtime.actualStart,
+  plannedStart: state.runtime.plannedStart,
+}));

-  return useRuntimeStore(featureSelector);
-};
+export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
+  offset: state.runtime.offset,
+}));

-export const useTimelineStatus = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    clock: state.clock,
-    offset: state.runtime.offset,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
-
-export const usePing = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    ping: state.ping,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
+export const usePing = createSelector((state: RuntimeStore) => ({
+  ping: state.ping,
+}));

 /** convert ping into a derived value which changes less often */
-export const useIsOnline = () => {
+export const useIsOnline = createSelector((state: RuntimeStore) => ({
+  isOnline: state.ping > 0,
+}));
+
+export const useOffsetMode = createSelector((state: RuntimeStore) => ({
+  offsetMode: state.runtime.offsetMode,
+}));
+
+export const setOffsetMode = (payload: OffsetMode) => socketSendJson('offsetmode', payload);
+
+export const usePlayback = () => {
  const featureSelector = (state: RuntimeStore) => ({
-    isOnline: state.ping > 0,
+    playback: state.timer.playback,
  });

  return useRuntimeStore(featureSelector);
@@ -2,7 +2,7 @@ import { GetInfo } from 'ontime-types';

 export const ontimePlaceholderInfo: GetInfo = {
  networkInterfaces: [],
-  version: '2.0.0',
+  version: '4.0.0',
  serverPort: 4001,
  publicDir: '',
 };
@@ -1,8 +1,7 @@
 import { Settings } from 'ontime-types';

 export const ontimePlaceholderSettings: Settings = {
-  app: 'ontime',
-  version: '2.0.0',
+  version: '4.0.0',
  serverPort: 4001,
  editorKey: null,
  operatorKey: null,
@@ -11,7 +11,7 @@ type LogStore = {
  logs: Log[];
 };

-export const logger = createStore<LogStore>(() => ({
+const logger = createStore<LogStore>(() => ({
  logs: [],
 }));

@@ -14,18 +14,6 @@ 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
 */
@@ -0,0 +1,46 @@
+import { OntimeEntry, ProjectRundowns, Rundown } from 'ontime-types';
+
+import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../csv';
+
+describe('makeCSVFromArrayOfArrays()', () => {
+  it('joins an array of arrays with commas and newlines', () => {
+    const testdata = [['field'], ['after newline', 'after comma'], ['', 'after empty']];
+    expect(makeCSVFromArrayOfArrays(testdata)).toMatchInlineSnapshot(`
+"field
+after newline,after comma
+,after empty
+"
+`);
+  });
+});
+
+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, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';
+import { EndAction, EntryCustomFields, OntimeEvent, SupportedEntry, TimerType, TimeStrategy } from 'ontime-types';

 import { cloneEvent } from '../eventsManager';

 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
-    const original = {
+    const original: OntimeEvent = {
      id: 'unique',
-      type: SupportedEvent.Event,
+      type: SupportedEntry.Event,
      title: 'title',
      cue: 'cue',
      note: 'note',
@@ -14,6 +14,10 @@ describe('cloneEvent()', () => {
      duration: 10,
      timeEnd: 10,
      timerType: TimerType.CountDown,
+      timeStrategy: TimeStrategy.LockEnd,
+      parent: 'test',
+      linkStart: false,
+      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
      skip: false,
@@ -21,29 +25,40 @@ describe('cloneEvent()', () => {
      revision: 10,
      timeWarning: 120000,
      timeDanger: 60000,
+      delay: 0,
+      dayOffset: 0,
+      gap: 0,
      custom: {
        lighting: '3',
-      } as EventCustomFields,
-    } as OntimeEvent;
+      } as EntryCustomFields,
+    };

    const cloned = cloneEvent(original);
    expect(cloned).not.toBe(original);
-    // @ts-expect-error -- safeguarding this
-    expect(cloned?.id).toBe(undefined);
-    expect(cloned.title).toBe(original.title);
-    expect(cloned.note).toBe(original.note);
-    expect(cloned.endAction).toBe(original.endAction);
-    expect(cloned.timerType).toBe(original.timerType);
-    expect(cloned.timeStart).toBe(original.timeStart);
-    expect(cloned.timeEnd).toBe(original.timeEnd);
-    expect(cloned.duration).toBe(original.duration);
-    expect(cloned.isPublic).toBe(original.isPublic);
-    expect(cloned.skip).toBe(original.skip);
-    expect(cloned.colour).toBe(original.colour);
-    expect(cloned.type).toBe(SupportedEvent.Event);
-    expect(cloned.revision).toBe(0);
-    expect(cloned.timeWarning).toBe(original.timeWarning);
-    expect(cloned.timeDanger).toBe(original.timeDanger);
-    expect(cloned.custom).toStrictEqual({});
+    expect(cloned.custom).not.toBe(original.custom);
+
+    expect(cloned).toMatchObject({
+      type: SupportedEntry.Event,
+      title: original.title,
+      note: original.note,
+      timeStart: original.timeStart,
+      duration: original.duration,
+      timeEnd: original.timeEnd,
+      timerType: original.timerType,
+      timeStrategy: original.timeStrategy,
+      parent: 'test',
+      countToEnd: original.countToEnd,
+      linkStart: original.linkStart,
+      endAction: original.endAction,
+      isPublic: original.isPublic,
+      skip: original.skip,
+      colour: original.colour,
+      revision: 0,
+      delay: original.delay,
+      dayOffset: original.dayOffset,
+      gap: 0,
+      timeWarning: original.timeWarning,
+      timeDanger: original.timeDanger,
+    });
  });
 });
@@ -1,4 +1,7 @@
-import { formatTime, nowInMillis } from '../time';
+import { OffsetMode } from 'ontime-types';
+import { dayInMs } from 'ontime-utils';
+
+import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';

 describe('nowInMillis()', () => {
  it('should return the current time in milliseconds', () => {
@@ -38,3 +41,257 @@ describe('formatTime()', () => {
    expect(time).toStrictEqual('-01:00');
  });
 });
+
+describe('calculateTimeUntilStart()', () => {
+  describe('Absolute offset mode', () => {
+    test('ontime', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 90,
+        offset: 0,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+    });
+
+    test('running behind', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 90,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
+    });
+
+    test('running ahead', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 80,
+        offset: 10,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+    });
+
+    test('running behind with enough gaps', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 20,
+        clock: 50,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: null,
+        plannedStart: null,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50); // <-- when gap is enough to compensate for the running behind
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+    });
+
+    test('running behind with too little gaps', () => {
+      const test = {
+        timeStart: 100,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 10,
+        clock: 50,
+        offset: -20,
+        offsetMode: OffsetMode.Absolute,
+        actualStart: 0,
+        plannedStart: 0,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60); // <-- when gap is not enough to compensate for the running behind it absorbs at much as possible
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+    });
+  });
+
+  describe('Relative offset mode', () => {
+    test('basic function', () => {
+      const test = {
+        timeStart: 0,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      const timeStartEvent2 = 10;
+      const timeStartEvent3 = 20;
+
+      //event 1 is the currently running event
+
+      //event 2
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(10);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(10);
+
+      //event 3
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(20);
+
+      // When clock advances by 5ms, time until start should decrease by 5ms
+      test.clock = 105;
+
+      //event 2
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(5);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(5);
+
+      //event 3
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(15);
+    });
+
+    test('gaps', () => {
+      const test = {
+        timeStart: 20,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 10,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
+
+      // When clock advances by 5ms, time until start should decrease by 5ms
+      test.clock = 105;
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(15);
+    });
+
+    test('added/remove time', () => {
+      const test = {
+        timeStart: 20,
+        dayOffset: 0,
+        delay: 0,
+        currentDay: 0,
+        totalGap: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
+
+      test.offset = 5; // remove 5 with addtime - we are ahead of time
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // unlocked evets will stay on schedule
+
+      test.offset = -5; // add 5 with addtime - we are behind
+
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(25);
+      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(25);
+    });
+
+    test('next day', () => {
+      const test = {
+        delay: 0,
+        currentDay: 0,
+        clock: 100,
+        actualStart: 100,
+        plannedStart: 0,
+        offset: 0,
+        offsetMode: OffsetMode.Relative,
+      };
+
+      // this event will start the current day
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 10,
+          dayOffset: 0,
+          totalGap: 0,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(10);
+
+      // this event will start the next day
+      // in absolute mode this would start in dayInMs - 100 since the gap would compensate
+      // but in relative mode with and actual start that is 100 offset it starts in dayInMs
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 0,
+          dayOffset: 1,
+          totalGap: dayInMs - 20,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(dayInMs);
+
+      // advancing 100ms
+      test.clock = 200;
+
+      expect(
+        calculateTimeUntilStart({
+          ...test,
+          timeStart: 0,
+          dayOffset: 1,
+          totalGap: dayInMs - 20,
+          isLinkedToLoaded: false,
+        }),
+      ).toBe(dayInMs - 100);
+    });
+  });
+
+  test('overlap with negative total gap', () => {
+    const test = {
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      clock: 100,
+      actualStart: 100,
+      plannedStart: 0,
+      offset: 0,
+      offsetMode: OffsetMode.Relative,
+      isLinkedToLoaded: false,
+    };
+
+    // the overlap will be pushed out to the expected available time
+    expect(calculateTimeUntilStart({ ...test, timeStart: 5, totalGap: -5 })).toBe(10);
+
+    test.clock = 105;
+  });
+});
@@ -1,103 +0,0 @@
-import { resolvePath } from 'react-router-dom';
-
-import { generateUrlFromPreset, getRouteFromPreset, validateUrlPresetPath } from '../urlPresets';
-
-describe('A preset fails if incorrect', () => {
-  const testsToFail = [
-    // no empty
-    '',
-    // no https, http or www
-    'https://www.test.com',
-    'http://www.test.com',
-    'www.test.com',
-    // no hostname
-    'localhost/test',
-    '127.0.0.1/test',
-    '0.0.0.0/test',
-    // no editor
-    'editor',
-    'editor?test',
-  ];
-
-  testsToFail.forEach((t) =>
-    it(`${t}`, () => {
-      expect(validateUrlPresetPath(t).isValid).toBeFalsy();
-    }),
-  );
-});
-describe('generateUrlFromPreset and getRouteFromPreset function', () => {
-  test('generate the expected url from an alias', () => {
-    const testData = [
-      {
-        enabled: true,
-        alias: 'demopage',
-        pathAndParams: '/timer?user=guest',
-      },
-    ];
-
-    const expected = [
-      {
-        url: '/timer?user=guest&alias=demopage',
-      },
-    ];
-
-    expect(generateUrlFromPreset(testData[0])).toStrictEqual(expected[0].url);
-  });
-  test('generate the url to redirect to when the current URL is just the alias', () => {
-    const presets = [
-      {
-        enabled: true,
-        alias: 'demopage',
-        pathAndParams: '/timer?user=guest',
-      },
-    ];
-    // let current location be the alias
-    const location = resolvePath(presets[0].alias);
-
-    const expected = [
-      {
-        url: '/timer?user=guest&alias=demopage',
-      },
-    ];
-
-    expect(getRouteFromPreset(location, presets, null)).toStrictEqual(expected[0].url);
-  });
-  test('generate the url to redirect to when the current URL the same url but with a change of params', () => {
-    const presets = [
-      {
-        enabled: true,
-        alias: 'demopage',
-        pathAndParams: '/timer?user=guest',
-      },
-    ];
-    // let current location be the actual url with alias attached to it
-    const location = resolvePath(presets[0].pathAndParams);
-    const urlSearchParams = new URLSearchParams(location.search);
-    urlSearchParams.append('alias', presets[0].alias); //
-
-    // update current alias with extra param
-    presets[0].pathAndParams += '&eventId=674';
-    const expected = [
-      {
-        url: '/timer?user=guest&eventId=674&alias=demopage',
-      },
-    ];
-
-    expect(getRouteFromPreset(location, presets, urlSearchParams)).toStrictEqual(expected[0].url);
-  });
-  test('generate no url to redirect to when the current URL the same url', () => {
-    const presets = [
-      {
-        enabled: true,
-        alias: 'demopage',
-        pathAndParams: '/timer?user=guest',
-      },
-    ];
-    // let current location be the actual url with alias attached to it
-    const location = resolvePath(presets[0].pathAndParams);
-    const urlSearchParams = new URLSearchParams(location.search);
-    urlSearchParams.append('alias', presets[0].alias); //
-
-    expect(getRouteFromPreset(location, presets, urlSearchParams)).toBeNull();
-  });
-});
@@ -0,0 +1,108 @@
+import { resolvePath } from 'react-router-dom';
+
+import { arePathsEquivalent, generatePathFromPreset, getRouteFromPreset, validateUrlPresetPath } from '../urlPresets';
+
+describe('validateUrlPresetPaths()', () => {
+  test.each([
+    // no empty
+    '',
+    // no https, http or www
+    'https://www.test.com',
+    'http://www.test.com',
+    'www.test.com',
+    // no hostname
+    'localhost/test',
+    '127.0.0.1/test',
+    '0.0.0.0/test',
+    // no editor
+    'editor',
+    'editor?test',
+  ])('flags known edge cases: %s', (t) => {
+    expect(validateUrlPresetPath(t).isValid).toBeFalsy();
+  });
+});
+
+describe('getRouteFromPreset()', () => {
+  const presets = [
+    {
+      enabled: true,
+      alias: 'demopage',
+      pathAndParams: '/timer?user=guest',
+    },
+  ];
+
+  it('checks if the current location matches an enabled preset', () => {
+    // we make the current location be the alias
+    const location = resolvePath('demopage');
+    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
+  });
+
+  it('returns null if the current location is the exact match of an unwrapped alias', () => {
+    // we make the current location be the alias
+    const location = resolvePath('/timer?user=guest&alias=demopage');
+    expect(getRouteFromPreset(location, presets)).toEqual(null);
+  });
+
+  it('returns a new destination if the current location is an out-of-date unwrapped alias', () => {
+    // we make the current location be the alias
+    const location = resolvePath('/timer?user=admin&alias=demopage');
+    expect(getRouteFromPreset(location, presets)).toEqual('timer?user=guest&alias=demopage');
+  });
+
+  it('checks if the current location contains an unwrapped preset', () => {
+    // we make the current location be the alias
+    const location = resolvePath('/timer?user=guest&alias=demopage');
+    expect(getRouteFromPreset(location, presets)).toEqual(null);
+  });
+
+  it('ignores a location that has no presets', () => {
+    // we make the current location be the alias
+    const location = resolvePath('/unknown');
+    expect(getRouteFromPreset(location, presets)).toEqual(null);
+  });
+
+  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();
+    });
+
+    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');
+    });
+  });
+});
+
+describe('generatePathFromPreset()', () => {
+  test.each([
+    ['timer?user=guest', 'demopage', 'timer?user=guest&alias=demopage'],
+    ['timer?user=admin', 'demopage', 'timer?user=admin&alias=demopage'],
+  ])('generates a path from a preset: %s', (path, alias, expected) => {
+    expect(generatePathFromPreset(path, alias, null, null)).toEqual(expected);
+  });
+
+  test('appends the feature params to the alias', () => {
+    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe(
+      'timer?user=guest&alias=demopage&locked=true&token=123',
+    );
+  });
+});
+
+describe('arePathsEquivalent()', () => {
+  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', () => {
+    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', () => {
+    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();
+  });
+});
@@ -0,0 +1,31 @@
+import { stringify } from 'csv-stringify/browser/esm/sync';
+import { OntimeEntry, ProjectRundowns } from 'ontime-types';
+
+/**
+ * Converts an array of arrays to a CSV file
+ */
+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, SupportedEvent } from 'ontime-types';
+import { OntimeEvent, SupportedEntry } from 'ontime-types';

 /**
 * @description Creates a safe duplicate of an event
@@ -9,7 +9,7 @@ import { OntimeEvent, SupportedEvent } from 'ontime-types';
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
 export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
  return {
-    type: SupportedEvent.Event,
+    type: SupportedEntry.Event,
    title: event.title,
    note: event.note,
    timeStart: event.timeStart,
@@ -23,12 +23,13 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
+    parent: event.parent,
    revision: 0,
-    delay: 0,
-    dayOffset: 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,
-    custom: {},
+    custom: { ...event.custom },
  };
 };
@@ -0,0 +1,12 @@
+/**
+ * Allows lazy evaluation and caching of a functions result
+ */
+export function lazyEvaluate<T>(fn: () => T): () => T {
+  let result: T | undefined;
+  return function () {
+    if (result === undefined) {
+      result = fn();
+    }
+    return result;
+  };
+}
@@ -6,7 +6,6 @@ import { baseURI, serverURL } from '../../externals';
 * Open an external URLs: specifically for a electron / browser case
 * If electron: ask main process to call a new browser window
 * If browser: open in new tab
- * @param url
 */
 export function openLink(url: string) {
  if (window.process?.type === 'renderer') {
@@ -0,0 +1,8 @@
+import { MaybeString } from 'ontime-types';
+
+export default function safeParseNumber(value: MaybeString, defaultValue: number = 0): number {
+  if (!value) return defaultValue;
+  const number = Number(value);
+  if (isNaN(number)) return defaultValue;
+  return number;
+}
@@ -1,7 +1,7 @@
-import { Log, RundownCached, RuntimeStore } from 'ontime-types';
+import { Log, Rundown, RuntimeStore } from 'ontime-types';

 import { isProduction, websocketUrl } from '../../externals';
-import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
+import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
@@ -14,13 +14,12 @@ import {
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { addToBatchUpdates, flushBatchUpdates, patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';

-export let websocket: WebSocket | null = null;
+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;

@@ -34,27 +33,32 @@ export const connectSocket = () => {
    hasConnected = true;
    reconnectAttempts = 0;

+    socketSendJson('set-client-patch', {
+      type: 'ontime',
+      origin: window.location.origin,
+      path: window.location.pathname + window.location.search,
+    });
+    setOnlineStatus(true);
+
    if (preferredClientName) {
      socketSendJson('set-client-name', preferredClientName);
    }
-
-    socketSendJson('set-client-type', 'ontime');
-    setOnlineStatus(true);
  };

  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
-    setOnlineStatus(false);

-    if (shouldReconnect) {
-      reconnectTimeout = setTimeout(() => {
-        console.warn('WebSocket: attempting reconnect');
-        if (websocket && websocket.readyState === WebSocket.CLOSED) {
-          reconnectAttempts += 1;
-          connectSocket();
-        }
-      }, reconnectInterval);
-    }
+    // we decide to allows reconnect
+    reconnectTimeout = setTimeout(() => {
+      if (reconnectAttempts > 2) {
+        setOnlineStatus(false);
+      }
+      console.warn('WebSocket: attempting reconnect');
+      if (websocket && websocket.readyState === WebSocket.CLOSED) {
+        reconnectAttempts += 1;
+        connectSocket();
+      }
+    }, reconnectInterval);
  };

  websocket.onerror = (error) => {
@@ -78,16 +82,14 @@ export const connectSocket = () => {
          updateDevTools({ ping: offset });
          break;
        }
-        case 'client-id': {
-          if (typeof payload === 'string') {
-            setClientId(payload);
-          }
-          break;
-        }
-
-        case 'client-name': {
-          if (typeof payload === 'string') {
-            setClientName(payload);
+        case 'client': {
+          if (typeof payload === 'object' || payload !== null) {
+            if (payload.clientId && payload.clientName) {
+              setClientId(payload.clientId);
+              if (!preferredClientName) {
+                setClientName(payload.clientName);
+              }
+            }
          }
          break;
        }
@@ -139,76 +141,31 @@ export const connectSocket = () => {
          updateDevTools(serverPayload);
          break;
        }
-        case 'ontime-clock': {
-          addToBatchUpdates('clock', payload);
-          updateDevTools({ clock: payload });
-          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 });
+        case 'ontime-patch': {
+          const patch = payload as Partial<RuntimeStore>;
+          patchRuntime(patch);
+          updateDevTools(patch);
          break;
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { revision, reload } = payload;
-          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
-
+          const { reload, target } = payload;
          if (reload) {
            invalidateAllCaches();
-          } else if (revision > currentRevision) {
-            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
-            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
+          } else if (target === 'RUNDOWN') {
+            const { revision } = payload;
+            const currentRevision = ontimeQueryClient.getQueryData<Rundown>(RUNDOWN)?.revision ?? -1;
+            if (revision > currentRevision) {
+              ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
+              ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
+            }
+          } else if (target === 'REPORT') {
+            ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
          }
          break;
        }
-        case 'ontime-flush': {
-          flushBatchUpdates()
+        default: {
+          console.log('unknown WS message', type);
          break;
        }
      }
@@ -218,11 +175,6 @@ export const connectSocket = () => {
  };
 };

-export const disconnectSocket = () => {
-  shouldReconnect = false;
-  websocket?.close();
-};
-
 export const socketSend = (message: any) => {
  if (websocket && websocket.readyState === WebSocket.OPEN) {
    websocket.send(message);
@@ -1,8 +1,9 @@
-import { MaybeNumber, Settings, TimeFormat } from 'ontime-types';
-import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
+import { MaybeNumber, OffsetMode, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
+import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';

 import { FORMAT_12, FORMAT_24 } from '../../viewerConfig';
 import { APP_SETTINGS } from '../api/constants';
+import { useTimeUntilData } from '../hooks/useSocket';
 import { ontimeQueryClient } from '../queryClient';

 /**
@@ -34,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
 */
-export function getFormatFromSettings(): TimeFormat {
+function getFormatFromSettings(): TimeFormat {
  const settings: Settings | undefined = ontimeQueryClient.getQueryData(APP_SETTINGS);
  return settings?.timeFormat ?? '24';
 }
@@ -125,3 +126,89 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }
  return result;
 }
+
+/**
+ *
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @returns
+ */
+export function useTimeUntilStart(
+  // typed like this to make it very clear what the data is
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+  },
+): number {
+  const { offset, clock, currentDay, offsetMode, actualStart, plannedStart } = useTimeUntilData();
+  return calculateTimeUntilStart({ ...data, currentDay, clock, offset, offsetMode, actualStart, plannedStart });
+}
+
+/**
+ *
+ * @param currentDay the day offset of the urrently running event
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @param clock
+ * @param offset
+ * @returns
+ */
+export function calculateTimeUntilStart(
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    currentDay: number;
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+    clock: number;
+    offset: number;
+    offsetMode: OffsetMode;
+    actualStart: MaybeNumber;
+    plannedStart: MaybeNumber;
+  },
+): number {
+  const {
+    timeStart,
+    dayOffset,
+    currentDay,
+    totalGap,
+    isLinkedToLoaded,
+    clock,
+    offset,
+    delay,
+    offsetMode,
+    actualStart,
+    plannedStart,
+  } = data;
+
+  //How many days from the currently running event to this one
+  const relativeDayOffset = dayOffset - currentDay;
+
+  const delayedStart = Math.max(0, timeStart + delay);
+
+  //The normalised start time of this event relative to the currently running event
+  const normalisedTimeStart = delayedStart + relativeDayOffset * dayInMs;
+
+  let relativeStartOffset = 0;
+
+  if (offsetMode === OffsetMode.Relative) {
+    relativeStartOffset = (actualStart ?? 0) - (plannedStart ?? 0);
+  }
+
+  const scheduledTimeUntil = normalisedTimeStart - clock + relativeStartOffset;
+
+  const offsetTimeUntil = scheduledTimeUntil - offset;
+
+  if (isLinkedToLoaded) {
+    //if we are directly linked back to the loaded event we just follow the offset
+    return offsetTimeUntil;
+  }
+
+  const gapsCanCompensateForOffset = totalGap + offset >= 0;
+  if (gapsCanCompensateForOffset) {
+    // if we are ahead of schedule or the gap can compensate for the amount we are behind then expect to start at the scheduled time
+    return scheduledTimeUntil;
+  }
+
+  // otherwise consume as much of the offset as possible with the gap
+  const offsetTimeUntilBufferedByGaps = offsetTimeUntil - totalGap;
+  return offsetTimeUntilBufferedByGaps;
+}
@@ -1,13 +1,11 @@
-import isEqual from 'react-fast-compare';
-import { Location, resolvePath } from 'react-router-dom';
+import { Path, resolvePath } from 'react-router-dom';
 import { URLPreset } from 'ontime-types';

 /**
 * Validates a preset against defined parameters
- * @param {string} preset
- * @returns {{message: string, isValid: boolean}}
+ * Used in the context of form validation
 */
-export const validateUrlPresetPath = (preset: string): { message: string; isValid: boolean } => {
+export function validateUrlPresetPath(preset: string): { message: string; isValid: boolean } {
  if (preset === '' || preset == null) {
    return { isValid: false, message: 'Path cannot be empty' };
  }
@@ -26,7 +24,7 @@ export const validateUrlPresetPath = (preset: string): { message: string; isVali
  }

  return { isValid: true, message: 'ok' };
-};
+}

 /**
 * Utility removes trailing slash from a string
@@ -36,48 +34,93 @@ function removeTrailingSlash(text: string): string {
 }

 /**
- * Gets the URL to send a preset to
- * @param location
- * @param data
- * @param searchParams
+ * Checks whether the current location corresponds to a preset and returns the new path if necessary
 */
-export const getRouteFromPreset = (location: Location, data: URLPreset[], searchParams: URLSearchParams) => {
+export function getRouteFromPreset(location: Path, urlPresets: URLPreset[]): string | null {
+  // current url is the pathname without the leading slash
  const currentURL = location.pathname.substring(1);
+  const searchParams = new URLSearchParams(location.search);

-  // we need to check if the whole url here is an alias, so we can redirect
-  const foundPreset = data.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
+  // check if we have token or locked in the search params
+  const locked = searchParams.get('locked');
+  const token = searchParams.get('token');
+
+  // we need to check if the whole url is an alias
+  const foundPreset = urlPresets.find((preset) => preset.alias === removeTrailingSlash(currentURL) && preset.enabled);
  if (foundPreset) {
-    return generateUrlFromPreset(foundPreset);
+    // if so, we can redirect to the preset path
+    return generatePathFromPreset(foundPreset.pathAndParams, foundPreset.alias, locked, token);
  }

+  // if the current url is not an alias, we check if the alias is in the search parameters
  const presetOnPage = searchParams.get('alias');
-  for (const d of data) {
-    if (presetOnPage) {
-      // if the alias fits the preset on this page, but the URL is different, we redirect user to the new URL
-      // if we have the same alias and its enabled and its not empty
-      if (d.alias !== '' && d.enabled && d.alias === presetOnPage) {
-        const newPath = resolvePath(d.pathAndParams);
-        const urlParams = new URLSearchParams(newPath.search);
-        urlParams.set('alias', d.alias);
-        // we confirm either the url parameters does not match or the url path doesnt
-        if (!isEqual(urlParams, searchParams) || newPath.pathname !== location.pathname) {
-          // we then redirect to the alias route, since the view listening to this alias has an outdated URL
-          return `${newPath.pathname}?${urlParams}`;
-        }
+  if (!presetOnPage) {
+    return null;
+  }
+
+  const currentPath = `${location.pathname}${location.search}`.substring(1);
+
+  for (const preset of urlPresets) {
+    // if the page has a known enabled alias, we check if we need to redirect
+    if (preset.alias === presetOnPage && preset.enabled) {
+      const newPath = generatePathFromPreset(preset.pathAndParams, preset.alias, locked, token);
+      if (!arePathsEquivalent(currentPath, newPath)) {
+        // if current path is out of date
+        // return new path so we can redirect
+        return newPath;
      }
    }
  }
  return null;
-};
+}

 /**
- * Generate URL from an preset
- * @param presetData
+ * Handles generating a path and search parameters from a preset
 */
-export const generateUrlFromPreset = (presetData: URLPreset) => {
-  const newPresetPath = resolvePath(presetData.pathAndParams);
-  const urlParams = new URLSearchParams(newPresetPath.search);
-  urlParams.set('alias', presetData.alias);
+export function generatePathFromPreset(pathAndParams: string, alias: string, locked: string | null, token: string | null ): string {
+  const path = resolvePath(pathAndParams);
+  const searchParams = new URLSearchParams(path.search);

-  return `${newPresetPath.pathname}?${urlParams}`;
-};
+  // save the alias so we have a reference to it being a preset and can update if necessary
+  searchParams.set('alias', alias);
+
+  // maintain params from the URL search feature
+  if (locked) {
+    searchParams.set('locked', locked);
+  }
+
+  if (token) {
+    searchParams.set('token', token);
+  }
+
+  // return path concatenated without the leading slash
+  return `${path.pathname}?${searchParams}`.substring(1);
+}
+
+/**
+ * Utility checks if two paths are equivalent
+ * Considers the edge cases for url sharing where a path may contain extra arguments from the alias
+ * - token
+ * - locked
+ */
+export function arePathsEquivalent(currentPath: string, newPath: string): boolean {
+  const currentUrl = new URL(currentPath, document.location.origin);
+  const newUrl = new URL(newPath, document.location.origin);
+  
+  // check path
+  if (currentUrl.pathname !== newUrl.pathname) {
+    return false
+  }
+
+  // check search params
+  // if the params match, we dont need further checks
+  if (currentUrl.searchParams.toString() === newUrl.searchParams.toString()) {
+    return true
+  }
+
+  // if there is no match, we check the edge cases for the url sharing feature
+  currentUrl.searchParams.delete('token');
+  currentUrl.searchParams.delete('locked');
+
+  return currentUrl.searchParams.toString() === newUrl.searchParams.toString();
+}
@@ -1,11 +0,0 @@
-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>;
-  }
-}
@@ -19,9 +19,10 @@ export const buyMeACoffeeUrl = 'https://buymeacoffee.com/cpvalente';
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
-export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
+export const currentHostName = window.location.hostname;
+export const isLocalhost = currentHostName === 'localhost' || currentHostName === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');
+export const isOntimeCloud = currentHostName.includes('cloud.getontime.no');

 // resolve entrypoint URLs

@@ -75,4 +76,4 @@ function resolveBaseURI(): string {
  }

  return base;
-}
+}
@@ -1,6 +1,6 @@
 /* eslint-disable react/display-name */
 import { ComponentType, useEffect } from 'react';
-import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';

 import useUrlPresets from '../common/hooks-query/useUrlPresets';
 import { getRouteFromPreset } from '../common/utils/urlPresets';
@@ -8,19 +8,19 @@ import { getRouteFromPreset } from '../common/utils/urlPresets';
 const withPreset = <P extends object>(Component: ComponentType<P>) => {
  return (props: Partial<P>) => {
    const { data } = useUrlPresets();
-    const [searchParams] = useSearchParams();
    const navigate = useNavigate();
    const location = useLocation();

    // navigate if is alias route
    useEffect(() => {
      if (!data) return;
-      const url = getRouteFromPreset(location, data, searchParams);
-      // navigate to this route if its not empty
-      if (url) {
-        navigate(url);
+      const destination = getRouteFromPreset(location, data);
+
+      // navigate to this destination if its not null
+      if (destination) {
+        navigate(destination);
      }
-    }, [data, searchParams, navigate, location]);
+    }, [data, navigate, location]);

    return <Component {...(props as P)} />;
  };
@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
+import { IoClose } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoClose } from '@react-icons/all-files/io5/IoClose';

 import style from './PanelContent.module.scss';

@@ -38,7 +38,7 @@ $inner-padding: 1rem;
 .section {
  position: relative;
  margin-top: 2rem;
-  max-width: 800px;
+  max-width: 850px;
 }

 .indent {
@@ -183,7 +183,7 @@ $inner-padding: 1rem;
  color: $muted-gray;

  td {
-    padding-block: 1rem;
+    padding-block: 5rem;
  }

  button {
@@ -207,6 +207,9 @@ $inner-padding: 1rem;
  &.end {
    justify-content: flex-end;
  }
+  &.apart {
+    justify-content: space-between;
+  }
 }

@keyframes animloader {
@@ -1,6 +1,6 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
+import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { cx } from '../../../common/utils/styleUtils';

@@ -67,9 +67,17 @@ export function TableEmpty({ label, handleClick }: { label?: string; handleClick
    <tr className={style.empty}>
      <td colSpan={99}>
        <div>{label ?? 'No data yet'}</div>
-        <Button onClick={handleClick} isDisabled={!handleClick} variant='ontime-filled' rightIcon={<IoAdd />} size='sm'>
-          New
-        </Button>
+        {handleClick && (
+          <Button
+            onClick={handleClick}
+            isDisabled={!handleClick}
+            variant='ontime-filled'
+            rightIcon={<IoAdd />}
+            size='sm'
+          >
+            New
+          </Button>
+        )}
      </td>
    </tr>
  );
@@ -105,8 +113,8 @@ export function BlockQuote({ children }: { children: ReactNode }) {
  return <blockquote className={style.blockquote}>{children}</blockquote>;
 }

-export function Error({ children }: { children: ReactNode }) {
-  return <div className={style.fieldError}>{children}</div>;
+export function Error({ children, className }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
+  return <div className={cx([style.fieldError, className])}>{children}</div>;
 }

 export function Divider() {
@@ -128,7 +136,7 @@ type AllowedInlineTags = 'div' | 'td';
 type InlineProps<C extends AllowedInlineTags> = {
  as?: C;
  relation?: 'inner' | 'component' | 'section';
-  align?: 'start' | 'end';
+  align?: 'start' | 'end' | 'apart';
  className?: string;
 };

@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import {
  buyMeACoffeeUrl,
  discordUrl,
@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
 import { appVersion } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
arc-alex	bf3d426649	cleanup: millisToSeconds	2025-05-14 21:58:08 +02:00
arc-alex	55c6e70f4a	rename	2025-05-14 21:58:08 +02:00
arc-alex	f9f1679e8c	tweek update rate	2025-05-14 21:58:08 +02:00
arc-alex	fca54ab793	clean unused functions	2025-05-14 21:58:07 +02:00
arc-alex	5a38326fb4	clock "is" a count up timer	2025-05-14 21:58:07 +02:00
arc-alex	108db7c87a	apply to Timer view	2025-05-14 21:58:07 +02:00
arc-alex	68080d0bc6	change `millisToSeconds` function	2025-05-14 21:58:07 +02:00
Alex Christoffer Rasmussen	abd4369049	assert non null and update test (#1604 )	2025-05-14 20:07:42 +02:00
Alex Christoffer Rasmussen	75c6016f4e	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-05-14 20:07:42 +02:00
Alex Christoffer Rasmussen	bdcec7a472	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-05-14 20:07:42 +02:00
Alex Christoffer Rasmussen	0a596624d5	Refactor: ms for api calls (#1593 ) * use ms for api calls * change it in UI * update comment * rename variables * refactor: addtime api logic	2025-05-14 20:07:42 +02:00
Alex Christoffer Rasmussen	94b80d3b0b	fix test (#1601 ) * fix test * add comment	2025-05-14 20:07:42 +02:00
Carlos Valente	92fbef3515	fix: rebase master	2025-05-14 20:07:42 +02:00
Carlos Valente	10c2f0cf6c	chore: correct test path	2025-05-14 20:07:42 +02:00
Carlos Valente	e30b4fa8d5	refactor: extract rundown parsing refactor: implement groups in editor	2025-05-14 20:07:42 +02:00
Carlos Valente	52358d75d3	chore: improve convention entry <> event	2025-05-14 20:07:42 +02:00
Carlos Valente	a55dfba4ef	refactor: maintain flat orders	2025-05-14 20:07:42 +02:00
Carlos Valente	ed7f8a0aa2	refactor: implement operations on nested events	2025-05-14 20:07:42 +02:00
Carlos Valente	ba1292141b	refactor: process events in rundown	2025-05-14 20:07:42 +02:00
Carlos Valente	57bd317dcf	chore: improve convention entry <> event	2025-05-14 20:07:42 +02:00
Carlos Valente	0cae37d6c8	chore: rename currentBlock > parent	2025-05-14 20:07:42 +02:00
Carlos Valente	6c8ddeec23	refactor: fix delay positioning in gaps	2025-05-14 20:07:42 +02:00
Carlos Valente	3f3ecce7b2	refactor(e2e): skip flaky test	2025-05-14 20:07:42 +02:00
Carlos Valente	402d10055b	refactor: improve project loading	2025-05-14 20:07:42 +02:00
Carlos Valente	8f5a4f4a0a	refactor: gather group metadata	2025-05-14 20:07:42 +02:00
Carlos Valente	7a78ed4720	refactor: swap maintains schedule	2025-05-14 20:07:42 +02:00
Carlos Valente	de0ac92052	chore: rename files	2025-05-14 20:07:42 +02:00
Carlos Valente	58023dce0d	refactor: restructure model to contain an object of rundowns	2025-05-14 20:07:42 +02:00
Carlos Valente	0ae7178046	refactor: clearer relationship on rundown elements	2025-05-14 20:07:42 +02:00
Carlos Valente	6b01338118	refactor: use strict typing	2025-05-14 20:07:42 +02:00
Carlos Valente	7287cf8511	refactor: remove stop as a possible end action	2025-05-14 20:07:11 +02:00
Carlos Valente	6d17f188a6	refactor: restructure model to contain an object of rundowns	2025-05-14 20:07:11 +02:00
Carlos Valente	440a9b81b6	chore: remove IDE files	2025-05-14 19:58:30 +02:00
Carlos Valente	5fafa08723	refactor: remove unused and legacy code - remove legacy migrations - remove unused server code - remove unused UI code	2025-05-14 19:58:30 +02:00
Shobhit-Nagpal	ac61f257c0	fix: import preview enable after error	2025-05-13 21:24:14 +02:00
Carlos Valente	8d8625aa77	bump version to 3.15.2	2025-05-13 21:24:14 +02:00
Alex Christoffer Rasmussen	1e1aa4bca5	Fix: sheet export (#1606 ) * add util to get keys from labels * look for existing keys first then create new * save ontime key to rundown metadata * update test	2025-05-12 13:56:25 +02:00
Alex Christoffer Rasmussen	1f0cde6d0d	fix: relative offset with `count to end` (#1602 ) * refactor merge absolute and relative offset calculation * update test	2025-05-07 22:34:25 +02:00
Carlos Valente	c4b66a9ed3	bump version to 3.15.1	2025-04-30 20:28:42 +02:00
Carlos Valente	133b3aa819	refactor: create hash of table state	2025-04-30 20:23:49 +02:00
Carlos Valente	9566fadbbb	chore: upgrade table dependencies	2025-04-30 20:23:49 +02:00
Carlos Valente	62570899e8	fix: issue when user hides all columns	2025-04-30 20:23:49 +02:00
Carlos Valente	c1f25f8dba	bump version to 3.15.0	2025-04-20 13:52:43 +02:00
Alex Christoffer Rasmussen	37a91026d8	FIX: editing event data clears delay value (#1591 ) * leave data in place in case it is not regenerated * update comments	2025-04-20 13:51:25 +02:00
Bastian Widmer	c62ce213f5	fix - fix studio clock sizing when timer seconds are hidden !1585	2025-04-20 13:28:22 +02:00
Alex Christoffer Rasmussen	529751578d	refactor: lower third (#1507 ) * refactor * separate in and out time * keep element on screen * animate on play * spelling * explain animation decisions * guard numbers from url params * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * rename safeParseNumber * use view data * refactor getOptionsFromParams * rebalance animation timing --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-04-20 12:50:16 +02:00
Alex Christoffer Rasmussen	dce87c3a81	Relative run mode (#1512 ) * inti relative mode * send imediat update on mode change * add relative to test * don't persist offset mode * add test relative and update calc function * pass data from ssocket * add dev guard * spelling and comments * show relative in offset overview * remove comments * refactor: move totalDelay to _rundown * update clear naming and comments * remove old testing values	2025-04-19 21:36:54 +02:00
Alex Christoffer Rasmussen	a94b10cb0f	Event trigger (#1557 ) * crude UI * add server functionalety * better event trigger list * fix default value * remove log * add trigger to recalculate whitelist * use DTO type * fix rebase * one callback for delete and submit * refactor * add invalid description * clean up commits * cleanup * refactor: find event triggers in `triggerAutomations` * refactor: switch to flat array for event triggers * prevent deleting a automation that is in use * refactor * refactor: extract EventEditorCustom * move trigger options to separate file * move trigger edit down a file level * cleanup * spelling * refactor: ui review proposal * change default value * fix delete filter --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me>	2025-04-19 21:27:07 +02:00
Shobhit Nagpal	6817263123	feat: css editor (#1542 ) * feat: allow editing CSS from settings --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> refactor: style tweaks	2025-04-19 20:40:18 +02:00
Alex Christoffer Rasmussen	ddd629d7db	in cloud force port 4001 (#1575 ) * force 4001 * only log if there is anything to change * skip port retry in cloud	2025-04-15 21:36:59 +02:00
Carlos Valente	9d2a3d5a12	bump version to 3.14.5	2025-04-15 21:25:46 +02:00
Carlos Valente	4bc271208e	refactor: improve synchronisation of external text	2025-04-15 21:25:33 +02:00
Carlos Valente	dbd535dd6c	refactor: timeout for offline status	2025-04-15 21:25:33 +02:00
Carlos Valente	57b7fe214a	refactor: avoid old language features	2025-04-15 21:25:33 +02:00
cv	b136e2856a	refactor: simplify logic	2025-04-15 21:25:33 +02:00
Carlos Valente	03e68c03a9	refactor: allow cloud in iframe	2025-04-10 21:28:43 +02:00
Carlos Valente	44048a889d	bump version to 3.14.4	2025-04-10 21:28:27 +02:00
arc-alex	f72db62e08	add comment	2025-04-10 21:21:33 +02:00
arc-alex	333f2623a5	Fix: timeUntil past coutToEnd events	2025-04-10 21:21:33 +02:00
Alex Christoffer Rasmussen	3ebb3451e4	better browser compatibility for view params (#1566 )	2025-04-09 12:39:59 +02:00
Carlos Valente	73afbacdd7	refactor: swap does not copy time data	2025-03-28 19:42:43 +01:00
Carlos Valente	d08452d613	refactor: clone events fully copies data	2025-03-28 19:42:43 +01:00
Carlos Valente	4ebe6ede59	refactor: consistent overview layout	2025-03-28 19:42:43 +01:00
Carlos Valente	09a32e7612	bump version to 3.14.3	2025-03-28 19:31:31 +01:00
asharonbaltazar	d81f5fcfe1	chore(ui): update icons package (#1556 ) * chore: add new icons package and remove the old one * chore: update and consolidate imports * chore: missed import	2025-03-25 16:36:47 -04:00
Carlos Valente	0a6542df76	fix: link generation should add prefix	2025-03-18 21:56:10 +01:00
Carlos Valente	b2eb140ee2	fix: allow copying link	2025-03-18 21:56:10 +01:00
Carlos Valente	e28f692d3d	fix: cloud should not give IP links	2025-03-18 21:56:10 +01:00
Carlos Valente	dc73e7e637	bump version to 3.14.2	2025-03-18 21:48:22 +01:00
Carlos Valente	b81e3a4ba5	fix: link to variables	2025-03-17 21:48:40 +01:00
Carlos Valente	6fc7b15d23	refactor: compact event block size	2025-03-17 19:48:04 +01:00
Alex Christoffer Rasmussen	99dd4b4d5c	Extract client timeuntil logic (#1521 ) * extract * add to timeline * translate Due * fix timeline page * begin adding some tests * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * move file * refactor * create hook * refactor * update test * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * remove translation * explain isLinkedToLoaded * add delay to calculation * add delay value to test * spelling --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-03-10 22:47:02 +01:00
Carlos Valente	b60b1beeec	bump version to 3.14.1	2025-03-09 22:06:40 +01:00
Alex Christoffer Rasmussen	eab916f410	fix clock drift (#1531 )	2025-03-08 18:13:02 +01:00
Carlos Valente	069a003787	refactor: do not send sentry errors if offline	2025-03-08 08:58:04 +01:00
Carlos Valente	9b08080b7a	fix: pending card	2025-03-08 08:57:57 +01:00
Carlos Valente	8e7ab54d39	refactor: defer table while loading	2025-03-04 22:01:21 +01:00
arc-alex	4a16378786	refactor: pad block row with extra columns	2025-03-04 22:01:21 +01:00
Shobhit Nagpal	e5b30770ce	feat: add table navigation to cuesheet table (#1483 ) * refactor: cuesheet table body * feat: add table navigation	2025-03-04 22:01:21 +01:00
Carlos Valente	8465b04c89	bump version to 3.14.0	2025-03-04 21:54:29 +01:00
Carlos Valente	718a6ad2b7	refactor: improve editor overflow	2025-03-04 21:54:29 +01:00
Carlos Valente	6ca4bfc363	refactor: allow overriding styles of cuesheet	2025-03-03 15:58:52 +01:00
Carlos Valente	4859026989	refactor: op cannot subscribe to image fields	2025-03-03 15:58:52 +01:00
Carlos Valente	9167a50eda	refactor: project info design review	2025-02-28 19:28:55 +01:00
Carlos Valente	8adca908b3	refactor: improve links inside editor	2025-02-28 19:21:48 +01:00
Carlos Valente	bf99646ad5	refactor: restructure directories	2025-02-28 19:21:48 +01:00
Carlos Valente	308285ce3e	chore: add missing variables	2025-02-28 19:21:48 +01:00
Carlos Valente	dd781a32f6	bump version to 3.13.1	2025-02-27 08:28:21 +01:00
Carlos Valente	c2a6de6195	fix: memoisation of row should allow changes	2025-02-27 08:28:21 +01:00
Carlos Valente	0ac2ce8e84	bump version to 3.13.0	2025-02-26 21:43:24 +01:00
Carlos Valente	3bdd8424eb	chore: remove console statement	2025-02-26 21:43:24 +01:00
Carlos Valente	b3a099255f	fix: missing backstage prop	2025-02-26 21:43:24 +01:00
Carlos Valente	570ff59cfc	feat: add custom field type of image	2025-02-26 21:42:24 +01:00
Alex Christoffer Rasmussen	d0b4c6a279	import id's from sheet (#1516 ) * import id's from sheet * fix test * fix test in utils * remove comment * ensure uri safe ids	2025-02-26 21:12:36 +01:00
Carlos Valente	e90161aa33	refactor: consistent logo sizes	2025-02-25 21:25:28 +01:00
Carlos Valente	e37254107e	style: reword prompt	2025-02-25 21:25:28 +01:00
Carlos Valente	9d6bc0a137	style: clarify resource	2025-02-25 21:25:28 +01:00
Carlos Valente	4cd2dcbab0	refactor: move logic to service	2025-02-25 21:25:28 +01:00
Carlos Valente	8c593b3487	refactor: use memoised selector	2025-02-23 21:50:01 +01:00
Carlos Valente	ba74622569	refactor: use native button	2025-02-23 21:50:01 +01:00
Carlos Valente	f76c0d1a6d	refactor: improve composition performance	2025-02-23 21:50:01 +01:00
Carlos Valente	8e8d3a7824	refactor: send client list on patch	2025-02-23 21:49:53 +01:00
Carlos Valente	6c3ae1f914	refactor: show schedule in smaller screens	2025-02-23 21:49:53 +01:00
Alex Christoffer Rasmussen	b6507c27a6	Report (#1469 ) * create report service * write report from runtimeState * use in UI * clear report * update types * clear all from settings menu * rearence rightclik menu * refactor styling * also report roll events * ontime/under time is same colour * refactor reporter * add target to ontime-refetch * remove menu * fectch only on message from server * memo useGetEventReport * refactor * use staleTime * dont add to menu yet * implement review * clear all from menu * fix merge * start end show * combine test for the go button text and action * add report to menu * extract csv utility * report management * unneeded async * small refacort of triggerReportEntry --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me>	2025-02-23 17:02:09 +01:00
Carlos Valente	21877e4bff	refactor: allow redirecting to view	2025-02-22 16:15:24 +01:00
Carlos Valente	b8d7324be0	feat: allow redirecting to preset	2025-02-22 16:15:24 +01:00
Carlos Valente	88b8e83494	Time until (#1497 ) * Timeuntil in UI (#1461) * cherry pick EventBlockChip * pull data down throug components * add comment * cleanup css Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * fix: account for running day * refactor: improve composition * add partial test --------- Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk>	2025-02-19 13:17:53 +01:00
Carlos Valente	abce0c498c	bump version to 3.12.0	2025-02-18 21:43:16 +01:00
Carlos Valente	6b2e45e7de	refactor: improve template input	2025-02-18 21:43:03 +01:00
Carlos Valente	5fb30c75c4	feat: ontime actions in automation	2025-02-18 21:43:03 +01:00
Carlos Valente	636f78e21e	fix: unique reference for filter items	2025-02-18 21:43:03 +01:00
Carlos Valente	1636745fed	refactor: improve automation flow logging	2025-02-18 21:43:03 +01:00
Carlos Valente	e01ab0c88b	fix: update navigation references	2025-02-18 21:43:03 +01:00
Carlos Valente	0ede753652	fix: missing reference on template input	2025-02-18 21:43:03 +01:00
Alex Christoffer Rasmussen	1f6f3df0f2	ensure extension during rename and delete (#1508 )	2025-02-18 21:25:36 +01:00
Carlos Valente	a5afb32b8a	refactor: show projected time	2025-02-18 14:55:24 +01:00
Carlos Valente	9c41f8ff6b	refactor: public design review	2025-02-18 14:55:24 +01:00
Carlos Valente	1edde03bb4	chore: directory restructure	2025-02-18 14:55:24 +01:00
Carlos Valente	946b6717d2	refactor: backstage design review refactor: improve empty state refactor: review schedule design - fit as many elements as possible - expose cycle interval as an option - stabilise rundown reference - style tweaks	2025-02-18 14:55:24 +01:00
Carlos Valente	f99ad83049	chore: folder structure	2025-02-18 14:55:24 +01:00
Carlos Valente	665496907e	refactor: improve overflow style	2025-02-18 14:14:14 +01:00
Carlos Valente	2867c8301d	refactor: stabilise table options	2025-02-18 14:14:14 +01:00
Carlos Valente	84a5b4fe5b	refactor: use a single menu for table	2025-02-18 14:14:14 +01:00
Carlos Valente	86bb739d90	chore: upgrade zustand	2025-02-18 14:14:14 +01:00
Carlos Valente	2c8b6180d7	refactor: show menu only if enabled	2025-02-18 14:14:14 +01:00
Carlos Valente	4cc138e3c0	chore: directory structure	2025-02-18 14:14:14 +01:00
Carlos Valente	d21e1f996f	refactor: simplify typing	2025-02-17 21:36:18 +01:00
Carlos Valente	11c1b472a2	refactor: do not test automations without outputs	2025-02-17 21:36:18 +01:00
Carlos Valente	891bda6661	refactor: improve async handling	2025-02-17 21:36:18 +01:00
Carlos Valente	c65761448d	refactor: simplify import paths	2025-02-17 21:36:18 +01:00
Carlos Valente	70558c5104	refactor: remove unused template literals	2025-02-17 21:36:18 +01:00
Carlos Valente	c8bf74a719	refactor: migrate chakra alert to custom component	2025-02-17 14:45:23 +01:00
Carlos Valente	10bf4b93ee	doc: add osc disabled warning for cloud users	2025-02-17 14:45:23 +01:00
Carlos Valente	f6449a4326	refactor: tweak reusable info component	2025-02-17 14:45:23 +01:00
Carlos Valente	8d38f52b69	bump version to 3.11.1	2025-02-17 12:59:10 +01:00
Carlos Valente	3d40e31730	fix: error on reading malformed package	2025-02-17 12:59:10 +01:00
Carlos Valente	8ac5c0a9a2	Revert "Timeuntil in UI (#1461 )" This reverts commit `221ff7b3af`.	2025-02-12 22:19:18 +01:00
Carlos Valente	649f0af2cf	refactor: reword error	2025-02-12 22:19:18 +01:00
Carlos Valente	fd9b944ecf	bump version to 3.11.0	2025-02-12 22:19:18 +01:00
Alex Christoffer Rasmussen	0b36608134	Catch xlsx error (#1487 ) * catch potential xlsx errors * clear worksheet errors when starting new connections	2025-02-12 13:38:18 +01:00
Carlos Valente	bac11adeb1	feat: add autocomplete to osc arguments	2025-02-10 20:01:36 +01:00
Carlos Valente	31799f8fab	fix: project created without extension	2025-02-10 07:39:05 +01:00
Carlos Valente	af177060ff	refactor: add next to source fields	2025-02-06 21:20:25 +01:00
Carlos Valente	d26a3cd393	refactor: change order of operations	2025-02-06 21:20:25 +01:00
Carlos Valente	38a3165a79	refactor: larger settings panels	2025-02-04 22:35:17 +01:00
Carlos Valente	1715c19747	refactor: clarify empty text	2025-02-04 22:35:17 +01:00
Carlos Valente	6be6e5fd8d	refactor: handle overflow in menulist	2025-02-04 22:35:17 +01:00
Carlos Valente	44b0cfd928	refactor: allow locking cuesheet and operator	2025-02-04 22:35:00 +01:00
Carlos Valente	3d50b8ce49	refactor: simplify navigation lock	2025-02-04 22:35:00 +01:00
Carlos Valente	c3d66f5bd1	fix: maintain locked and token params	2025-02-01 21:34:29 +01:00
Carlos Valente	d08787a6ba	refactor: allow presets for op and cuesheet	2025-02-01 21:34:29 +01:00
Carlos Valente	f0e6231338	refactor: simplify url preset logic	2025-02-01 21:34:29 +01:00
Carlos Valente	430bfb38f2	chore: test is typescript	2025-02-01 21:34:29 +01:00
Carlos Valente	60354f8ea3	fix: prevent non alphanumeric in pincode	2025-02-01 11:38:58 +01:00
Carlos Valente	bc12531729	refactor: show multiline text in custom fields	2025-02-01 11:38:58 +01:00
Carlos Valente	0b8a694e4f	refactor: allow overriding operator styles	2025-02-01 11:38:58 +01:00
Carlos Valente	73ada99596	fix: update time in block (#1474 ) * fix: update time in block --------- Co-authored-by: arc-alex <ac@omnivox.dk>	2025-01-31 17:20:02 +01:00
Alex Christoffer Rasmussen	f509655d31	update types/node and osc-min (#1475 )	2025-01-30 22:25:25 +01:00
Carlos Valente	fb1bbd6d5c	refactor: fix roll next day	2025-01-27 19:24:11 +01:00
Alex Christoffer Rasmussen	221ff7b3af	Timeuntil in UI (#1461 ) * cherry pick EventBlockChip * pull data down throug components * add comment * cleanup css Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-01-27 16:39:32 +01:00