I've replaced the unit tests for the Rich Text Editor with end-to-end tests.

Here's a summary of the changes: - I removed the existing unit tests for the RichTextEditor component. - I created new end-to-end tests that cover: - Navigating to the cuesheet and opening an event. - Activating the rich text editor for the 'note' field. - Testing bold, link, text color, and background color functionalities. - Verifying that rich text formatting is saved correctly and persists after reopening an event. This change helps ensure the RichTextEditor works as expected within the overall application.
refactor: style tweaks to edit css modal
2026-07-26 10:38:55 +00:00 · 2025-06-14 19:41:42 +00:00 · 2025-06-13 10:36:48 +02:00 · 2025-06-13 10:36:26 +02:00 · 2025-06-12 15:02:35 +02:00 · 2025-06-12 09:54:57 +02:00
451 changed files with 18361 additions and 13615 deletions
@@ -14,12 +14,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -56,12 +56,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -89,12 +89,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -20,13 +20,13 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22
          registry-url: 'https://registry.npmjs.org'

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -17,12 +17,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -73,12 +73,12 @@ jobs:
      - name: Use Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 22

      - name: Setup pnpm
        uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 10

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
@@ -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 +1 @@
-v20.15.1
+v22.15.1
@@ -9,8 +9,8 @@ Ontime consists of 3 distinct parts
 The steps below will assume you have locally installed the necessary dependencies.
 Other dependencies will be installed as part of the setup

- __node__ (~20)
- __pnpm__ (~9)
+- __node__ (~22)
+- __pnpm__ (~10)
 - __docker__ (only necessary to run and build docker images)

 ## LOCAL DEVELOPMENT
@@ -1,13 +1,13 @@
-FROM node:20-bullseye AS builder
+FROM node:22-bullseye AS builder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN npm install -g pnpm@9.5.0
+RUN npm install -g pnpm@10.11.0
 COPY . /app
 WORKDIR /app
 RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
 RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker

-FROM node:20-alpine
+FROM node:22-alpine

 # Set environment variables
 # Environment Variable to signal that we are running production
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.13.1",
+    "version": "3.15.2",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,37 +1,43 @@
 {
  "name": "ontime-ui",
-  "version": "3.13.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",
+    "@lexical/react": "^0.16.1",
+    "@lexical/rich-text": "^0.16.1",
+    "@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",
+    "axios": "^1.9.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": "^5.0.3"
+    "zustand": "^5.0.3",
+    "lexical": "^0.16.1"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -64,11 +70,12 @@
    "@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:",
    "@typescript-eslint/parser": "catalog:",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "4.5.1",
    "eslint": "catalog:",
    "eslint-config-prettier": "catalog:",
    "eslint-plugin-jest": "^28.6.0",
@@ -82,10 +89,10 @@
    "prettier": "catalog:",
    "sass": "^1.57.1",
    "typescript": "catalog:",
-    "vite": "^5.2.11",
-    "vite-plugin-compression2": "^1.3.3",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-tsconfig-paths": "^4.3.1",
+    "vite": "6.3.1",
+    "vite-plugin-compression2": "1.4.0",
+    "vite-plugin-svgr": "4.3.0",
+    "vite-tsconfig-paths": "5.1.4",
    "vitest": "catalog:"
  }
 }
@@ -158,7 +158,14 @@ export default function AppRouter() {
        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
        <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route path='/op' element={<POperator />} />
+        <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,7 +10,6 @@ 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'];
@@ -19,11 +18,8 @@ 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,5 +1,5 @@
 import axios from 'axios';
-import { CustomField, CustomFieldLabel, CustomFields } from 'ontime-types';
+import { CustomField, CustomFieldKey, CustomFields } from 'ontime-types';

 import { apiEntryUrl } from './constants';

@@ -24,15 +24,15 @@ export async function postCustomField(newField: CustomField): Promise<CustomFiel
 /**
 * Edits single custom field
 */
-export async function editCustomField(label: CustomFieldLabel, newField: CustomField): Promise<CustomFields> {
-  const res = await axios.put(`${customFieldsPath}/${label}`, { ...newField });
+export async function editCustomField(key: CustomFieldKey, newField: CustomField): Promise<CustomFields> {
+  const res = await axios.put(`${customFieldsPath}/${key}`, { ...newField });
  return res.data;
 }

 /**
 * Deletes single custom field
 */
-export async function deleteCustomField(label: CustomFieldLabel): Promise<CustomFields> {
-  const res = await axios.delete(`${customFieldsPath}/${label}`);
+export async function deleteCustomField(key: CustomFieldKey): Promise<CustomFields> {
+  const res = await axios.delete(`${customFieldsPath}/${key}`);
  return res.data;
 }
@@ -2,7 +2,7 @@ import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';

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

 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -40,9 +40,11 @@ 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 flatRundowns = aggregateRundowns(rundowns);
+    const sheetData = makeTable(project, flatRundowns, customFields);

-    const sheetData = makeTable(project, rundown, customFields);
    const fileContent = makeCSVFromArrayOfArrays(sheetData);

    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
@@ -1,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,
@@ -11,7 +11,7 @@ export type HasUpdate = {
 * HTTP request to get the latest version and url from github
 */
 export async function getLatestVersion(): Promise<HasUpdate> {
-  const res = await axios.get(`${apiRepoLatest}`);
+  const res = await axios.get(apiRepoLatest);
  return {
    url: res.data.html_url as string,
    version: res.data.tag_name as string,
@@ -11,7 +11,7 @@ export const reportUrl = `${apiEntryUrl}/report`;
 * HTTP request to fetch all reports
 */
 export async function fetchReport(): Promise<OntimeReport> {
-  const res = await axios.get(`${reportUrl}/`);
+  const res = await axios.get(reportUrl);
  return res.data;
 }

@@ -1,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,22 +49,22 @@ 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<Rundown>> {
  return axios.put(`${rundownPath}/batch`, data);
 }

 export type ReorderEntry = {
-  eventId: string;
-  from: number;
-  to: number;
+  entryId: EntryId;
+  destinationId: EntryId;
+  order: 'before' | 'after' | 'insert';
 };

 /**
- * 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<Rundown>> {
  return axios.patch(`${rundownPath}/reorder`, data);
 }

@@ -67,15 +83,36 @@ 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: EntryId): Promise<AxiosResponse<Rundown>> {
+  return axios.patch(`${rundownPath}/applydelay/${delayId}`);
 }

 /**
- * HTTP request to delete given event
+ * HTTP request for cloning an entry
 */
-export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(rundownPath, { data: { ids: eventIds } });
+export async function postCloneEntry(entryId: EntryId): Promise<AxiosResponse<Rundown>> {
+  return axios.post(`${rundownPath}/clone/${entryId}`);
+}
+
+/**
+ * HTTP request for dissolving of a block
+ */
+export async function requestUngroup(blockId: EntryId): Promise<AxiosResponse<Rundown>> {
+  return axios.post(`${rundownPath}/ungroup/${blockId}`);
+}
+
+/**
+ * HTTP request for grouping a list of entries into a block
+ */
+export async function requestGroupEntries(entryIds: EntryId[]): Promise<AxiosResponse<Rundown>> {
+  return axios.post(`${rundownPath}/group`, { ids: entryIds });
+}
+
+/**
+ * HTTP request to delete entries
+ */
+export async function deleteEntries(entryIds: EntryId[]): Promise<AxiosResponse<MessageResponse>> {
+  return axios.delete(rundownPath, { data: { ids: entryIds } });
 }

 /**
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { AuthenticationStatus, CustomFields, 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>
-  );
-}
@@ -22,10 +22,3 @@
 .label {
  color: $label-gray;
 }
-
-.link {
-  color: $label-gray;
-  font-size: $text-body-size;
-  text-decoration: underline;
-  text-underline-offset: 2px;
-}
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { IoArrowForward } from 'react-icons/io5';
 import {
  IconButton,
  Input,
@@ -10,12 +11,12 @@ import {
  ModalOverlay,
  Select,
 } from '@chakra-ui/react';
-import { IoArrowForward } from '@react-icons/all-files/io5/IoArrowForward';

 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';

@@ -58,9 +59,7 @@ export function RedirectClientModal(props: RedirectClientModalProps) {
            Either by selecting a URL Preset or entering a custom path.
            <br />
            <br />
-            <a href='/editor?settings=feature_settings__urlpresets' target='_blank' className={style.link}>
-              Manage URL Presets
-            </a>
+            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
          </Info>
          <div>
            <span className={style.label}>Select View or URL Preset</span>
@@ -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() {
@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
+import { IoAlertCircle } from 'react-icons/io5';

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

@@ -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,6 +1,6 @@
 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 { debounce } from '../../../utils/debounce';
@@ -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,
    });
@@ -0,0 +1,310 @@
+import { LexicalComposer } from '@lexical/react/LexicalComposer';
+import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin';
+import { ContentEditable } from '@lexical/react/LexicalContentEditable';
+import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin';
+import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
+import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary';
+import { LinkPlugin } from '@lexical/react/LexicalLinkPlugin';
+import { ListPlugin } from '@lexical/react/LexicalListPlugin';
+import { MarkdownShortcutPlugin } from '@lexical/react/LexicalMarkdownShortcutPlugin';
+import { TRANSFORMERS } from '@lexical/markdown';
+import { $getRoot, $getSelection, EditorState, FORMAT_TEXT_COMMAND, LexicalEditor, $isRangeSelection, SELECTION_CHANGE_COMMAND, COMMAND_PRIORITY_LOW, $createParagraphNode, $createTextNode, $patchStyleText } from 'lexical';
+import { useEffect, useState, useCallback, useRef } from 'react';
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import { mergeRegister } from '@lexical/utils';
+import { LinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link';
+import { ListItemNode, ListNode } from '@lexical/list';
+import { HeadingNode, QuoteNode } from '@lexical/rich-text';
+import { CodeNode, CodeHighlightNode } from '@lexical/code';
+import { TableNode, TableCellNode, TableRowNode } from '@lexical/table';
+
+// Define initial editor configuration
+const editorConfig = {
+  namespace: 'MyEditor',
+  theme: {
+    ltr: 'ltr',
+    rtl: 'rtl',
+    placeholder: 'editor-placeholder',
+    paragraph: 'editor-paragraph',
+    quote: 'editor-quote',
+    heading: {
+      h1: 'editor-heading-h1',
+      h2: 'editor-heading-h2',
+      h3: 'editor-heading-h3',
+      h4: 'editor-heading-h4',
+      h5: 'editor-heading-h5',
+    },
+    list: {
+      nested: {
+        listitem: 'editor-nested-listitem',
+      },
+      ol: 'editor-list-ol',
+      ul: 'editor-list-ul',
+      listitem: 'editor-listitem',
+    },
+    link: 'editor-link',
+    text: {
+      bold: 'editor-text-bold',
+      italic: 'editor-text-italic',
+      underline: 'editor-text-underline',
+      strikethrough: 'editor-text-strikethrough',
+      underlineStrikethrough: 'editor-text-underlineStrikethrough',
+      code: 'editor-text-code',
+    },
+    code: 'editor-code',
+    codeHighlight: {
+      atrule: 'editor-tokenAttr',
+      attr: 'editor-tokenAttr',
+      boolean: 'editor-tokenProperty',
+      builtin: 'editor-tokenSelector',
+      cdata: 'editor-tokenComment',
+      char: 'editor-tokenSelector',
+      clike: 'editor-tokenComment',
+      comment: 'editor-tokenComment',
+      contentType: 'editor-tokenComment',
+      coord: 'editor-tokenComment',
+      deleted: 'editor-tokenProperty',
+      doctype: 'editor-tokenComment',
+      doi: 'editor-tokenComment',
+      entity: 'editor-tokenOperator',
+      function: 'editor-tokenFunction',
+      important: 'editor-tokenVariable',
+      inserted: 'editor-tokenSelector',
+      keyword: 'editor-tokenAttr',
+      markup: 'editor-tokenComment',
+      merged: 'editor-tokenComment',
+      namespace: 'editor-tokenVariable',
+      number: 'editor-tokenProperty',
+      operator: 'editor-tokenOperator',
+      prolog: 'editor-tokenComment',
+      property: 'editor-tokenProperty',
+      punctuation: 'editor-tokenPunctuation',
+      regex: 'editor-tokenVariable',
+      selector: 'editor-tokenSelector',
+      string: 'editor-tokenSelector',
+      style: 'editor-tokenComment',
+      symbol: 'editor-tokenProperty',
+      tag: 'editor-tokenProperty',
+      url: 'editor-tokenOperator',
+      variable: 'editor-tokenVariable',
+    },
+  },
+  onError(error: Error) {
+    throw error;
+  },
+  nodes: [
+    HeadingNode,
+    ListNode,
+    ListItemNode,
+    QuoteNode,
+    CodeNode,
+    CodeHighlightNode,
+    TableNode,
+    TableCellNode,
+    TableRowNode,
+    LinkNode,
+  ],
+};
+
+interface RichTextEditorProps {
+  initialValue?: string;
+  onChange?: (value: string) => void;
+}
+
+export default function RichTextEditor({ initialValue, onChange }: RichTextEditorProps) {
+  const [isFocused, setIsFocused] = useState(false);
+  const editorRef = useRef<LexicalEditor | null>(null); // Use ref for editor instance
+  const editorWrapperRef = useRef<HTMLDivElement>(null); // Ref for the entire editor + toolbar wrapper
+
+  const handleEditorFocus = () => {
+    setIsFocused(true);
+  };
+
+  // This handleBlur is for the wrapper around the editor and toolbar
+  const handleWrapperBlur = (event: React.FocusEvent<HTMLDivElement>) => {
+    // Check if the new focused element is still within the editor wrapper
+    if (editorWrapperRef.current && !editorWrapperRef.current.contains(event.relatedTarget as Node)) {
+      setIsFocused(false);
+    }
+  };
+
+  const handleChange = useCallback((editorState: EditorState) => {
+    if (onChange) {
+      editorState.read(() => {
+        const root = $getRoot();
+        // For now, sending plain text. Could be HTML or Lexical's format.
+        onChange(root.getTextContent());
+      });
+    }
+  }, [onChange]);
+
+  // Placeholder for initial value loading
+  useEffect(() => {
+    const currentEditor = editorRef.current;
+    if (currentEditor && initialValue && isFocused) { // only update if focused and has initial value
+      currentEditor.update(() => {
+        const root = $getRoot();
+        root.clear();
+        const paragraph = $createParagraphNode();
+        paragraph.append($createTextNode(initialValue));
+        root.append(paragraph);
+        root.selectEnd(); // Move cursor to the end
+      });
+    }
+  }, [initialValue, isFocused]); // Rerun when isFocused changes or initialValue changes (though initialValue should be stable)
+
+
+  if (!isFocused) {
+    return (
+      <div
+        onClick={handleEditorFocus}
+        onFocus={handleEditorFocus}
+        tabIndex={0}
+        style={{ border: '1px solid #ccc', padding: '10px', minHeight: '50px', cursor: 'text' }}
+        role="textbox" // for accessibility
+        aria-placeholder="Click to edit..."
+      >
+        {initialValue || 'Click to edit...'}
+      </div>
+    );
+  }
+
+  // Prepare initial config for when the editor mounts
+  const localEditorConfig = {
+    ...editorConfig,
+    editorState: initialValue && !editorRef.current // Only set initial state if editor hasn't been initialized yet with a value
+      ? () => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          paragraph.append($createTextNode(initialValue));
+          root.append(paragraph);
+        }
+      : undefined,
+  };
+
+  return (
+    <div ref={editorWrapperRef} onBlur={handleWrapperBlur} tabIndex={-1} style={{ border: '1px solid #ccc', position: 'relative', marginTop: '5px' }}>
+      <LexicalComposer initialConfig={localEditorConfig}>
+        <EditorInitializer editorRef={editorRef} />
+        <ToolbarPlugin />
+        <div style={{position: 'relative'}}> {/* Container for ContentEditable and Placeholder */}
+          <RichTextPlugin
+            contentEditable={<ContentEditable style={{ minHeight: '150px', padding: '10px', outline: 'none', resize: 'vertical', userSelect: 'text' }} />}
+            placeholder={<div style={{ position: 'absolute', top: '10px', left: '10px', color: '#aaa', pointerEvents: 'none', userSelect: 'none' }}>Enter text...</div>}
+            ErrorBoundary={LexicalErrorBoundary}
+          />
+        </div>
+        <HistoryPlugin />
+        <OnChangePlugin onChange={handleChange} />
+        <LinkPlugin /> {/* LinkPlugin provides TOGGLE_LINK_COMMAND */}
+        <ListPlugin />
+        <MarkdownShortcutPlugin transformers={TRANSFORMERS} />
+      </LexicalComposer>
+    </div>
+  );
+}
+
+// Helper component to get editor instance and attach it to a ref
+function EditorInitializer({ editorRef }: { editorRef: React.MutableRefObject<LexicalEditor | null> }) {
+  const [editor] = useLexicalComposerContext();
+  useEffect(() => {
+    editorRef.current = editor;
+    return () => {
+      editorRef.current = null;
+    };
+  }, [editor, editorRef]);
+  return null;
+}
+
+
+function ToolbarPlugin() {
+  const [editor] = useLexicalComposerContext();
+  const [isLink, setIsLink] = useState(false);
+  const [isBold, setIsBold] = useState(false);
+  // Add states for other formats if needed, e.g., selectedTextColor, selectedBgColor
+
+  const updateToolbar = useCallback(() => {
+    const selection = $getSelection();
+    if ($isRangeSelection(selection)) {
+      setIsBold(selection.hasFormat('bold'));
+      // Update link state
+      const node = selection.anchor.getNode();
+      const parent = node.getParent();
+      setIsLink(parent?.getType() === 'link' || node.getType() === 'link');
+      // Could also get current text color/bg color here if needed
+      // const style = selection.style;
+      // setSelectedTextColor(style.color);
+      // setSelectedBgColor(style.backgroundColor);
+    }
+  }, [editor]); // editor dependency is implicit via useLexicalComposerContext
+
+  useEffect(() => {
+    return mergeRegister(
+      editor.registerCommand(
+        SELECTION_CHANGE_COMMAND,
+        () => {
+          updateToolbar();
+          return false;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+      // Potentially other listeners here, e.g., for text format changes
+    );
+  }, [editor, updateToolbar]);
+
+
+  const toggleBold = () => {
+    editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'bold');
+  };
+
+  const toggleLink = useCallback(() => {
+    if (isLink) {
+      editor.dispatchCommand(TOGGLE_LINK_COMMAND, null); // Remove link
+    } else {
+      const url = prompt('Enter link URL:');
+      if (url) {
+        editor.dispatchCommand(TOGGLE_LINK_COMMAND, url);
+      }
+    }
+  }, [editor, isLink]);
+
+  return (
+    <div style={{ padding: '8px', borderBottom: '1px solid #ccc', display: 'flex', gap: '8px', userSelect: 'none' }}
+      onMouseDown={(e) => e.preventDefault()} // Prevent editor blur when clicking toolbar
+    >
+      <button onClick={toggleBold} style={{ fontWeight: isBold ? 'bold' : 'normal' }}>B</button>
+      <button onClick={toggleLink} style={{ fontWeight: isLink ? 'bold' : 'normal' }}>{isLink ? 'Unlink' : 'Link'}</button>
+      <button onClick={applyTextColor}>Color</button>
+      <button onClick={applyBackgroundColor}>BG Color</button>
+      {/* Add more buttons here */}
+    </div>
+  );
+}
+
+function applyStyleToSelection(editor: LexicalEditor, styleKey: string, styleValue: string) {
+  editor.update(() => {
+    const selection = $getSelection();
+    if ($isRangeSelection(selection)) {
+      $patchStyleText(selection, { [styleKey]: styleValue });
+    }
+  });
+}
+
+function applyTextColor() {
+  const [editor] = useLexicalComposerContext();
+  const color = prompt('Enter text color (e.g., red, #FF0000):');
+  if (color) {
+    applyStyleToSelection(editor, 'color', color);
+  }
+}
+
+function applyBackgroundColor() {
+  const [editor] = useLexicalComposerContext();
+  const color = prompt('Enter background color (e.g., yellow, #FFFF00):');
+  if (color) {
+    // For background color, Lexical often uses 'highlight' format or direct background-color style
+    // Using FORMAT_TEXT_COMMAND for 'highlight' might be one way if a plugin handles it.
+    // Or, apply direct style:
+    applyStyleToSelection(editor, 'background-color', color);
+  }
+}
@@ -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';

@@ -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,5 +1,5 @@
-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 '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
@@ -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,4 +1,4 @@
-import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
+import { IoLockClosedOutline } from 'react-icons/io5';

 import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
@@ -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';
@@ -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,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';

@@ -126,9 +126,9 @@ function MultiOption(props: EditFormMultiOptionProps) {
            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>
              );
@@ -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';

@@ -1,13 +1,13 @@
 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,
 ) => {
-  const options = structuredClone(additionalOptions);
+  const options = { ...additionalOptions };
  for (const [key, value] of Object.entries(customFields)) {
    if (filterImageType && value.type === 'image') {
      continue;
@@ -18,6 +18,17 @@ export const makeOptionsFromCustomFields = (
  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,
@@ -1,23 +1,30 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { NormalisedRundown, OntimeRundown, OntimeRundownEntry, 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,
@@ -37,16 +44,16 @@ export function useFlatRundown() {

  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
@@ -57,13 +64,13 @@ export function useFlatRundown() {
    }
  }, [projectData]);

-  return { data: flatRunDown, status };
+  return { data: flatRundown, status };
 }

 /**
 * Provides access to a partial rundown based on a filter callback
 */
-export function usePartialRundown(cb: (event: OntimeRundownEntry) => boolean) {
+export function usePartialRundown(cb: (event: OntimeEntry) => boolean) {
  const { data, status } = useFlatRundown();
  const filteredData = useMemo(() => {
    return data.filter(cb);
@@ -0,0 +1,806 @@
+import { useCallback } from 'react';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import {
+  EntryId,
+  isOntimeBlock,
+  isOntimeEvent,
+  MaybeString,
+  OntimeBlock,
+  OntimeEntry,
+  OntimeEvent,
+  Rundown,
+  TimeField,
+  TimeStrategy,
+  TransientEventPayload,
+} from 'ontime-types';
+import { dayInMs, generateId, MILLIS_PER_SECOND, parseUserTime, swapEventData } from 'ontime-utils';
+
+import { moveDown, moveUp } from '../../features/rundown/rundown.utils';
+import { RUNDOWN } from '../api/constants';
+import {
+  deleteEntries,
+  patchReorderEntry,
+  postAddEntry,
+  postCloneEntry,
+  putBatchEditEvents,
+  putEditEntry,
+  ReorderEntry,
+  requestApplyDelay,
+  requestDeleteAll,
+  requestEventSwap,
+  requestGroupEntries,
+  requestUngroup,
+  SwapEntry,
+} from '../api/rundown';
+import { logAxiosError } from '../api/utils';
+import { useEditorSettings } from '../stores/editorSettings';
+
+export type EventOptions = Partial<{
+  // options to any new block (event / delay / block)
+  after: MaybeString;
+  before: MaybeString;
+  // options to blocks of type OntimeEvent
+  defaultPublic: boolean;
+  linkPrevious: boolean;
+  lastEventId: MaybeString;
+}>;
+
+/**
+ * Gather utilities for actions on entries
+ */
+export const useEntryActions = () => {
+  const queryClient = useQueryClient();
+  const {
+    defaultPublic,
+    linkPrevious,
+    defaultTimeStrategy,
+    defaultDuration,
+    defaultWarnTime,
+    defaultDangerTime,
+    defaultTimerType,
+    defaultEndAction,
+  } = useEditorSettings();
+
+  const getEntryById = useCallback(
+    (eventId: string): OntimeEntry | undefined => {
+      const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+      if (!cachedRundown?.entries) {
+        return;
+      }
+      return cachedRundown.entries[eventId];
+    },
+    [queryClient],
+  );
+
+  /**
+   * Calls mutation to add new entry
+   * @private
+   */
+  const _addEntryMutation = useMutation({
+    // TODO(v4): optimistic create entry
+    mutationFn: postAddEntry,
+    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
+  });
+
+  /**
+   * Adds an entry to rundown
+   */
+  const addEntry = useCallback(
+    async (entry: Partial<OntimeEntry>, options?: EventOptions) => {
+      const newEntry: TransientEventPayload = { ...entry, id: generateId() };
+
+      // ************* CHECK OPTIONS specific to events
+      if (isOntimeEvent(newEntry)) {
+        // merge creation time options with event settings
+        const applicationOptions = {
+          after: options?.after,
+          before: options?.before,
+          defaultPublic: options?.defaultPublic ?? defaultPublic,
+          lastEventId: options?.lastEventId,
+          linkPrevious: options?.linkPrevious ?? linkPrevious,
+        };
+
+        if (applicationOptions?.lastEventId) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
+          const rundownData = queryClient.getQueryData<Rundown>(RUNDOWN)!;
+          const previousEvent = rundownData.entries[applicationOptions.lastEventId];
+          if (isOntimeEvent(previousEvent)) {
+            newEntry.timeStart = previousEvent.timeEnd;
+          }
+        }
+
+        // Override event with options from editor settings
+        newEntry.linkStart = applicationOptions.linkPrevious;
+        newEntry.isPublic = applicationOptions.defaultPublic;
+
+        if (newEntry.duration === undefined && newEntry.timeEnd === undefined) {
+          newEntry.duration = parseUserTime(defaultDuration);
+        }
+
+        if (newEntry.timeDanger === undefined) {
+          newEntry.timeDanger = parseUserTime(defaultDangerTime);
+        }
+
+        if (newEntry.timeWarning === undefined) {
+          newEntry.timeWarning = parseUserTime(defaultWarnTime);
+        }
+
+        if (newEntry.timerType === undefined) {
+          newEntry.timerType = defaultTimerType;
+        }
+
+        if (newEntry.endAction === undefined) {
+          newEntry.endAction = defaultEndAction;
+        }
+
+        if (newEntry.timeStrategy === undefined) {
+          newEntry.timeStrategy = defaultTimeStrategy;
+        }
+      }
+
+      // handle adding options that concern all event type
+      if (options?.after) {
+        (newEntry as TransientEventPayload).after = options.after;
+      }
+      if (options?.before) {
+        (newEntry as TransientEventPayload).before = options.before;
+      }
+
+      try {
+        await _addEntryMutation.mutateAsync(newEntry);
+      } catch (error) {
+        logAxiosError('Failed adding event', error);
+      }
+    },
+    [
+      _addEntryMutation,
+      defaultDangerTime,
+      defaultDuration,
+      defaultEndAction,
+      defaultPublic,
+      defaultTimerType,
+      defaultTimeStrategy,
+      defaultWarnTime,
+      linkPrevious,
+      queryClient,
+    ],
+  );
+
+  /**
+   * Calls mutation to clone a selection
+   * @private
+   */
+  const _cloneMutation = useMutation({
+    mutationFn: postCloneEntry,
+    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
+  });
+
+  /**
+   * Clone a selection
+   */
+  const clone = useCallback(
+    async (entryId: EntryId) => {
+      try {
+        await _cloneMutation.mutateAsync(entryId);
+      } catch (error) {
+        logAxiosError('Error cloning entry', error);
+      }
+    },
+    [_cloneMutation],
+  );
+
+  /**
+   * Calls mutation to update existing entry
+   * @private
+   */
+  const _updateEntryMutation = useMutation({
+    mutationFn: putEditEntry,
+    // we optimistically update here
+    onMutate: async (newEvent) => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });
+
+      // Snapshot the previous value
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const eventId = newEvent.id;
+
+      if (previousData && eventId) {
+        // optimistically update object
+        const newRundown = { ...previousData.entries };
+        // @ts-expect-error -- we expect the events to be of same type
+        newRundown[eventId] = { ...newRundown[eventId], ...newEvent };
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order: previousData.order,
+          flatOrder: previousData.flatOrder,
+          entries: newRundown,
+          revision: -1,
+        });
+      }
+
+      // Return a context with the previous and new events
+      return { previousData, newEvent };
+    },
+    // Mutation fails, rollback undoes optimist update
+    onError: (_error, _newEvent, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    },
+    // Mutation finished, failed or successful
+    // Fetch anyway, just to be sure
+    onSettled: async () => {
+      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Updates existing entry
+   */
+  const updateEntry = useCallback(
+    async (event: Partial<OntimeEntry>) => {
+      try {
+        await _updateEntryMutation.mutateAsync(event);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
+      }
+    },
+    [_updateEntryMutation],
+  );
+
+  const updateCustomField = useCallback(
+    async (entryId: EntryId, field: string, value: string) => {
+      updateEntry({ id: entryId, custom: { [field]: value } });
+    },
+    [updateEntry],
+  );
+
+  /**
+   * Updates time of existing event
+   * @param eventId {EntryId} - id of the event
+   * @param field {TimeField} - field to update
+   * @param value {string} - new value string to be parsed
+   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
+   */
+  const updateTimer = useCallback(
+    async (eventId: EntryId, field: TimeField, value: string, lockOnUpdate?: boolean) => {
+      // an empty value with no lock has no domain validity
+      if (!lockOnUpdate && value === '') {
+        return;
+      }
+
+      const newEvent: Partial<OntimeEvent> = {
+        id: eventId,
+      };
+
+      // check if we should lock the field
+      if (lockOnUpdate) {
+        if (field === 'timeEnd') {
+          // an empty value indicates that we should unlock the field
+          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
+          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
+        } else if (field === 'duration') {
+          // an empty value indicates that we should unlock the field
+          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
+          newEvent.duration = value === '' ? undefined : calculateNewValue();
+        } else if (field === 'timeStart') {
+          // an empty values means we should link to the previous
+          newEvent.linkStart = value === '';
+          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
+        }
+      } else {
+        newEvent[field] = calculateNewValue();
+      }
+
+      try {
+        await _updateEntryMutation.mutateAsync(newEvent);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
+      }
+
+      /**
+       * Utility function to calculate the new time value
+       */
+      function calculateNewValue(): number {
+        let newValMillis = 0;
+
+        // check for previous keyword
+        if (value === 'p' || value === 'prev' || value === 'previous') {
+          newValMillis = getPreviousEnd();
+
+          // check for adding time keyword
+        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
+          // TODO: is this logic solid?
+          const remainingString = value.substring(1);
+          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
+        } else {
+          newValMillis = parseUserTime(value);
+        }
+        // dont allow timer values over 23:59:59
+        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
+      }
+
+      /**
+       * Utility function to get the previous event end time
+       */
+      function getPreviousEnd(): number {
+        const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+
+        if (!cachedRundown?.order || !cachedRundown?.entries) {
+          return 0;
+        }
+
+        const index = cachedRundown.order.indexOf(eventId);
+        if (index === 0) {
+          return 0;
+        }
+        let previousEnd = 0;
+        for (let i = index - 1; i >= 0; i--) {
+          const event = cachedRundown.entries[cachedRundown.order[i]];
+          if (isOntimeEvent(event)) {
+            previousEnd = event.timeEnd;
+            break;
+          }
+        }
+        return previousEnd;
+      }
+    },
+    [_updateEntryMutation, queryClient],
+  );
+
+  /**
+   * Calls mutation to edit multiple events
+   * @private
+   */
+  const _batchUpdateEventsMutation = useMutation({
+    mutationFn: putBatchEditEvents,
+    onMutate: async ({ ids, data }) => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });
+
+      // Snapshot the previous value
+      const previousRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+
+      if (previousRundown) {
+        const eventIds = new Set(ids);
+        const newRundown = { ...previousRundown.entries };
+
+        eventIds.forEach((eventId) => {
+          if (Object.hasOwn(newRundown, eventId)) {
+            const event = newRundown[eventId];
+            if (isOntimeEvent(event)) {
+              newRundown[eventId] = {
+                ...event,
+                ...data,
+              };
+            }
+          }
+        });
+
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousRundown.id,
+          title: previousRundown.title,
+          order: previousRundown.order,
+          flatOrder: previousRundown.flatOrder,
+          entries: newRundown,
+          revision: -1,
+        });
+      }
+
+      // Return a context with the previous rundown
+      return { previousRundown };
+    },
+    onSuccess: (response) => {
+      if (!response.data) return;
+
+      const { id, title, order, flatOrder, entries, revision } = response.data;
+      queryClient.setQueryData<Rundown>(RUNDOWN, {
+        id,
+        title,
+        order,
+        flatOrder,
+        entries,
+        revision,
+      });
+    },
+    onError: (_error, _newEvent, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousRundown);
+    },
+  });
+
+  const batchUpdateEvents = useCallback(
+    async (data: Partial<OntimeEvent>, eventIds: string[]) => {
+      try {
+        await _batchUpdateEventsMutation.mutateAsync({ ids: eventIds, data });
+      } catch (error) {
+        logAxiosError('Error updating events', error);
+      }
+    },
+    [_batchUpdateEventsMutation],
+  );
+
+  /**
+   * Calls mutation to delete an entry
+   * @private
+   */
+  const _deleteEntryMutation = useMutation({
+    mutationFn: deleteEntries,
+    // we optimistically update here
+    onMutate: async (entryIds: EntryId[]) => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });
+
+      // Snapshot the previous value
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+
+      if (previousData) {
+        // optimistically update object
+        const { entries, order, flatOrder } = optimisticDeleteEntries(entryIds, previousData);
+
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order,
+          flatOrder,
+          entries,
+          revision: -1,
+        });
+      }
+
+      // Return a context with the previous and new events
+      return { previousData };
+    },
+
+    // Mutation fails, rollback undoes optimist update
+    onError: (_error, _entryIds, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    },
+    // Mutation finished, failed or successful
+    // Fetch anyway, just to be sure
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Deletes an event entry from the rundown
+   */
+  const deleteEntry = useCallback(
+    async (entryIds: EntryId[]) => {
+      try {
+        await _deleteEntryMutation.mutateAsync(entryIds);
+      } catch (error) {
+        logAxiosError('Error deleting event', error);
+      }
+    },
+    [_deleteEntryMutation],
+  );
+
+  /**
+   * Calls mutation to delete all events
+   * @private
+   */
+  const _deleteAllEntriesMutation = useMutation({
+    mutationFn: requestDeleteAll,
+    // we optimistically update here
+    onMutate: async () => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });
+
+      // Snapshot the previous value
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+
+      // optimistically update object
+      queryClient.setQueryData<Rundown>(RUNDOWN, {
+        id: previousData?.id ?? 'default',
+        title: previousData?.title ?? '',
+        order: [],
+        flatOrder: [],
+        entries: {},
+        revision: -1,
+      });
+
+      // Return a context with the previous and new events
+      return { previousData };
+    },
+
+    // Mutation fails, rollback optimist update
+    onError: (_error, _, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    },
+    // Mutation finished, failed or successful
+    // Fetch anyway, just to be sure
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Deletes all entries in the rundown
+   */
+  const deleteAllEntries = useCallback(async () => {
+    try {
+      await _deleteAllEntriesMutation.mutateAsync();
+    } catch (error) {
+      logAxiosError('Error deleting events', error);
+    }
+  }, [_deleteAllEntriesMutation]);
+
+  /**
+   * Calls mutation to apply a delay
+   * @private
+   */
+  const _applyDelayMutation = useMutation({
+    mutationFn: requestApplyDelay,
+    onSuccess: (response) => {
+      if (!response.data) return;
+
+      const { id, title, order, flatOrder, entries, revision } = response.data;
+      queryClient.setQueryData<Rundown>(RUNDOWN, {
+        id,
+        title,
+        order,
+        flatOrder,
+        entries,
+        revision,
+      });
+    },
+    // Mutation finished, failed or successful
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Applies a given delay
+   */
+  const applyDelay = useCallback(
+    async (delayEventId: EntryId) => {
+      try {
+        await _applyDelayMutation.mutateAsync(delayEventId);
+      } catch (error) {
+        logAxiosError('Error applying delay', error);
+      }
+    },
+    [_applyDelayMutation],
+  );
+
+  /**
+   * Calls mutation to dissolve a block
+   * @private
+   */
+  const _ungroupMutation = useMutation({
+    mutationFn: requestUngroup,
+    onSuccess: (response) => {
+      if (!response.data) return;
+
+      const { id, title, order, flatOrder, entries, revision } = response.data;
+      queryClient.setQueryData<Rundown>(RUNDOWN, {
+        id,
+        title,
+        order,
+        flatOrder,
+        entries,
+        revision,
+      });
+    },
+    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
+  });
+
+  /**
+   * Deletes a block and moves its events to the top level
+   */
+  const ungroup = useCallback(
+    async (blockId: EntryId) => {
+      try {
+        await _ungroupMutation.mutateAsync(blockId);
+      } catch (error) {
+        logAxiosError('Error dissolving block', error);
+      }
+    },
+    [_ungroupMutation],
+  );
+
+  /**
+   * Calls mutation to create a block with a selection
+   * @private
+   */
+  const _groupEntriesMutation = useMutation({
+    mutationFn: requestGroupEntries,
+    onSuccess: (response) => {
+      if (!response.data) return;
+
+      const { id, title, order, flatOrder, entries, revision } = response.data;
+      queryClient.setQueryData<Rundown>(RUNDOWN, {
+        id,
+        title,
+        order,
+        flatOrder,
+        entries,
+        revision,
+      });
+    },
+    onSettled: () => queryClient.invalidateQueries({ queryKey: RUNDOWN }),
+  });
+
+  /**
+   * Create a block with a selection
+   */
+  const groupEntries = useCallback(
+    async (entryIds: EntryId[]) => {
+      try {
+        await _groupEntriesMutation.mutateAsync(entryIds);
+      } catch (error) {
+        logAxiosError('Error grouping entries', error);
+      }
+    },
+    [_groupEntriesMutation],
+  );
+
+  /**
+   * Calls mutation to reorder an entry
+   * @private
+   */
+  const _reorderEntryMutation = useMutation({
+    mutationFn: patchReorderEntry,
+    // Mutation finished, failed or successful
+    // Fetch anyway, just to be sure
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Reorders a given entry
+   */
+  const reorderEntry = useCallback(
+    async (entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') => {
+      try {
+        const reorderObject: ReorderEntry = {
+          entryId,
+          destinationId,
+          order,
+        };
+        await _reorderEntryMutation.mutateAsync(reorderObject);
+      } catch (error) {
+        logAxiosError('Error re-ordering event', error);
+      }
+    },
+    [_reorderEntryMutation],
+  );
+
+  const move = useCallback(async (entryId: EntryId, direction: 'up' | 'down') => {
+    const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+    if (!cachedRundown?.order) {
+      return;
+    }
+    const { destinationId, order } =
+      direction === 'up'
+        ? moveUp(entryId, cachedRundown.order, cachedRundown.entries)
+        : moveDown(entryId, cachedRundown.order, cachedRundown.entries);
+
+    if (destinationId) {
+      try {
+        const reorderObject: ReorderEntry = {
+          entryId,
+          destinationId,
+          order: order as 'before' | 'after' | 'insert',
+        };
+        await _reorderEntryMutation.mutateAsync(reorderObject);
+      } catch (error) {
+        logAxiosError('Error re-ordering event', error);
+      }
+    }
+  }, []);
+
+  /**
+   * Calls mutation to swap events
+   * @private
+   */
+  const _swapEvents = useMutation({
+    mutationFn: requestEventSwap,
+    // we optimistically update here
+    onMutate: async ({ from, to }) => {
+      // cancel ongoing queries
+      await queryClient.cancelQueries({ queryKey: RUNDOWN });
+
+      // Snapshot the previous value
+      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      if (previousData) {
+        // optimistically update object
+        const newRundown = { ...previousData.entries };
+        const eventA = previousData.entries[from];
+        const eventB = previousData.entries[to];
+
+        if (!isOntimeEvent(eventA) || !isOntimeEvent(eventB)) {
+          return;
+        }
+
+        const [newA, newB] = swapEventData(eventA, eventB);
+        newRundown[from] = newA;
+        newRundown[to] = newB;
+
+        queryClient.setQueryData<Rundown>(RUNDOWN, {
+          id: previousData.id,
+          title: previousData.title,
+          order: previousData.order,
+          flatOrder: previousData.flatOrder,
+          entries: newRundown,
+          revision: -1,
+        });
+      }
+
+      // Return a context with the previous events
+      return { previousData };
+    },
+
+    // Mutation fails, rollback undoes optimist update
+    onError: (_error, _eventId, context) => {
+      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    },
+    // Mutation finished, failed or successful
+    // Fetch anyway, just to be sure
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: RUNDOWN });
+    },
+  });
+
+  /**
+   * Swaps the schedule of two events
+   */
+  const swapEvents = useCallback(
+    async ({ from, to }: SwapEntry) => {
+      try {
+        await _swapEvents.mutateAsync({ from, to });
+      } catch (error) {
+        logAxiosError('Error re-ordering event', error);
+      }
+    },
+    [_swapEvents],
+  );
+
+  return {
+    addEntry,
+    applyDelay,
+    batchUpdateEvents,
+    clone,
+    deleteEntry,
+    deleteAllEntries,
+    ungroup,
+    getEntryById,
+    groupEntries,
+    move,
+    reorderEntry,
+    swapEvents,
+    updateEntry,
+    updateTimer,
+    updateCustomField,
+  };
+};
+
+/**
+ * Utility to optimistically delete entries from client cache
+ */
+function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
+  const entries = { ...rundown.entries };
+  let order = [...rundown.order];
+  let flatOrder = [...rundown.flatOrder];
+
+  for (let i = 0; i < entryIds.length; i++) {
+    const entry = entries[entryIds[i]];
+    deleteEntry(entry);
+  }
+
+  function deleteEntry(entry: OntimeEntry) {
+    if (isOntimeBlock(entry) || !entry.parent) {
+      order = order.filter((id) => id !== entry.id);
+    } else {
+      const parent = entries[entry.parent] as OntimeBlock;
+      parent.events = parent.events.filter((event) => event !== entry.id);
+    }
+
+    delete entries[entry.id];
+    flatOrder = flatOrder.filter((id) => id !== entry.id);
+  }
+
+  return { entries, order, flatOrder };
+}
@@ -1,636 +0,0 @@
-import { useCallback } from 'react';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import {
-  isOntimeEvent,
-  OntimeBlock,
-  OntimeDelay,
-  OntimeEvent,
-  OntimeRundownEntry,
-  RundownCached,
-  TimeField,
-  TimeStrategy,
-  TransientEventPayload,
-} from 'ontime-types';
-import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
-
-import { RUNDOWN } from '../api/constants';
-import {
-  ReorderEntry,
-  requestApplyDelay,
-  requestBatchPutEvents,
-  requestDelete,
-  requestDeleteAll,
-  requestEventSwap,
-  requestPostEvent,
-  requestPutEvent,
-  requestReorderEvent,
-  SwapEntry,
-} from '../api/rundown';
-import { logAxiosError } from '../api/utils';
-import { useEditorSettings } from '../stores/editorSettings';
-
-export type EventOptions = Partial<{
-  // options to any new block (event / delay / block)
-  after: string;
-  before: string;
-  // options to blocks of type OntimeEvent
-  defaultPublic: boolean;
-  linkPrevious: boolean;
-  lastEventId: string;
-}>;
-
-/**
- * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
- */
-export const useEventAction = () => {
-  const queryClient = useQueryClient();
-  const {
-    defaultPublic,
-    linkPrevious,
-    defaultTimeStrategy,
-    defaultDuration,
-    defaultWarnTime,
-    defaultDangerTime,
-    defaultTimerType,
-    defaultEndAction,
-  } = useEditorSettings();
-
-  const getEventById = useCallback(
-    (eventId: string) => {
-      const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
-      if (!cachedRundown?.rundown) {
-        return;
-      }
-      return cachedRundown.rundown[eventId];
-    },
-    [queryClient],
-  );
-
-  /**
-   * Calls mutation to add new event
-   * @private
-   */
-  const _addEventMutation = useMutation({
-    mutationFn: requestPostEvent,
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Adds an event to rundown
-   */
-  const addEvent = useCallback(
-    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
-      const newEvent: TransientEventPayload = { ...event };
-
-      // ************* CHECK OPTIONS specific to events
-      if (isOntimeEvent(newEvent)) {
-        // merge creation time options with event settings
-        const applicationOptions = {
-          after: options?.after,
-          before: options?.before,
-          defaultPublic: options?.defaultPublic ?? defaultPublic,
-          lastEventId: options?.lastEventId,
-          linkPrevious: options?.linkPrevious ?? linkPrevious,
-        };
-
-        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
-          newEvent.linkStart = applicationOptions.lastEventId;
-        } else if (applicationOptions?.lastEventId) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
-          const rundownData = queryClient.getQueryData<RundownCached>(RUNDOWN)!;
-          const { rundown } = rundownData;
-          const previousEvent = rundown[applicationOptions.lastEventId];
-          if (isOntimeEvent(previousEvent)) {
-            newEvent.timeStart = previousEvent.timeEnd;
-          }
-        }
-
-        // Override event with options from editor settings
-        if (applicationOptions.defaultPublic) {
-          newEvent.isPublic = true;
-        }
-
-        if (newEvent.duration === undefined && newEvent.timeEnd === undefined) {
-          newEvent.duration = parseUserTime(defaultDuration);
-        }
-
-        if (newEvent.timeDanger === undefined) {
-          newEvent.timeDanger = parseUserTime(defaultDangerTime);
-        }
-
-        if (newEvent.timeWarning === undefined) {
-          newEvent.timeWarning = parseUserTime(defaultWarnTime);
-        }
-
-        if (newEvent.timerType === undefined) {
-          newEvent.timerType = defaultTimerType;
-        }
-
-        if (newEvent.endAction === undefined) {
-          newEvent.endAction = defaultEndAction;
-        }
-
-        if (newEvent.timeStrategy === undefined) {
-          newEvent.timeStrategy = defaultTimeStrategy;
-        }
-      }
-
-      // handle adding options that concern all event type
-      if (options?.after) {
-        // @ts-expect-error -- not sure how to type this, <after> is a transient property
-        newEvent.after = options.after;
-      }
-      if (options?.before) {
-        // @ts-expect-error -- not sure how to type this, <before> is a transient property
-        newEvent.before = options.before;
-      }
-
-      try {
-        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
-      } catch (error) {
-        logAxiosError('Failed adding event', error);
-      }
-    },
-    [
-      _addEventMutation,
-      defaultDangerTime,
-      defaultDuration,
-      defaultEndAction,
-      defaultPublic,
-      defaultTimerType,
-      defaultTimeStrategy,
-      defaultWarnTime,
-      linkPrevious,
-      queryClient,
-    ],
-  );
-
-  /**
-   * Calls mutation to update existing event
-   * @private
-   */
-  const _updateEventMutation = useMutation({
-    mutationFn: requestPutEvent,
-    // we optimistically update here
-    onMutate: async (newEvent) => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
-      const eventId = newEvent.id;
-
-      if (previousData && eventId) {
-        // optimistically update object
-        const newRundown = { ...previousData.rundown };
-        // @ts-expect-error -- we expect the events to be of same type
-        newRundown[eventId] = { ...newRundown[eventId], ...newEvent };
-        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
-      }
-
-      // Return a context with the previous and new events
-      return { previousData, newEvent };
-    },
-    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
-    },
-    // Mutation finished, failed or successful
-    // Fetch anyway, just to be sure
-    onSettled: async () => {
-      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Updates existing event
-   */
-  const updateEvent = useCallback(
-    async (event: Partial<OntimeRundownEntry>) => {
-      try {
-        await _updateEventMutation.mutateAsync(event);
-      } catch (error) {
-        logAxiosError('Error updating event', error);
-      }
-    },
-    [_updateEventMutation],
-  );
-
-  const updateCustomField = useCallback(
-    async (eventId: string, field: string, value: string) => {
-      updateEvent({ id: eventId, custom: { [field]: value } });
-    },
-    [updateEvent],
-  );
-
-  /**
-   * Updates time of existing event
-   * @param eventId {string} - id of the event
-   * @param field {TimeField} - field to update
-   * @param value {string} - new value string to be parsed
-   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
-   */
-  const updateTimer = useCallback(
-    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
-      // an empty value with no lock has no domain validity
-      if (!lockOnUpdate && value === '') {
-        return;
-      }
-
-      const newEvent: Partial<OntimeEvent> = {
-        id: eventId,
-      };
-
-      // check if we should lock the field
-      if (lockOnUpdate) {
-        if (field === 'timeEnd') {
-          // an empty value indicates that we should unlock the field
-          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
-          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
-        } else if (field === 'duration') {
-          // an empty value indicates that we should unlock the field
-          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
-          newEvent.duration = value === '' ? undefined : calculateNewValue();
-        } else if (field === 'timeStart') {
-          // an empty values means we should link to the previous
-          newEvent.linkStart = value === '' ? 'true' : null;
-          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
-        }
-      } else {
-        newEvent[field] = calculateNewValue();
-      }
-
-      try {
-        await _updateEventMutation.mutateAsync(newEvent);
-      } catch (error) {
-        logAxiosError('Error updating event', error);
-      }
-
-      /**
-       * Utility function to calculate the new time value
-       */
-      function calculateNewValue(): number {
-        let newValMillis = 0;
-
-        // check for previous keyword
-        if (value === 'p' || value === 'prev' || value === 'previous') {
-          newValMillis = getPreviousEnd();
-
-          // check for adding time keyword
-        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
-          // TODO: is this logic solid?
-          const remainingString = value.substring(1);
-          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
-        } else {
-          newValMillis = parseUserTime(value);
-        }
-        // dont allow timer values over 23:59:59
-        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
-      }
-
-      /**
-       * Utility function to get the previous event end time
-       */
-      function getPreviousEnd(): number {
-        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
-
-        if (!cachedRundown?.order || !cachedRundown?.rundown) {
-          return 0;
-        }
-
-        const index = cachedRundown.order.indexOf(eventId);
-        if (index === 0) {
-          return 0;
-        }
-        let previousEnd = 0;
-        for (let i = index - 1; i >= 0; i--) {
-          const event = cachedRundown.rundown[cachedRundown.order[i]];
-          if (isOntimeEvent(event)) {
-            previousEnd = event.timeEnd;
-            break;
-          }
-        }
-        return previousEnd;
-      }
-    },
-    [_updateEventMutation, queryClient],
-  );
-
-  /**
-   * Calls mutation to edit multiple events
-   * @private
-   */
-  const _batchUpdateEventsMutation = useMutation({
-    mutationFn: requestBatchPutEvents,
-    onMutate: async ({ ids, data }) => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousEvents = queryClient.getQueryData<RundownCached>(RUNDOWN);
-
-      if (previousEvents) {
-        const eventIds = new Set(ids);
-        const newRundown = { ...previousEvents.rundown };
-
-        eventIds.forEach((eventId) => {
-          if (Object.hasOwn(newRundown, eventId)) {
-            const event = newRundown[eventId];
-            if (isOntimeEvent(event)) {
-              newRundown[eventId] = {
-                ...event,
-                ...data,
-              };
-            }
-          }
-        });
-
-        queryClient.setQueryData(RUNDOWN, { order: previousEvents.order, rundown: newRundown, revision: -1 });
-      }
-      // Return a context with the previous and new events
-      return { previousEvents };
-    },
-    onSettled: async () => {
-      await queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousEvents);
-    },
-    networkMode: 'always',
-  });
-
-  const batchUpdateEvents = useCallback(
-    async (data: Partial<OntimeEvent>, eventIds: string[]) => {
-      try {
-        await _batchUpdateEventsMutation.mutateAsync({ ids: eventIds, data });
-      } catch (error) {
-        logAxiosError('Error updating events', error);
-      }
-    },
-    [_batchUpdateEventsMutation],
-  );
-
-  /**
-   * Calls mutation to delete an event
-   * @private
-   */
-  const _deleteEventMutation = useMutation({
-    mutationFn: requestDelete,
-    // we optimistically update here
-    onMutate: async (eventIds: string[]) => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
-
-      if (previousData) {
-        // optimistically update object
-        const newOrder = previousData.order.filter((id) => !eventIds.includes(id));
-        const newRundown = { ...previousData.rundown };
-        for (const eventId of eventIds) {
-          delete newRundown[eventId];
-        }
-
-        queryClient.setQueryData(RUNDOWN, {
-          order: newOrder,
-          rundown: newRundown,
-          revision: -1,
-        });
-      }
-
-      // Return a context with the previous and new events
-      return { previousData };
-    },
-
-    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
-    },
-    // Mutation finished, failed or successful
-    // Fetch anyway, just to be sure
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Deletes an event form the list
-   */
-  const deleteEvent = useCallback(
-    async (eventIds: string[]) => {
-      try {
-        await _deleteEventMutation.mutateAsync(eventIds);
-      } catch (error) {
-        logAxiosError('Error deleting event', error);
-      }
-    },
-    [_deleteEventMutation],
-  );
-
-  /**
-   * Calls mutation to delete all events
-   * @private
-   */
-  const _deleteAllEventsMutation = useMutation({
-    mutationFn: requestDeleteAll,
-    // we optimistically update here
-    onMutate: async () => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
-
-      // optimistically update object
-      queryClient.setQueryData(RUNDOWN, { rundown: {}, order: [], revision: -1 });
-
-      // Return a context with the previous and new events
-      return { previousData };
-    },
-
-    // Mutation fails, rollback undos optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
-    },
-    // Mutation finished, failed or successful
-    // Fetch anyway, just to be sure
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Deletes all events from list
-   */
-  const deleteAllEvents = useCallback(async () => {
-    try {
-      await _deleteAllEventsMutation.mutateAsync();
-    } catch (error) {
-      logAxiosError('Error deleting events', error);
-    }
-  }, [_deleteAllEventsMutation]);
-
-  /**
-   * Calls mutation to apply a delay
-   * @private
-   */
-  const _applyDelayMutation = useMutation({
-    mutationFn: requestApplyDelay,
-    // Mutation finished, failed or successful
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Applies a given delay block
-   */
-  const applyDelay = useCallback(
-    async (delayEventId: string) => {
-      try {
-        await _applyDelayMutation.mutateAsync(delayEventId);
-      } catch (error) {
-        logAxiosError('Error applying delay', error);
-      }
-    },
-    [_applyDelayMutation],
-  );
-
-  /**
-   * Calls mutation to reorder an event
-   * @private
-   */
-  const _reorderEventMutation = useMutation({
-    mutationFn: requestReorderEvent,
-    // we optimistically update here
-    onMutate: async (data) => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
-
-      if (previousData) {
-        // optimistically update object
-        const newOrder = reorderArray(previousData.order, data.from, data.to);
-
-        queryClient.setQueryData(RUNDOWN, { order: newOrder, rundown: previousData.rundown, revision: -1 });
-      }
-
-      // Return a context with the previous and new events
-      return { previousData };
-    },
-
-    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
-    },
-    // Mutation finished, failed or successful
-    // Fetch anyway, just to be sure
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Reorders a given event
-   */
-  const reorderEvent = useCallback(
-    async (eventId: string, from: number, to: number) => {
-      try {
-        const reorderObject: ReorderEntry = {
-          eventId,
-          from,
-          to,
-        };
-        await _reorderEventMutation.mutateAsync(reorderObject);
-      } catch (error) {
-        logAxiosError('Error re-ordering event', error);
-      }
-    },
-    [_reorderEventMutation],
-  );
-
-  /**
-   * Calls mutation to swap events
-   * @private
-   */
-  const _swapEvents = useMutation({
-    mutationFn: requestEventSwap,
-    // we optimistically update here
-    onMutate: async ({ from, to }) => {
-      // cancel ongoing queries
-      await queryClient.cancelQueries({ queryKey: RUNDOWN });
-
-      // Snapshot the previous value
-      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
-      if (previousData) {
-        // optimistically update object
-        const newRundown = { ...previousData.rundown };
-        const eventA = previousData.rundown[from];
-        const eventB = previousData.rundown[to];
-
-        if (!isOntimeEvent(eventA) || !isOntimeEvent(eventB)) {
-          return;
-        }
-
-        const { newA, newB } = swapEventData(eventA, eventB);
-        newRundown[from] = newA;
-        newRundown[to] = newB;
-
-        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
-      }
-
-      // Return a context with the previous events
-      return { previousData };
-    },
-
-    // Mutation fails, rollback undoes optimist update
-    onError: (_error, _eventId, context) => {
-      queryClient.setQueryData(RUNDOWN, context?.previousData);
-    },
-    // Mutation finished, failed or successful
-    // Fetch anyway, just to be sure
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: RUNDOWN });
-    },
-    networkMode: 'always',
-  });
-
-  /**
-   * Swaps the schedule of two events
-   */
-  const swapEvents = useCallback(
-    async ({ from, to }: SwapEntry) => {
-      try {
-        await _swapEvents.mutateAsync({ from, to });
-      } catch (error) {
-        logAxiosError('Error re-ordering event', error);
-      }
-    },
-    [_swapEvents],
-  );
-
-  return {
-    addEvent,
-    applyDelay,
-    batchUpdateEvents,
-    deleteEvent,
-    deleteAllEvents,
-    getEventById,
-    reorderEvent,
-    swapEvents,
-    updateEvent,
-    updateTimer,
-    updateCustomField,
-  };
-};
@@ -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,4 +1,4 @@
-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';
@@ -91,14 +91,6 @@ export const setPlayback = {
  },
 };

-export const useInfoPanel = createSelector((state: RuntimeStore) => ({
-  eventNow: state.eventNow,
-  eventNext: state.eventNext,
-  playback: state.timer.playback,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  numEvents: state.runtime.numEvents,
-}));
-
 export const useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);

 export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
@@ -145,8 +137,6 @@ export const useProgressData = createSelector((state: RuntimeStore) => ({
  timeDanger: state.eventNow?.timeDanger ?? null,
 }));

-export const setClientName = (newName: string) => socketSendJson('set-client-name', newName);
-
 export const useRuntimeOverview = createSelector((state: RuntimeStore) => ({
  plannedStart: state.runtime.plannedStart,
  actualStart: state.runtime.actualStart,
@@ -160,7 +150,7 @@ export const useRuntimePlaybackOverview = createSelector((state: RuntimeStore) =

  numEvents: state.runtime.numEvents,
  selectedEventIndex: state.runtime.selectedEventIndex,
-  offset: state.runtime.offset,
+  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,

  currentBlock: state.currentBlock,
 }));
@@ -170,6 +160,15 @@ export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
  offset: state.runtime.offset,
 }));

+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,
+}));
+
 export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
  offset: state.runtime.offset,
 }));
@@ -183,6 +182,12 @@ 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) => ({
    playback: state.timer.playback,
@@ -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,
@@ -8,4 +8,5 @@ export const projectDataPlaceholder: ProjectData = {
  backstageUrl: '',
  backstageInfo: '',
  projectLogo: null,
+  custom: [],
 };
@@ -1,9 +1,20 @@
 import { QueryClient } from '@tanstack/react-query';

+import { isOntimeCloud } from '../externals';
+
 export const ontimeQueryClient = new QueryClient({
  defaultOptions: {
    queries: {
      gcTime: 1000 * 60 * 10, // 10 min
    },
+    mutations: {
+      /**
+       * React Query detects whether the client is online
+       * However, web access is not required for the clients when deployed locally
+       * - use 'always' for clients that may be online
+       * - use 'online' for clients that are connected to the cloud
+       */
+      networkMode: isOntimeCloud ? 'online' : 'always',
+    },
  },
 });
@@ -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
 */
@@ -2,4 +2,4 @@

 exports[`cx() > ignores falsy values 1`] = `""`;

-exports[`cx() > merges styles 1`] = `"_test_98a1e0 _another_98a1e0"`;
+exports[`cx() > merges styles 1`] = `"_test_d5d33f _another_d5d33f"`;
@@ -0,0 +1,68 @@
+import { EndAction, EntryCustomFields, OntimeEvent, SupportedEntry, TimerType, TimeStrategy } from 'ontime-types';
+
+import { cloneEvent } from '../clone';
+
+describe('cloneEvent()', () => {
+  it('creates a stem from a given event', () => {
+    const original: OntimeEvent = {
+      id: 'unique',
+      type: SupportedEntry.Event,
+      title: 'title',
+      cue: 'cue',
+      note: 'note',
+      timeStart: 0,
+      duration: 10,
+      timeEnd: 10,
+      timerType: TimerType.CountDown,
+      timeStrategy: TimeStrategy.LockEnd,
+      parent: 'test',
+      linkStart: false,
+      countToEnd: false,
+      endAction: EndAction.None,
+      isPublic: false,
+      skip: false,
+      colour: 'F00',
+      revision: 10,
+      timeWarning: 120000,
+      timeDanger: 60000,
+      delay: 0,
+      dayOffset: 0,
+      gap: 0,
+      triggers: [],
+      custom: {
+        lighting: '3',
+      } as EntryCustomFields,
+    };
+
+    const cloned = cloneEvent(original);
+    expect(cloned).not.toBe(original);
+    expect(cloned.custom).not.toBe(original.custom);
+    expect(cloned.triggers).not.toBe(original.triggers);
+
+    expect(cloned).toMatchObject({
+      type: SupportedEntry.Event,
+      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,
+      triggers: original.triggers,
+      custom: original.custom,
+    });
+  });
+});
@@ -1,4 +1,6 @@
-import { makeCSVFromArrayOfArrays } from '../csv';
+import { OntimeEntry, ProjectRundowns, Rundown } from 'ontime-types';
+
+import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../csv';

 describe('makeCSVFromArrayOfArrays()', () => {
  it('joins an array of arrays with commas and newlines', () => {
@@ -11,3 +13,34 @@ after newline,after comma
 `);
  });
 });
+
+describe('aggregateRundowns()', () => {
+  it('flattens an object of rundowns into a single array', () => {
+    const rundowns = {
+      first: {
+        id: '',
+        title: '',
+        revision: 0,
+        order: ['1', '2'],
+        flatOrder: ['1', '2'],
+        entries: {
+          '1': { id: '1' } as OntimeEntry,
+          '2': { id: '2' } as OntimeEntry,
+        },
+      },
+      second: {
+        id: '',
+        title: '',
+        revision: 0,
+        order: ['3', '4'],
+        flatOrder: ['3', '4'],
+        entries: {
+          '3': { id: '3' } as OntimeEntry,
+          '4': { id: '4' } as OntimeEntry,
+        },
+      } as Rundown,
+    } as ProjectRundowns;
+
+    expect(aggregateRundowns(rundowns)).toStrictEqual([{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }]);
+  });
+});
@@ -1,49 +0,0 @@
-import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';
-
-import { cloneEvent } from '../eventsManager';
-
-describe('cloneEvent()', () => {
-  it('creates a stem from a given event', () => {
-    const original = {
-      id: 'unique',
-      type: SupportedEvent.Event,
-      title: 'title',
-      cue: 'cue',
-      note: 'note',
-      timeStart: 0,
-      duration: 10,
-      timeEnd: 10,
-      timerType: TimerType.CountDown,
-      endAction: EndAction.None,
-      isPublic: false,
-      skip: false,
-      colour: 'F00',
-      revision: 10,
-      timeWarning: 120000,
-      timeDanger: 60000,
-      custom: {
-        lighting: '3',
-      } as EventCustomFields,
-    } as OntimeEvent;
-
-    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({});
-  });
-});
@@ -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;
+  });
+});
@@ -64,13 +64,13 @@ describe('getRouteFromPreset()', () => {
  describe('handle url sharing edge cases', () => {
    it('finds the correct preset when the url contains extra arguments', () => {
      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy()
-    })
+      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy();
+    });

    it('appends the feature params to the alias', () => {
      const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123')
-    })
+      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
+    });
  });
 });

@@ -83,25 +83,26 @@ describe('generatePathFromPreset()', () => {
  });

  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');
+    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",  () => {
+  it('checks whether the paths match', () => {
    expect(arePathsEquivalent('demopage', 'timer')).toBeFalsy();
    expect(arePathsEquivalent('timer', 'timer')).toBeTruthy();
    expect(arePathsEquivalent('timer?user=guest', 'timer?user=guest')).toBeTruthy();
-  })
+  });

-  it("checks whether the params match",  () => {
+  it('checks whether the params match', () => {
    expect(arePathsEquivalent('timer?test=a', 'timer?test=b')).toBeFalsy();
    expect(arePathsEquivalent('timer?test=a', 'timer?test=a')).toBeTruthy();
-  })
+  });

-  it("considers edge cases for the url sharing feature",  () => {
+  it('considers edge cases for the url sharing feature', () => {
    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=b')).toBeFalsy();
    expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=a')).toBeTruthy();
-  })
+  });
 });
-
@@ -1,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,14 @@ 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: {},
+    triggers: structuredClone(event.triggers),
+    custom: structuredClone(event.custom),
  };
 };
@@ -1,10 +1,31 @@
 import { stringify } from 'csv-stringify/browser/esm/sync';
+import { OntimeEntry, ProjectRundowns } from 'ontime-types';

 /**
- * @description Converts an array of arrays to a CSV file
- * @param {string[][]} arrayOfArrays
- * @return {string}
+ * 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;
+}
@@ -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,4 +1,4 @@
-import { Log, RundownCached, RuntimeStore } from 'ontime-types';
+import { Log, Rundown, RuntimeStore } from 'ontime-types';

 import { isProduction, websocketUrl } from '../../externals';
 import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
@@ -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;

@@ -48,17 +47,18 @@ export const connectSocket = () => {

  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) => {
@@ -141,59 +141,10 @@ 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': {
@@ -203,7 +154,7 @@ export const connectSocket = () => {
            invalidateAllCaches();
          } else if (target === 'RUNDOWN') {
            const { revision } = payload;
-            const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
+            const currentRevision = ontimeQueryClient.getQueryData<Rundown>(RUNDOWN)?.revision ?? -1;
            if (revision > currentRevision) {
              ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
              ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
@@ -213,8 +164,8 @@ export const connectSocket = () => {
          }
          break;
        }
-        case 'ontime-flush': {
-          flushBatchUpdates();
+        default: {
+          console.log('unknown WS message', type);
          break;
        }
      }
@@ -224,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';
 }
@@ -118,10 +119,96 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }

  if (!hideSeconds) {
-    const seconds = Math.floor((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
+    const seconds = Math.ceil((duration % MILLIS_PER_MINUTE) / MILLIS_PER_SECOND);
    if (seconds > 0) {
      result += `${seconds}s`;
    }
  }
  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,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

@@ -48,10 +49,7 @@ function resolveUrl(protocol: 'http' | 'ws', path: string) {
  url.pathname = baseURI ? `${baseURI}/${path}` : path;

  // in development mode, we use the React port for UI, but need the requests to target the server
-  if (isDev) {
-    // this is used as a fallback port for development
-    url.port = '4001';
-  }
+  // this is done with a proxy in the vite config to avoid CORS issues in the dev environment

  const result = url.toString();

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

  return base;
-}
+}
@@ -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';

@@ -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';

@@ -113,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() {
@@ -136,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';
@@ -1,8 +1,7 @@
 import { useEffect, useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { IoAdd, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Radio, RadioGroup, Select } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import {
  Automation,
  AutomationDTO,
@@ -16,8 +15,8 @@ import {

 import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
@@ -31,7 +30,7 @@ import OntimeActionForm from './OntimeActionForm';

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

-const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';
+const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -3,8 +3,8 @@ import { Button, Input, Switch } from '@chakra-ui/react';

 import { editAutomationSettings } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
 import { isOntimeCloud } from '../../../../externals';
@@ -1,8 +1,6 @@
 import { Fragment, useState } from 'react';
+import { IoAdd, IoPencil, IoTrash } from 'react-icons/io5';
 import { Button, IconButton } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { AutomationDTO, NormalisedAutomation } from 'ontime-types';

 import { deleteAutomation } from '../../../../common/api/automation';
@@ -1,6 +1,6 @@
 import { Fragment, useMemo, useState } from 'react';
+import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { NormalisedAutomation, Trigger } from 'ontime-types';

 import { deleteTrigger } from '../../../../common/api/automation';
@@ -1,8 +1,6 @@
 import { useState } from 'react';
+import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { IoWarningOutline } from '@react-icons/all-files/io5/IoWarningOutline';
 import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';

 import Tag from '../../../../common/components/tag/Tag';
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
+import { IoTrashBin } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoTrashBin } from '@react-icons/all-files/io5/IoTrashBin';

 import { deleteAllReport } from '../../../../common/api/report';
 import { createBlob, downloadBlob } from '../../../../common/api/utils';
@@ -29,8 +29,8 @@ export default function ReportSettings() {
  };

  const combinedReport = useMemo(() => {
-    return getCombinedReport(reportData, data.rundown, data.order);
-  }, [reportData, data.rundown, data.order]);
+    return getCombinedReport(reportData, data.entries, data.order);
+  }, [reportData, data.entries, data.order]);

  return (
    <Panel.Section>
@@ -1,16 +1,14 @@
 import { useEffect } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
+import { IoAdd, IoOpenOutline, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Switch } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { URLPreset } from 'ontime-types';

 import { postUrlPresets } from '../../../../common/api/urlPresets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { handleLinks } from '../../../../common/utils/linkUtils';
@@ -1,8 +1,7 @@
 import { useState } from 'react';
+import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
-import { CustomField, CustomFieldLabel } from 'ontime-types';
+import { CustomField, CustomFieldKey } from 'ontime-types';

 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
@@ -18,8 +17,8 @@ interface CustomFieldEntryProps {
  label: string;
  fieldKey: string;
  type: 'string' | 'image';
-  onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
-  onDelete: (label: CustomFieldLabel) => Promise<void>;
+  onEdit: (key: CustomFieldKey, patch: CustomField) => Promise<void>;
+  onDelete: (key: CustomFieldKey) => Promise<void>;
 }

 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
@@ -1,11 +1,11 @@
 import { useState } from 'react';
+import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
-import { CustomField, CustomFieldLabel } from 'ontime-types';
+import { CustomField, CustomFieldKey } from 'ontime-types';

 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
-import ExternalLink from '../../../../../common/components/external-link/ExternalLink';
 import Info from '../../../../../common/components/info/Info';
+import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { customFieldsDocsUrl } from '../../../../../externals';
 import * as Panel from '../../../panel-utils/PanelUtils';
@@ -31,14 +31,14 @@ export default function CustomFields() {
    setIsAdding(false);
  };

-  const handleEditField = async (label: CustomFieldLabel, customField: CustomField) => {
-    await editCustomField(label, customField);
+  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
+    await editCustomField(key, customField);
    refetch();
  };

-  const handleDelete = async (label: string) => {
+  const handleDelete = async (key: CustomFieldKey) => {
    try {
-      await deleteCustomField(label);
+      await deleteCustomField(key);
      refetch();
    } catch (_error) {
      /** we do not handle errors here */
@@ -1,4 +1,4 @@
-import { isOntimeEvent, MaybeNumber, NormalisedRundown, OntimeReport } from 'ontime-types';
+import { EntryId, isOntimeEvent, MaybeNumber, OntimeReport, RundownEntries } from 'ontime-types';

 import { makeCSVFromArrayOfArrays } from '../../../../common/utils/csv';
 import { formatTime } from '../../../../common/utils/time';
@@ -16,7 +16,7 @@ export type CombinedReport = {
 /**
 * Creates a combined report with the rundown data
 */
-export function getCombinedReport(report: OntimeReport, rundown: NormalisedRundown, order: string[]): CombinedReport[] {
+export function getCombinedReport(report: OntimeReport, rundown: RundownEntries, order: EntryId[]): CombinedReport[] {
  if (Object.keys(report).length === 0) return [];
  if (order.length === 0) return [];

@@ -13,10 +13,6 @@ import * as Panel from '../../panel-utils/PanelUtils';

 import GeneralPinInput from './GeneralPinInput';

-export type GeneralPanelFormValues = {
-  filename: string;
-};
-
 export default function GeneralPanelForm() {
  const { data, status, refetch } = useSettings();
  const {
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
 import { UseFormRegister } from 'react-hook-form';
+import { IoEyeOutline } from 'react-icons/io5';
 import { IconButton, Input, InputGroup, InputRightElement } from '@chakra-ui/react';
-import { IoEyeOutline } from '@react-icons/all-files/io5/IoEyeOutline';
 import { Settings } from 'ontime-types';

 import { isAlphanumeric } from '../../../../common/utils/regex';
@@ -0,0 +1,4 @@
+.wrapper {
+  max-height: 500px;
+  overflow-y: auto;
+}
@@ -0,0 +1,72 @@
+import { forwardRef, memo, useEffect, useImperativeHandle, useState } from 'react';
+import Editor from 'react-simple-code-editor';
+import Prism from 'prismjs/components/prism-core';
+
+import 'prismjs/components/prism-css';
+import 'prismjs/themes/prism-tomorrow.min.css';
+import style from './StyleEditor.module.scss';
+
+interface CodeEditorProps {
+  language: string;
+  initialValue: string;
+  isDirty: boolean;
+  setIsDirty: (value: boolean) => void;
+}
+
+const CodeEditor = forwardRef((props: CodeEditorProps, cssRef) => {
+  const { language, initialValue, isDirty, setIsDirty } = props;
+
+  const [code, setCode] = useState(initialValue);
+
+  const highlight = (code: string) => {
+    const grammar = Prism.languages[language];
+    return grammar ? Prism.highlight(code, grammar, language) : code;
+  };
+
+  const handleChange = (newCode: string) => {
+    setCode(newCode);
+  };
+
+  useImperativeHandle(cssRef, () => {
+    return {
+      getCss: () => code,
+    };
+  });
+
+  // add contents to editor on mount and any change in initialValue
+  useEffect(() => {
+    setCode(initialValue);
+  }, [initialValue]);
+
+  // handle dirty state on change
+  useEffect(() => {
+    if (initialValue.trim() !== code.trim() && !isDirty && code.length !== 0) {
+      setIsDirty(true);
+    }
+
+    if (initialValue.trim() === code.trim() && isDirty) {
+      setIsDirty(false);
+    }
+  }, [initialValue, code, isDirty, setIsDirty]);
+
+  return (
+    <div className={style.wrapper}>
+      <Editor
+        value={code}
+        padding={15}
+        onValueChange={handleChange}
+        highlight={highlight}
+        style={{
+          fontFamily: 'monospace',
+          fontSize: 12,
+          minHeight: 500,
+          background: '#2d2d2d', // Background of tomorrow theme
+        }}
+      />
+    </div>
+  );
+});
+
+CodeEditor.displayName = 'StyleEditor';
+
+export default memo(CodeEditor);
@@ -0,0 +1,12 @@
+.editorActions {
+  width: 100%;
+}
+
+.right {
+  align-self: end;
+  text-align: right
+}
+
+.column {
+  flex-direction: column;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
google-labs-jules[bot]	f80e957036	I've replaced the unit tests for the Rich Text Editor with end-to-end tests. Here's a summary of the changes: - I removed the existing unit tests for the RichTextEditor component. - I created new end-to-end tests that cover: - Navigating to the cuesheet and opening an event. - Activating the rich text editor for the 'note' field. - Testing bold, link, text color, and background color functionalities. - Verifying that rich text formatting is saved correctly and persists after reopening an event. This change helps ensure the RichTextEditor works as expected within the overall application.	2025-06-14 19:41:42 +00:00
google-labs-jules[bot]	fb93063b47	refactor: style tweaks to edit css modal	2025-06-13 10:36:48 +02:00
google-labs-jules[bot]	24d3bf05ca	refactor: remove usages of framer-motion	2025-06-13 10:36:26 +02:00
Alex Christoffer Rasmussen	a4b15970de	Upgrade expressjs (#1633 ) * upgrade expressjs * migration * reenable test * extend timeout on download test * fixup! migration * move empty body test from controller to validator * enusre not empty * extract validation function * fixup! reenable test * remove thin controllers * disable e2e test of project file download	2025-06-12 15:02:35 +02:00
Alex Christoffer Rasmussen	2a5b053d97	Refactor: require trigger in all events objects (#1636 ) * reqire trigger in all events * use structuredClone when cloning an event	2025-06-12 09:54:57 +02:00
google-labs-jules[bot]	02c30c9681	Fix: Correct boundary condition in applyDelay The `applyDelay` function had a condition that incorrectly used `rundown.order.length` instead of `rundownMetadata.flatEntryOrder.length` to check if a delay entry was the last in the sequence. `rundown.order` only contains top-level entries, while `flatEntryOrder` contains all entries, including those within blocks, which is the relevant list for this check. This commit corrects the condition to use `rundownMetadata.flatEntryOrder.length`. Existing tests in `rundown.dao.test.ts` (specifically the test `removes delays in last position without applying changes`) already cover this scenario and pass with the correction, ensuring the fix behaves as expected.	2025-06-10 21:37:40 +02:00
Alex Christoffer Rasmussen	2de7221653	let vite be the proxy to the dev server (#1630 )	2025-06-09 14:12:59 +02:00
Carlos Valente	2498e59156	refactor: migrate custom fields to transactions refactor: extract functions to api domain refactor: strict custom field parsing refactor: remove rundown cache utilities refactor: directory restructure	2025-06-09 14:12:59 +02:00
Carlos Valente	f3b4ea0155	refactor: simplify validations	2025-06-09 14:12:58 +02:00
Carlos Valente	aebf949883	refactor: create transaction system and apply to adding entry (#1620 ) * refactor: create transaction system and apply to adding entry * refactor: migrate edit mutations to transaction * refactor: migrate delete mutation to transaction * refactor: migrate reorder mutation to transaction * refactor: migrate apply delay to transaction * refactor: migrate swapEvents to transaction * refactor: migrate clone to transaction * refactor: migrate group/ungroup transactions * refactor: simplify mutations * refactor: migrate getters * chore: add tests to processRundown()	2025-06-09 14:12:58 +02:00
Alex Christoffer Rasmussen	33ac05ebee	Refactor: better rounding (#1594 )	2025-06-09 14:12:58 +02:00
Carlos Valente	421183fe55	refactor: improve reorder logic	2025-06-09 14:12:58 +02:00
Carlos Valente	b66c19769d	chore: simplify URLs	2025-06-09 14:12:57 +02:00
Carlos Valente	7b8445597f	refactor: order is single source of truth	2025-06-09 14:12:57 +02:00
Carlos Valente	0b719c485f	refactor: refetch targets is enum	2025-06-09 14:12:57 +02:00
Carlos Valente	17deeddb87	refactor: small ux improvements - rename dissolve > ungroup - prevent ondrag when clicking - add untitled as block title fallback - move block action to context menu	2025-06-09 14:12:57 +02:00
Carlos Valente	2546159a94	refactor: remove trivially inferred numEvents	2025-06-09 14:12:56 +02:00
Carlos Valente	2f26f20db5	feat: duplicate groups	2025-06-09 14:12:56 +02:00
Carlos Valente	11e0215530	feat: create group from entry selection	2025-06-09 14:12:56 +02:00
Carlos Valente	ea54953298	feat: create block from rundown empty	2025-06-09 14:12:56 +02:00
Carlos Valente	d21f132674	fix: collapsed blocks dont render children	2025-06-09 14:12:56 +02:00
Carlos Valente	c7b2f0e89c	refactor: type cleanup and test improvements	2025-06-09 14:12:56 +02:00
Carlos Valente	a1505606cf	feat: allow dissolving a block	2025-06-09 14:12:56 +02:00
Carlos Valente	9edff55bd5	fix: uncontrolled prop on controlled component	2025-06-09 14:12:56 +02:00
Carlos Valente	e287215179	refactor: improve return of reorder	2025-06-09 14:12:56 +02:00
Carlos Valente	776649c997	refactor: mutations on batch elements must have IDs	2025-06-09 14:12:56 +02:00
Carlos Valente	9de5e0ac48	chore: upgrade dependencies	2025-06-09 14:12:55 +02:00
Carlos Valente	c7d99073f6	refactor: extract utility to merge two arrays	2025-06-09 14:12:55 +02:00
Carlos Valente	5c1694d802	refactor: change network mode defaults	2025-06-09 14:12:55 +02:00
Carlos Valente	7cd319a6b3	fix: delete nested events	2025-06-09 14:12:55 +02:00
Carlos Valente	2c9b6918e6	fix: add event at end of block	2025-06-09 14:12:55 +02:00
Carlos Valente	a50cfad7ef	refactor: make finder available in exported rundown	2025-06-09 14:12:55 +02:00
Alex Christoffer Rasmussen	66cd1decde	assert non null and update test (#1604 )	2025-06-09 14:12:55 +02:00
Alex Christoffer Rasmussen	c9bf6d9812	Fix project renumber (#1597 ) * fix: generateUniqueFileName * loadProject should not generate new names * update comments * extract and test getProjectNumber * spell * finish jsdoc * use getProjectNumber * cleanup loadProject * create a `incrementProjectNumber` function * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-06-09 14:12:55 +02:00
Alex Christoffer Rasmussen	8557f64382	Refactor: WebSocket from flush queue to one patch (#1595 ) * change flush to one patch * remove unused types * create batch * merge patch into eventStore Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-06-09 14:12:55 +02:00
Alex Christoffer Rasmussen	8e994fb0df	Refactor: ms for api calls (#1593 ) * use ms for api calls * change it in UI * update comment * rename variables * refactor: addtime api logic	2025-06-09 14:12:55 +02:00
Alex Christoffer Rasmussen	5c47a834b5	fix test (#1601 ) * fix test * add comment	2025-06-09 14:12:55 +02:00
Carlos Valente	f356afef43	fix: rebase master	2025-06-09 14:12:55 +02:00
Carlos Valente	eba5252e40	chore: correct test path	2025-06-09 14:12:54 +02:00
Carlos Valente	72c4ad789a	refactor: extract rundown parsing refactor: implement groups in editor	2025-06-09 14:12:54 +02:00
Carlos Valente	3118c20719	chore: improve convention entry <> event	2025-06-09 14:12:54 +02:00
Carlos Valente	3754c374c3	refactor: maintain flat orders	2025-06-09 14:12:54 +02:00
Carlos Valente	dd6d74121c	refactor: implement operations on nested events	2025-06-09 14:12:54 +02:00
Carlos Valente	6fb42b989e	refactor: process events in rundown	2025-06-09 14:12:54 +02:00
Carlos Valente	82dc1bc56b	chore: improve convention entry <> event	2025-06-09 14:12:54 +02:00
Carlos Valente	d2c7b34142	chore: rename currentBlock > parent	2025-06-09 14:12:53 +02:00
Carlos Valente	918f8d1b08	refactor: fix delay positioning in gaps	2025-06-09 14:12:53 +02:00
Carlos Valente	fcbcf70e01	refactor(e2e): skip flaky test	2025-06-09 14:12:53 +02:00
Carlos Valente	5c6b06a0d4	refactor: improve project loading	2025-06-09 14:12:53 +02:00
Carlos Valente	fc4c1bf22e	refactor: gather group metadata	2025-06-09 14:12:53 +02:00
Carlos Valente	84fac739f0	refactor: swap maintains schedule	2025-06-09 14:12:53 +02:00
Carlos Valente	ef73c87e2f	chore: rename files	2025-06-09 14:12:53 +02:00
Carlos Valente	26ee5768a5	refactor: restructure model to contain an object of rundowns	2025-06-09 14:12:53 +02:00
Carlos Valente	27dcf06c73	refactor: clearer relationship on rundown elements	2025-06-09 14:12:52 +02:00
Carlos Valente	d48b2ae506	refactor: use strict typing	2025-06-09 14:12:52 +02:00
Carlos Valente	14a7c04d3b	refactor: remove stop as a possible end action	2025-06-09 14:12:52 +02:00
Carlos Valente	abd9b127db	refactor: restructure model to contain an object of rundowns	2025-06-09 14:12:51 +02:00
Carlos Valente	0a80d6db31	chore: remove IDE files	2025-06-09 14:12:51 +02:00
Carlos Valente	977c99e587	refactor: remove unused and legacy code - remove legacy migrations - remove unused server code - remove unused UI code	2025-06-09 14:12:51 +02:00
jwetzell	fe8bbd5003	add electron and esbuild to allow list for postinstall builds	2025-06-06 20:25:46 +02:00
jwetzell	c6e38a2b4a	upgrade vite to v6 (#1626 )	2025-06-05 06:27:59 +02:00
jwetzell	56f18fe71c	update node and pnpm versions in README	2025-06-05 06:13:04 +02:00
jwetzell	0b9306de82	update pnpm to latest v10	2025-06-05 06:13:04 +02:00
jwetzell	3b1e6cf33d	update node version in workflows	2025-06-05 06:13:04 +02:00
jwetzell	dda219ebbe	update NodeJS to v22	2025-06-05 06:13:04 +02:00
jwetzell	8bb771e5c6	upgrade electron and electron-builder	2025-06-05 06:13:04 +02:00
Shobhit Nagpal	8723bcbd33	refactor: block event xlsx import (#1623 )	2025-06-02 06:56:46 +02:00
Shobhit Nagpal	0dcea4f2d7	fix: pass empty string fallback when parsing fields for export (#1616 )	2025-05-25 19:58:41 +02:00
Shobhit Nagpal	696c016c90	feat: custom data for projects (#1571 )	2025-05-23 09:04:57 +02:00
Shobhit Nagpal	eed6373dbf	refactor: change offset classes depending on playback state (#1611 ) * refactor: assign offsetClasses based on playback state	2025-05-23 09:04:57 +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