disable requirement that all libraries be signed by same teamId

.github/workflows/build_cli.yml

@@ -20,13 +20,13 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}

.github/workflows/build_docker.yml

@@ -15,13 +15,13 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}

.github/workflows/build_electron.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build_macos:
-    runs-on: macOS-26
+    runs-on: macOS-latest
 
     steps:
       - uses: actions/checkout@v6
@@ -17,13 +17,13 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -74,7 +74,7 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -111,7 +111,7 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.github/workflows/build_resolver.yml

@@ -18,13 +18,13 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}

.github/workflows/test.yml

@@ -15,18 +15,14 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -58,18 +54,14 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         run: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
       - name: Setup pnpm cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ env.PNPM_STORE_PATH }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
@@ -82,18 +74,18 @@ jobs:
       - name: Get installed Playwright version
         run: echo "PLAYWRIGHT_VERSION=$(pnpm ls @playwright/test --parseable | cut -s -d '@' -f3 | cut -d '/' -f1)" >> $GITHUB_ENV
       - name: Cache playwright binaries
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/ms-playwright
           key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
           restore-keys: |
             ${{ runner.os }}-playwright-
-      - run: pnpm playwright install --with-deps
+      - run: npx playwright install --with-deps
         if: steps.playwright-cache.outputs.cache-hit != 'true'
 
       - name: Install Playwright Browsers
-        run: pnpm playwright install --with-deps
+        run: npx playwright install --with-deps
 
       - name: Run Playwright tests
         run: pnpm e2e

.gitignore

@@ -54,6 +54,3 @@ ontime-data/
 
 # temporary write files
 **.tmp
-
-# Claude Code metadata
-.claude/

.nvmrc

@@ -1 +1 @@
-v22.22.3
+v22.15.1

Dockerfile

@@ -1,4 +1,4 @@
-ARG NODE_VERSION=22.22.2
+ARG NODE_VERSION=22.15.1
 FROM node:${NODE_VERSION}-alpine
 
 # Set environment variables

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getontime/cli",
-  "version": "4.10.0",
+  "version": "4.7.0",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",

apps/client/index.html

@@ -4,10 +4,9 @@
     <meta charset="utf-8" />
     <base href="/" />
     <link rel="icon" href="favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#101010" />
     <meta name="ontime" content="ontime - time keeping for live events" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <link rel="apple-touch-icon" href="ontime-logo.png" />
     <link rel="icon" type="image/png" href="ontime-logo.png" />
     <link rel="manifest" href="site.webmanifest" />
@@ -18,13 +17,6 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <script>
-      if (/\/timer\/?$/.test(window.location.pathname) && typeof Promise.any !== 'function') {
-        var b = document.querySelector('base');
-        var base = b ? (b.getAttribute('href') || '').replace(/\/$/, '') : '';
-        window.location.replace(base + '/timer-legacy' + window.location.search);
-      }
-    </script>
     <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>

apps/client/package.json

@@ -1,10 +1,10 @@
 {
   "name": "ontime-ui",
-  "version": "4.10.0",
+  "version": "4.7.0",
   "private": true,
   "type": "module",
   "dependencies": {
-    "@base-ui/react": "1.6.0",
+    "@base-ui/react": "1.3.0",
     "@codemirror/commands": "^6.0.0",
     "@codemirror/lang-css": "^6.0.0",
     "@codemirror/state": "^6.0.0",
@@ -12,27 +12,28 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@fontsource/open-sans": "^5.2.7",
+    "@fontsource/open-sans": "^5.2.6",
     "@mantine/hooks": "^8.3.7",
-    "@sentry/react": "^10.59.0",
+    "@sentry/react": "^10.2.0",
     "@table-nav/react": "^0.0.7",
-    "@tanstack/react-query": "^5.101.0",
+    "@tanstack/react-query": "^5.85.9",
-    "@tanstack/react-query-devtools": "^5.101.0",
+    "@tanstack/react-query-devtools": "^5.85.9",
     "@tanstack/react-table": "^8.21.3",
-    "@uiw/codemirror-theme-vscode": "^4.25.10",
+    "@uiw/codemirror-theme-vscode": "^4.25.9",
     "autosize": "^6.0.1",
-    "axios": "^1.18.0",
+    "axios": "^1.12.2",
     "csv-stringify": "^6.6.0",
     "qrcode": "^1.5.4",
-    "react": "^19.2.7",
+    "react": "^19.2.3",
-    "react-colorful": "^5.7.0",
+    "react-colorful": "^5.6.1",
-    "react-dom": "^19.2.7",
+    "react-dom": "^19.2.3",
     "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.80.0",
+    "react-hook-form": "^7.72.0",
-    "react-icons": "5.6.0",
+    "react-icons": "5.5.0",
-    "react-router": "^8.0.1",
+    "react-router": "^7.11.0",
-    "react-virtuoso": "^4.18.7",
+    "react-virtuoso": "^4.17.0",
-    "zustand": "^5.0.14"
+    "web-vitals": "^5.1.0",
+    "zustand": "^5.0.9"
   },
   "scripts": {
     "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -50,8 +51,7 @@
     "production": [
       ">0.2%",
       "not dead",
-      "not op_mini all",
+      "not op_mini all"
-      "safari >= 14.1"
     ],
     "development": [
       "last 1 chrome version",
@@ -64,10 +64,8 @@
     "@types/qrcode": "^1.5.6",
     "@types/react": "^19.1.12",
     "@types/react-dom": "^19.1.9",
-    "@vitejs/plugin-legacy": "^8.0.1",
     "@vitejs/plugin-react": "5.2.0",
     "babel-plugin-react-compiler": "1.0.0",
-    "happy-dom": "^20.9.0",
     "ontime-types": "workspace:*",
     "ontime-utils": "workspace:*",
     "sass": "^1.57.1",
@@ -75,6 +73,7 @@
     "vite": "8.0.1",
     "vite-plugin-compression2": "2.5.1",
     "vite-plugin-svgr": "4.5.0",
+    "vite-tsconfig-paths": "6.1.1",
     "vitest": "catalog:"
   }
 }

apps/client/public/manifest.json

@@ -15,5 +15,5 @@
   "start_url": "./",
   "display": "",
   "theme_color": "#121212",
-  "background_color": "#101010"
+  "background_color": "#ffffff"
 }

apps/client/public/site.webmanifest

@@ -2,7 +2,7 @@
   "name": "",
   "short_name": "",
   "icons": [{ "src": "ontime-logo.png", "sizes": "295x295", "type": "image/png" }],
-  "theme_color": "#121212",
+  "theme_color": "#2B5ABC",
   "background_color": "#101010",
   "display": "standalone"
 }

apps/client/src/common/api/rundown.ts

@@ -34,17 +34,19 @@ export async function fetchCurrentRundown(options?: RequestOptions): Promise<Run
     throw new Error('Invalid rundown payload');
   }
   return res.data;
-}
 
-/**
+  function isValidRundown(x: any): x is Rundown {
- * HTTP request to fetch all entries in the given rundown
+    return (
- */
+      x &&
-export async function fetchRundown(rundownId: RundownId, options?: RequestOptions): Promise<Rundown> {
+      typeof x === 'object' &&
-  const res = await axios.get(`${rundownPath}/${rundownId}`, { signal: options?.signal });
+      typeof x.id === 'string' &&
-  if (!isValidRundown(res.data)) {
+      Array.isArray(x.order) &&
-    throw new Error('Invalid rundown payload');
+      Array.isArray(x.flatOrder) &&
+      x.entries &&
+      typeof x.entries === 'object' &&
+      typeof x.revision === 'number'
+    );
   }
-  return res.data;
 }
 
 /**
@@ -195,16 +197,3 @@ export async function requestDeleteAll(rundownId: RundownId): Promise<AxiosRespo
 }
 
 // #endregion operations on rundown entries =======================
-
-function isValidRundown(x: any): x is Rundown {
-  return (
-    x &&
-    typeof x === 'object' &&
-    typeof x.id === 'string' &&
-    Array.isArray(x.order) &&
-    Array.isArray(x.flatOrder) &&
-    x.entries &&
-    typeof x.entries === 'object' &&
-    typeof x.revision === 'number'
-  );
-}

apps/client/src/common/components/input/text-input/useReactiveTextInput.tsx

@@ -3,8 +3,8 @@ import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useMemo,
 
 interface UseReactiveTextInputReturn {
   value: string;
-  onChange: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+  onChange: (event: ChangeEvent) => void;
-  onBlur: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+  onBlur: (event: ChangeEvent) => void;
   onKeyDown: (event: KeyboardEvent<HTMLElement>) => void;
 }
 
@@ -15,9 +15,7 @@ export default function useReactiveTextInput(
   options?: {
     submitOnEnter?: boolean;
     submitOnCtrlEnter?: boolean;
-    submitOnTab?: boolean;
     onCancelUpdate?: () => void;
-    onTabCancel?: () => void;
     allowSubmitSameValue?: boolean;
     allowKeyboardNavigation?: boolean;
   },
@@ -25,10 +23,6 @@ export default function useReactiveTextInput(
   const [text, setText] = useState<string>(initialText);
   // track whether we are submitting via a submit key (eg enter) and avoid submitting again on blur
   const isKeyboardSubmitting = useRef(false);
-  // track escape to prevent the subsequent blur from submitting
-  const isEscaping = useRef(false);
-  // track tab-out to prevent blur from submitting (used by timer cells)
-  const isTabbing = useRef(false);
 
   useEffect(() => {
     if (typeof initialText === 'undefined') {
@@ -84,7 +78,6 @@ export default function useReactiveTextInput(
    * @param {string} valueToSubmit
    */
   const handleEscape = useCallback(() => {
-    isEscaping.current = true;
     // No need to update if it hasn't changed
     setText(initialText);
     // force the text to be the initial value
@@ -148,30 +141,16 @@ export default function useReactiveTextInput(
         event.stopPropagation();
       }
 
-      // for cells that opt out of tab-submit, track tab-out without preventing navigation
-      if (event.key === 'Tab' && options?.submitOnTab === false) {
-        isTabbing.current = true;
-      }
-
       hotKeyHandler(event);
     };
-  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, options?.submitOnTab, text]);
+  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);
 
   return {
     value: text,
-    onChange: (event) => handleChange(event.target.value),
+    onChange: (event: ChangeEvent) => handleChange((event.target as HTMLInputElement).value),
-    onBlur: (event) => {
+    onBlur: (event: ChangeEvent) => {
-      if (isTabbing.current) {
-        isTabbing.current = false;
-        (options?.onTabCancel ?? options?.onCancelUpdate)?.();
-        return;
-      }
-      if (isEscaping.current) {
-        isEscaping.current = false;
-        return;
-      }
       if (!isKeyboardSubmitting.current) {
-        handleSubmit(event.target.value);
+        handleSubmit((event.target as HTMLInputElement).value);
       }
     },
     onKeyDown: keyHandler,

apps/client/src/common/components/navigation-menu/NavigationMenu.tsx

@@ -8,7 +8,6 @@ import { useLocation } from 'react-router';
 import { isLocalhost, supportsFullscreen } from '../../../externals';
 import { canUseWakeLock, useKeepAwakeOptions } from '../../../features/keep-awake/useWakeLock';
 import { navigatorConstants } from '../../../viewerConfig';
-import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
@@ -106,8 +105,6 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
                 {route.label}
               </ClientLink>
             ))}
-
-            <PresetNavigation isSmallScreen={isSmallScreen} onClose={onClose} />
           </div>
 
           {isLocalhost && (
@@ -120,27 +117,3 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
     </Dialog.Root>
   );
 }
-
-function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean; onClose: () => void }) {
-  const location = useLocation();
-  const { data: urlPresets } = useUrlPresets();
-  const navPresets = urlPresets.filter((preset) => preset.enabled && preset.displayInNav);
-
-  if (navPresets.length === 0) return null;
-
-  return (
-    <>
-      <hr className={style.separator} />
-      {navPresets.map((preset) => (
-        <ClientLink
-          key={preset.alias}
-          to={`preset/${preset.alias}`}
-          current={location.pathname === `/preset/${preset.alias}`}
-          postAction={isSmallScreen ? onClose : undefined}
-        >
-          {preset.alias}
-        </ClientLink>
-      ))}
-    </>
-  );
-}

apps/client/src/common/components/schedule-time/ScheduleTime.scss

@@ -1,26 +0,0 @@
-@use '@/theme/viewerDefs' as *;
-
-.schedule__ {
-  padding-top: 0.5rem;
-  display: flex;
-  gap: 0.25em;
-  font-size: $timer-label-size;
-  color: var(--label-color-override, $timer-color);
-}
-
-.schedule__delayed {
-  color: $ontime-delay-text;
-}
-
-.schedule__strike {
-  text-decoration: line-through;
-  color: var(--label-color-override, $viewer-label-color);
-}
-
-.schedule__over {
-  color: $playback-over;
-}
-
-.schedule__under {
-  color: $playback-under;
-}

apps/client/src/common/components/schedule-time/ScheduleTime.tsx

@@ -1,88 +0,0 @@
-import { OntimeEvent } from 'ontime-types';
-import { dayInMs, MILLIS_PER_MINUTE } from 'ontime-utils';
-
-import ClockTime from '../../../views/common/clock-time/ClockTime';
-import { getOffsetState } from '../../utils/offset';
-import { ExtendedEntry } from '../../utils/rundownMetadata';
-
-import './ScheduleTime.scss';
-import { cx } from '../../utils/styleUtils';
-
-type ScheduleTimeProps = {
-  event: ExtendedEntry<OntimeEvent>;
-  showExpected: boolean;
-  className?: string;
-  preferredFormat12?: string;
-  preferredFormat24?: string;
-  expectedStart: number;
-};
-
-//TODO: consider relative mode
-export default function ScheduleTime(props: ScheduleTimeProps) {
-  const {
-    event,
-    showExpected,
-    className,
-    preferredFormat12 = 'h:mm a',
-    preferredFormat24 = 'HH:mm',
-    expectedStart,
-  } = props;
-  const { timeStart, duration, delay, countToEnd } = event;
-
-  const plannedStart = timeStart + delay + event.dayOffset * dayInMs;
-
-  // only show new expected value if outside  range of the planned value
-  const isExpectedValueShow = showExpected && isOutsideRange(plannedStart, expectedStart);
-
-  const plannedStateClass = isExpectedValueShow ? 'schedule__strike' : delay !== 0 ? 'schedule__delayed' : '';
-
-  const expectedOffsetState = getOffsetState(expectedStart - plannedStart);
-  const expectedStateClass = expectedOffsetState ? `schedule__${expectedOffsetState}` : '';
-  const plannedEnd = plannedStart + duration;
-  const expectedEnd = countToEnd ? Math.max(expectedStart + duration, plannedEnd) : expectedStart + duration;
-  const expectedEndOffsetState = getOffsetState(expectedEnd - plannedEnd);
-  const expectedEndClass = expectedEndOffsetState ? `schedule__${expectedEndOffsetState}` : '';
-
-  return (
-    <div className={cx(['schedule__', className])}>
-      <ClockTime
-        value={plannedStart}
-        preferredFormat12={preferredFormat12}
-        preferredFormat24={preferredFormat24}
-        className={plannedStateClass}
-      />
-      {!isExpectedValueShow && (
-        <>
-          →
-          <ClockTime
-            value={plannedEnd}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-            className={plannedStateClass}
-          />
-        </>
-      )}
-      {isExpectedValueShow && (
-        <>
-          <ClockTime
-            value={expectedStart}
-            className={expectedStateClass}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-          />
-          →
-          <ClockTime
-            value={expectedEnd}
-            className={expectedEndClass}
-            preferredFormat12={preferredFormat12}
-            preferredFormat24={preferredFormat24}
-          />
-        </>
-      )}
-    </div>
-  );
-}
-
-function isOutsideRange(a: number, b: number): boolean {
-  return Math.abs(a - b) > MILLIS_PER_MINUTE;
-}

apps/client/src/common/components/state/EmptyTableBody.module.scss

@@ -8,12 +8,9 @@
     padding-top: 10vh;
   }
 
-  .inline {
+  .empty {
-    display: flex;
+    width: 100%;
-    align-items: center;
+    opacity: 0.8;
-    justify-content: center;
-    gap: 1rem;
-    margin-top: 1em;
   }
 
   .text {

apps/client/src/common/components/state/EmptyTableBody.tsx

@@ -1,33 +1,18 @@
-import { SupportedEntry } from 'ontime-types';
+import EmptyImage from '../../../assets/images/empty.svg?react';
-import { IoAdd } from 'react-icons/io5';
-
-import { useTranslation } from '../../../translation/TranslationProvider';
-import Button from '../buttons/Button';
-import Empty from './Empty';
 
 import style from './EmptyTableBody.module.scss';
 
 interface EmptyTableBodyProps {
-  handleAddNew?: (type: SupportedEntry) => void;
+  text: string;
 }
 
-export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
+export default function EmptyTableBody({ text }: EmptyTableBodyProps) {
-  const { getLocalizedString } = useTranslation();
-  const text = getLocalizedString('common.no_data');
   return (
     <tbody className={style.emptyContainer}>
       <tr>
         <td colSpan={99} className={style.emptyCell}>
-          <Empty injectedStyles={{ marginTop: '5vh' }} />
+          <EmptyImage className={style.empty} />
-          <span className={style.text}>{text}</span>
+          {text && <span className={style.text}>{text}</span>}
-          {handleAddNew && (
-            <div className={style.inline}>
-              <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>
-                <IoAdd />
-                Create Event
-              </Button>
-            </div>
-          )}
         </td>
       </tr>
     </tbody>

apps/client/src/common/hooks-query/useProjectRundowns.ts

@@ -12,7 +12,6 @@ import {
   renameRundown,
 } from '../api/rundown';
 
-//TODO: make suspends so we don't have to deal with no value all over
 /**
  * Project rundowns
  */

apps/client/src/common/hooks-query/useRundown.ts

@@ -4,7 +4,7 @@ import { useEffect, useMemo } from 'react';
 
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { CURRENT_RUNDOWN_QUERY_KEY, getRundownQueryKey } from '../api/constants';
-import { fetchCurrentRundown, fetchRundown } from '../api/rundown';
+import { fetchCurrentRundown } from '../api/rundown';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
 import { useProjectRundowns } from './useProjectRundowns';
@@ -20,11 +20,7 @@ const cachedRundownPlaceholder: Rundown = {
 };
 
 /**
- * Normalised rundown data for the currently loaded rundown.
+ * Normalised rundown data
- *
- * Bootstraps via the `/current` alias so the first paint is a single round-trip,
- * independent of the project rundown list. Once the loaded id is known, the
- * query key swaps to the id-keyed cache that is shared with `useRundownById`.
  */
 export default function useRundown() {
   const queryClient = useQueryClient();
@@ -38,13 +34,12 @@ export default function useRundown() {
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  // Seed the id-keyed cache when fetching via the bootstrap alias
+  // Seed the ID-based cache when fetching via the 'current' alias (bootstrap)
   useEffect(() => {
     if (!data || loadedRundownId) return;
     queryClient.setQueryData(getRundownQueryKey(data.id), data);
   }, [data, loadedRundownId, queryClient]);
 
-  // Once we have the ID, drop the temporary current cache
   useEffect(() => {
     if (!loadedRundownId) return;
     queryClient.removeQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
@@ -119,21 +114,3 @@ export function useRundownAuxData() {
   }, [data]);
   return { data: filteredData, status };
 }
-
-/**
- * Provides access to a specific rundown by ID.
- * When rundownId is null/undefined the query is disabled and returns the placeholder.
- */
-export function useRundownById(rundownId: string | null | undefined) {
-  const enabled = Boolean(rundownId);
-
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
-    queryKey: getRundownQueryKey(rundownId ?? ''),
-    queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
-    enabled,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    refetchInterval: queryRefetchIntervalSlow,
-  });
-
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
-}

apps/client/src/common/hooks-query/useScopedRundown.ts

@@ -1,54 +0,0 @@
-import { EntryId, Rundown } from 'ontime-types';
-import { useMemo } from 'react';
-
-import { useSelectedEventId } from '../hooks/useSocket';
-import { getFlatRundownMetadata, type ExtendedEntry } from '../utils/rundownMetadata';
-import { useProjectRundowns } from './useProjectRundowns';
-import { useRundownById } from './useRundown';
-
-export type RundownSource = {
-  rundownId: string | null;
-  rundown: Rundown;
-  flatRundown: ExtendedEntry[];
-  status: string;
-  selectedEventId: EntryId | null;
-};
-
-/**
- * Explicitly scoped rundown data for views that may operate on a non-loaded rundown.
- */
-export function useScopedRundown(rundownId: string | null): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  return useRundownSource(rundownId, projectRundowns.loaded || null);
-}
-
-/**
- * Loaded-rundown source for views that must follow the active runtime rundown.
- */
-export function useLoadedRundownSource(): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  const loadedRundownId = projectRundowns.loaded || null;
-  return useRundownSource(loadedRundownId, loadedRundownId);
-}
-
-function useRundownSource(rundownId: string | null, loadedRundownId: string | null): RundownSource {
-  const isLoadedTarget = rundownId !== null && rundownId === loadedRundownId;
-  const runtimeSelectedEventId = useSelectedEventId();
-  const effectiveSelectedEventId = isLoadedTarget ? runtimeSelectedEventId : null;
-  const { data: rundown, status } = useRundownById(rundownId);
-  const flatRundown = useMemo(
-    () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
-    [effectiveSelectedEventId, rundown],
-  );
-
-  return useMemo(
-    () => ({
-      rundownId,
-      rundown,
-      flatRundown,
-      status,
-      selectedEventId: effectiveSelectedEventId,
-    }),
-    [effectiveSelectedEventId, flatRundown, rundown, rundownId, status],
-  );
-}

apps/client/src/common/hooks/useEntryAction.ts

@@ -16,7 +16,6 @@ import {
   TimeStrategy,
   isOntimeEvent,
   isOntimeGroup,
-  isOntimeMilestone,
 } from 'ontime-types';
 import {
   MILLIS_PER_SECOND,
@@ -64,16 +63,9 @@ export type EventOptions = Partial<{
 }>;
 
 /**
- * Gather utilities for actions on entries in the loaded rundown.
+ * Gather utilities for actions on entries
  */
-export const useEntryActions = () => useEntryActionsForRundown(undefined);
+export const useEntryActions = () => {
-
-/**
- * Gather utilities for actions on entries in an explicitly selected rundown.
- */
-export const useScopedEntryActions = (rundownId: string | null) => useEntryActionsForRundown(rundownId ?? '');
-
-function useEntryActionsForRundown(scopedRundownId: string | undefined) {
   const queryClient = useQueryClient();
   const {
     linkPrevious,
@@ -83,16 +75,15 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
     defaultDangerTime,
     defaultTimerType,
     defaultEndAction,
-    inheritGroupColour,
   } = useEditorSettings();
 
   const resolveCurrentRundownQueryKey = useCallback(() => {
-    if (scopedRundownId !== undefined) {
-      return getRundownQueryKey(scopedRundownId);
-    }
     const loadedRundownId = queryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-    return loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
+    if (loadedRundownId) {
-  }, [queryClient, scopedRundownId]);
+      return getRundownQueryKey(loadedRundownId);
+    }
+    return CURRENT_RUNDOWN_QUERY_KEY;
+  }, [queryClient]);
 
   /**
    * Returns the currently loaded rundown
@@ -241,14 +232,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
         }
       }
 
-      if (inheritGroupColour && (isOntimeEvent(newEntry) || isOntimeMilestone(newEntry)) && !newEntry.colour) {
-        const parentId = resolveInsertParent(rundownData, newEntry);
-        const maybeParent = parentId ? rundownData.entries[parentId] : null;
-        if (maybeParent && isOntimeGroup(maybeParent)) {
-          newEntry.colour = maybeParent.colour;
-        }
-      }
-
       try {
         await addEntryMutation([rundownId, newEntry]);
       } catch (error) {
@@ -264,7 +247,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
       defaultTimerType,
       defaultEndAction,
       defaultTimeStrategy,
-      inheritGroupColour,
       addEntryMutation,
     ],
   );
@@ -1022,7 +1004,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
       updateTimer,
     ],
   );
-}
+};
 
 /**
  * Utility to optimistically delete entries from client cache

apps/client/src/common/stores/editorSettings.ts

@@ -12,10 +12,8 @@ type EditorSettingsStore = {
   defaultDangerTime: string;
   defaultTimerType: TimerType;
   defaultEndAction: EndAction;
-  inheritGroupColour: boolean;
   setDefaultDuration: (defaultDuration: string) => void;
   setLinkPrevious: (linkPrevious: boolean) => void;
-  setInheritGroupColour: (inheritGroupColour: boolean) => void;
   setTimeStrategy: (timeStrategy: TimeStrategy) => void;
   setWarnTime: (warnTime: string) => void;
   setDangerTime: (dangerTime: string) => void;
@@ -31,7 +29,6 @@ export const editorSettingsDefaults = {
   dangerTime: '00:01:00', // 60000 same as backend
   timerType: TimerType.CountDown,
   endAction: EndAction.None,
-  inheritGroupColour: false,
 };
 
 enum EditorSettingsKeys {
@@ -42,7 +39,6 @@ enum EditorSettingsKeys {
   DefaultDangerTime = 'ontime-default-danger-time',
   DefaultTimerType = 'ontime-default-timer-type',
   DefaultEndAction = 'ontime-default-end-action',
-  InheritGroupColour = 'ontime-inherit-group-colour',
 }
 
 export const useEditorSettings = create<EditorSettingsStore>((set) => {
@@ -63,10 +59,6 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
       localStorage.getItem(EditorSettingsKeys.DefaultEndAction),
       editorSettingsDefaults.endAction,
     ),
-    inheritGroupColour: booleanFromLocalStorage(
-      EditorSettingsKeys.InheritGroupColour,
-      editorSettingsDefaults.inheritGroupColour,
-    ),
 
     setDefaultDuration: (defaultDuration) =>
       set(() => {
@@ -105,10 +97,5 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
         localStorage.setItem(EditorSettingsKeys.DefaultEndAction, String(defaultEndAction));
         return { defaultEndAction };
       }),
-    setInheritGroupColour: (inheritGroupColour) =>
-      set(() => {
-        localStorage.setItem(EditorSettingsKeys.InheritGroupColour, String(inheritGroupColour));
-        return { inheritGroupColour };
-      }),
   };
 });

apps/client/src/common/utils/__tests__/urlPresets.test.ts

@@ -37,16 +37,6 @@ describe('getRouteFromPreset()', () => {
       alias: 'demopage',
       target: OntimeView.Timer,
       search: 'user=guest',
-      displayInNav: false,
-      options: {},
-    },
-  ];
-  const disabledPresets: URLPreset[] = [
-    {
-      enabled: false,
-      alias: 'demopage',
-      target: OntimeView.Timer,
-      search: 'user=guest',
       options: {},
     },
   ];
@@ -57,21 +47,6 @@ describe('getRouteFromPreset()', () => {
     expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
   });
 
-  it('checks if the current location matches an enabled preset target', () => {
-    const location = resolvePath('/timer');
-    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
-  });
-
-  it('does not redirect disabled presets', () => {
-    const location = resolvePath('/demopage');
-    expect(getRouteFromPreset(location, disabledPresets)).toBeNull();
-  });
-
-  it('returns null when already on a preset path', () => {
-    const location = resolvePath('/preset/demopage');
-    expect(getRouteFromPreset(location, presets)).toBeNull();
-  });
-
   it('returns null if the current location is the exact match of an unwrapped alias', () => {
     // we make the current location be the alias
     const location = resolvePath('/timer?user=guest&alias=demopage');
@@ -106,11 +81,6 @@ describe('getRouteFromPreset()', () => {
       const location = resolvePath('/demopage?n=1&token=123');
       expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
     });
-
-    it('redirects stale unwrapped params back to the saved preset params while preserving feature params', () => {
-      const location = resolvePath('/timer?user=admin&alias=demopage&n=1&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
-    });
   });
 
   describe('cuesheet presets', () => {
@@ -120,7 +90,6 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-4685d6',
         target: OntimeView.Cuesheet,
         search: '',
-        displayInNav: false,
         options: {
           read: 'full',
           write: '-',
@@ -133,7 +102,6 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-basic',
         target: OntimeView.Cuesheet,
         search: '',
-        displayInNav: false,
       },
     ];
     const cuesheetPresetWithNavLock: URLPreset[] = [
@@ -142,7 +110,6 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-locked',
         target: OntimeView.Cuesheet,
         search: 'n=1',
-        displayInNav: false,
       },
     ];
 
@@ -224,7 +191,6 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
-        displayInNav: false,
       },
     ],
     [
@@ -236,7 +202,6 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
-        displayInNav: false,
       },
     ],
     [
@@ -248,7 +213,6 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
-        displayInNav: false,
       },
     ],
     [
@@ -260,7 +224,6 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
-        displayInNav: false,
       },
     ],
   ])('should generate URL preset options for %s', (_description, alias, url, expected) => {

apps/client/src/common/utils/socket.ts

@@ -3,7 +3,9 @@ import {
   Log,
   MaybeNumber,
   MessageTag,
+  ProjectRundownsList,
   RefetchKey,
+  Rundown,
   RuntimeStore,
   WsPacketToClient,
   WsPacketToServer,
@@ -14,17 +16,16 @@ import {
   APP_SETTINGS,
   CLIENT_LIST,
   CSS_OVERRIDE,
-  CURRENT_RUNDOWN_QUERY_KEY,
   CUSTOM_FIELDS,
   PROJECT_DATA,
+  CURRENT_RUNDOWN_QUERY_KEY,
+  PROJECT_RUNDOWNS,
   REPORT,
-  RUNDOWN,
   RUNTIME,
   TRANSLATION,
   URL_PRESETS,
   VIEW_SETTINGS,
   getRundownQueryKey,
-  PROJECT_RUNDOWNS,
 } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
@@ -180,7 +181,7 @@ export const connectSocket = () => {
         }
         case MessageTag.Refetch: {
           // the refetch message signals that the rundown has changed in the server side
-          const { target, revision, rundownId } = payload;
+          const { target, revision } = payload;
           switch (target) {
             case RefetchKey.All:
               invalidateAllCaches();
@@ -195,7 +196,7 @@ export const connectSocket = () => {
               ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
               break;
             case RefetchKey.Rundown: {
-              maybeInvalidateRundownCache(revision, rundownId);
+              maybeInvalidateRundownCache(revision);
               break;
             }
             case RefetchKey.UrlPresets:
@@ -213,9 +214,6 @@ export const connectSocket = () => {
             case RefetchKey.Settings:
               ontimeQueryClient.invalidateQueries({ queryKey: APP_SETTINGS });
               break;
-            case RefetchKey.ProjectRundowns:
-              ontimeQueryClient.invalidateQueries({ queryKey: PROJECT_RUNDOWNS });
-              break;
             default: {
               target satisfies never;
               break;
@@ -234,30 +232,34 @@ export const connectSocket = () => {
   };
 };
 
-export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: string) {
+/**
-  if (!rundownId) {
+ * When we receive a refetch message for the rundown
-    // we omit rundownId to signify invalidate all rundowns
+ * check which rundown needs to be invalidated
-    ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
+ */
-    ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
+export function maybeInvalidateRundownCache(revision: MaybeNumber) {
-    return;
+  const loadedRundownId: string | undefined = (ontimeQueryClient.getQueryData(PROJECT_RUNDOWNS) as ProjectRundownsList)
-  }
+    ?.loaded;
-
-  // skip if we dont recognise the ID the revision is lower
-  const queryKey = getRundownQueryKey(rundownId);
-  const cachedRundown = ontimeQueryClient.getQueryData<{ revision: number }>(queryKey);
 
+  const activeRundownQueryKey = loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
+  const cachedRundown = ontimeQueryClient.getQueryData<Rundown>(activeRundownQueryKey);
   if (revision === cachedRundown?.revision) {
-    // we already have the latest change
     return;
   }
 
-  ontimeQueryClient.invalidateQueries({ queryKey, exact: true });
+  ontimeQueryClient.invalidateQueries({ queryKey: activeRundownQueryKey, exact: true });
 
-  // keep current alias in sync with the ID-based cache
+  if (loadedRundownId) {
-  const loadedRundownId = ontimeQueryClient.getQueryData<{ loaded: string }>(PROJECT_RUNDOWNS)?.loaded;
+    // Keep bootstrap alias in sync with the ID-based cache
-  if (!loadedRundownId || loadedRundownId === rundownId) {
     ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
+  } else {
+    // During bootstrap, loadedRundownId is not yet known.
+    // Invalidate any ID-based rundown caches that may have been seeded early.
+    ontimeQueryClient.invalidateQueries({
+      predicate: (query) => query.queryKey[0] === 'rundown' && query.queryKey[1] !== 'current',
+    });
   }
+
+  ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
 }
 
 export function sendSocket<T extends MessageTag | ApiActionTag>(

apps/client/src/common/utils/urlPresets.ts

@@ -194,7 +194,6 @@ export function generateUrlPresetOptions(alias: string, userUrl: string): URLPre
     target: path,
     search: url.searchParams.toString(),
     enabled: true,
-    displayInNav: false,
   };
 }
 
@@ -205,7 +204,7 @@ function isPresettableView(view: string): view is OntimeViewPresettable {
 /**
  * Check if current location is a preset path
  */
-function isPresetPath(location: Path): boolean {
+export function isPresetPath(location: Path): boolean {
-  const firstSegment = location.pathname.split('/').find(Boolean);
+  const segments = location.pathname.split('/').filter(Boolean);
-  return firstSegment === 'preset';
+  return segments[0] === 'preset';
 }

apps/client/src/externals.ts

@@ -9,7 +9,6 @@ export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/rele
 export const websiteUrl = 'https://www.getontime.no';
 export const discordUrl = 'https://discord.com/invite/eje3CSUEXm';
 export const subredditUrl = 'https://www.reddit.com/r/ontimeapp/';
-export const youtubeUrl = 'https://www.youtube.com/@ontimeapp';
 
 export const documentationUrl = 'https://docs.getontime.no';
 export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';

apps/client/src/features/app-settings/panel-list/PanelList.module.scss

@@ -53,6 +53,10 @@ ul {
       background-color: $red-400;
     }
   }
+
+  &.split {
+    margin-top: 1rem;
+  }
 }
 
 .secondary {

apps/client/src/features/app-settings/panel-list/PanelList.tsx

@@ -42,9 +42,16 @@ interface PanelListItemProps {
   location?: string;
 }
 
-function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
+function PanelListItem(props: PanelListItemProps) {
+  const { panel, isSelected, location } = props;
   const { setLocation } = useAppSettingsNavigation();
-  const classes = cx([style.primary, isSelected && style.active, panel.highlight && style.highlight]);
+
+  const classes = cx([
+    style.primary,
+    isSelected && style.active,
+    panel.split && style.split,
+    panel.highlight && style.highlight,
+  ]);
 
   return (
     <Fragment key={panel.id}>

apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx

@@ -7,7 +7,6 @@ import {
   githubUrl,
   subredditUrl,
   websiteUrl,
-  youtubeUrl,
 } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 import AppVersion from './AppVersion';
@@ -39,7 +38,6 @@ export default function AboutPanel() {
         <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
         <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
         <ExternalLink href={discordUrl}>Discord server</ExternalLink>
-        <ExternalLink href={youtubeUrl}>YouTube channel</ExternalLink>
         <ExternalLink href={subredditUrl}>Subreddit</ExternalLink>
       </Panel.Section>
     </>

apps/client/src/features/app-settings/panel/automations-panel/AutomationSettingsForm.tsx

@@ -89,9 +89,10 @@ export default function AutomationSettingsForm({
 
       <Panel.Section>
         <Info>
-          <span>Control Ontime and share its data with external systems in your workflow.</span>
+          <p>Control Ontime and share its data with external systems in your workflow.</p>
-          <span>- Automations allow Ontime to send its data on lifecycle triggers.</span>
+          <p>- Automations allow Ontime to send its data on lifecycle triggers.</p>
-          <span>- OSC Input tells Ontime to listen to messages on the specific port.</span>
+          <p>- OSC Input tells Ontime to listen to messages on the specific port.</p>
+          <br />
           <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
         </Info>
       </Panel.Section>

apps/client/src/features/app-settings/panel/feature-panel/URLPresets.tsx

@@ -1,8 +1,7 @@
-import { OntimeView, URLPreset } from 'ontime-types';
+import { URLPreset } from 'ontime-types';
 import { useState } from 'react';
 import { IoAdd, IoOpenOutline, IoPencil, IoTrash } from 'react-icons/io5';
 
-import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
@@ -23,23 +22,13 @@ const urlPresetsDocs = 'https://docs.getontime.no/features/url-presets/';
 
 export default function URLPresets() {
   const [formState, setFormState] = useState<FormState>({ isOpen: false, preset: undefined });
-  const [actionError, setActionError] = useState<string | null>(null);
   const { data, status } = useUrlPresets();
-  const { updatePreset, deletePreset, isMutating } = useUpdateUrlPreset();
+  const { deletePreset, isMutating } = useUpdateUrlPreset();
 
   const openNewForm = () => setFormState({ isOpen: true });
   const openEditForm = (preset: URLPreset) => setFormState({ isOpen: true, preset });
   const closeForm = () => setFormState({ isOpen: false, preset: undefined });
 
-  const persistPreset = async (preset: URLPreset) => {
-    setActionError(null);
-    try {
-      await updatePreset(preset.alias, preset);
-    } catch (error) {
-      setActionError(maybeAxiosError(error));
-    }
-  };
-
   return (
     <Panel.Section>
       <Panel.Card>
@@ -64,12 +53,10 @@ export default function URLPresets() {
         <Panel.Section>
           <Panel.Loader isLoading={status === 'pending'} />
           {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
-          {actionError && <Panel.Error>{actionError}</Panel.Error>}
           <Panel.Table>
             <thead>
               <tr>
                 <th>Enabled</th>
-                <th>Show in nav</th>
                 <th>Target view</th>
                 <th>Alias</th>
                 <th />
@@ -78,23 +65,10 @@ export default function URLPresets() {
             <tbody>
               {data.length === 0 && <Panel.TableEmpty handleClick={openNewForm} />}
               {data.map((preset, index) => {
-                const isCuesheet = preset.target === OntimeView.Cuesheet;
                 return (
                   <tr key={preset.alias}>
                     <td>
-                      <Switch
+                      <Switch defaultChecked={preset.enabled} onCheckedChange={() => {}} />
-                        checked={preset.enabled}
-                        onCheckedChange={(enabled) => persistPreset({ ...preset, enabled })}
-                        disabled={isMutating}
-                        aria-label='Toggle preset enabled'
-                      />
-                    </td>
-                    <td>
-                      <Switch
-                        checked={preset.displayInNav}
-                        onCheckedChange={(checked) => persistPreset({ ...preset, displayInNav: checked })}
-                        disabled={isMutating || isCuesheet}
-                      />
                     </td>
                     <td>
                       <Tag>{preset.target}</Tag>

apps/client/src/features/app-settings/panel/feature-panel/composite/URLPresetForm.tsx

@@ -1,5 +1,5 @@
 import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils';
@@ -12,7 +12,6 @@ import { preventEscape } from '../../../../../common/utils/keyEvent';
 import { isUrlSafe } from '../../../../../common/utils/regex';
 import { enDash } from '../../../../../common/utils/styleUtils';
 import { generateUrlPresetOptions } from '../../../../../common/utils/urlPresets';
-import CuesheetLinkOptions, { CuesheetPermissionValues } from '../../../../sharing/composite/CuesheetLinkOptions';
 import * as Panel from '../../../panel-utils/PanelUtils';
 
 import style from './URLPresetForm.module.scss';
@@ -33,7 +32,6 @@ const defaultValues: URLPreset = {
   target: OntimeView.Timer,
   search: '',
   enabled: true,
-  displayInNav: false,
 };
 
 interface URLPresetFormProps {
@@ -63,42 +61,12 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
   });
   const urlRef = useRef<HTMLInputElement>(null);
 
-  // Cuesheet read/write permissions live outside react-hook-form
-  const initialPermissions = useRef<CuesheetPermissionValues>({
-    read: urlPreset?.options?.read ?? 'full',
-    write: urlPreset?.options?.write ?? 'full',
-  });
-  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>(initialPermissions.current);
-
-  // update initial permissions on mount
-  useEffect(() => {
-    initialPermissions.current = {
-      read: urlPreset?.options?.read ?? 'full',
-      write: urlPreset?.options?.write ?? 'full',
-    };
-    setCuesheetPermissions(initialPermissions.current);
-    // oxlint-disable-next-line eslint-plugin-react-hooks/exhaustive-deps -- run on mount
-  }, []);
-
-  const isEditingCuesheet = urlPreset && urlPreset.target === OntimeView.Cuesheet;
-  const isCuesheet = watch('target') === OntimeView.Cuesheet;
-  const permissionsDirty =
-    isCuesheet &&
-    (cuesheetPermissions.read !== initialPermissions.current.read ||
-      cuesheetPermissions.write !== initialPermissions.current.write);
-  const noReadAccess = isCuesheet && cuesheetPermissions.read === '-';
-
   const setupSubmit = async (data: URLPreset) => {
     try {
-      // Preserve / apply cuesheet permissions, which are not part of the form fields
-      const payload: URLPreset =
-        data.target === OntimeView.Cuesheet
-          ? { ...data, target: OntimeView.Cuesheet, options: cuesheetPermissions }
-          : data;
       if (urlPreset) {
-        await updatePreset(urlPreset.alias, payload);
+        await updatePreset(urlPreset.alias, data);
       } else {
-        await addPreset(payload);
+        await addPreset(data);
       }
       onClose();
     } catch (error) {
@@ -106,7 +74,6 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
     }
   };
 
-  // focus on alias when the form opens
   useEffect(() => {
     setFocus('alias');
   }, [setFocus]);
@@ -159,66 +126,44 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
         <div className={style.expand}>
           <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
           <Panel.InlineElements>
-            <Input placeholder='Paste URL' fluid ref={urlRef} disabled={isEditingCuesheet} />
+            <Input placeholder='Paste URL' fluid ref={urlRef} />
-            <Button onClick={generateOptions} disabled={isEditingCuesheet}>
+            <Button onClick={generateOptions}>Generate</Button>
-              Generate
-            </Button>
           </Panel.InlineElements>
         </div>
       </Panel.InlineElements>
       {errors.alias?.message && <Panel.Error>{errors.alias.message}</Panel.Error>}
-      {!isEditingCuesheet && (
+      <div>
-        <>
+        {enDash} or {enDash}
-          <div>
+      </div>
-            {enDash} or {enDash}
+      <div>2. Choose a view and its parameters</div>
-          </div>
+      <div>
-          <div>2. Choose a view and its parameters</div>
+        <Panel.Description>Target</Panel.Description>
-          <div>
+        <Select
-            <Panel.Description>Target</Panel.Description>
+          options={targetOptions}
-            <Select
+          {...register('target', { required: 'Target is required' })}
-              options={targetOptions}
+          value={watch('target')}
-              {...register('target', { required: 'Target is required' })}
+          onValueChange={(value: OntimeViewPresettable | null) => {
-              value={watch('target')}
+            if (value === null) return;
-              onValueChange={(value: OntimeViewPresettable | null) => {
+            setValue('target', value, { shouldDirty: true });
-                if (value === null) return;
+          }}
-                setValue('target', value, { shouldDirty: true });
+        />
-              }}
+      </div>
-            />
+      <div>
-          </div>
+        <Panel.Description>Parameters</Panel.Description>
-          <div>
+        <Textarea
-            <Panel.Description>Parameters</Panel.Description>
+          fluid
-            <Textarea
+          rows={3}
-              fluid
+          {...register('search', {
-              rows={3}
+            validate: validateParams,
-              {...register('search', {
+          })}
-                validate: validateParams,
+        />
-              })}
+        <Panel.Error>{errors.search?.message}</Panel.Error>
-            />
+      </div>
-            <Panel.Error>{errors.search?.message}</Panel.Error>
-          </div>
-        </>
-      )}
-
-      {isCuesheet && (
-        <div>
-          <Panel.Description>Permissions</Panel.Description>
-          <CuesheetLinkOptions
-            initialRead={initialPermissions.current.read}
-            initialWrite={initialPermissions.current.write}
-            onChange={setCuesheetPermissions}
-          />
-        </div>
-      )}
       <div>
         <Panel.Error>{errors.root?.message}</Panel.Error>
         <Panel.InlineElements align='end'>
           <Button onClick={onClose}>Cancel</Button>
-          <Button
+          <Button variant='primary' type='submit' disabled={!isValid || !isDirty} loading={isSubmitting || isMutating}>
-            variant='primary'
-            type='submit'
-            disabled={!isValid || (!isDirty && !permissionsDirty) || noReadAccess}
-            loading={isSubmitting || isMutating}
-          >
             Save
           </Button>
         </Panel.InlineElements>

apps/client/src/features/app-settings/panel/manage-panel/CustomFields.tsx

@@ -57,11 +57,11 @@ export default function CustomFieldSettings() {
         <Panel.Divider />
         <Panel.Section>
           <Info>
-            <span>Custom fields allow for additional information to be added to an event.</span>
+            Custom fields allow for additional information to be added to an event.
-            <span>
+            <br />
-              To use custom fields as a data source in an{' '}
+            <br />
-              <AppLink search='settings=automation__automations'>Automation</AppLink>, please note the generated key.
+            To use custom fields as a data source in an{' '}
-            </span>
+            <AppLink search='settings=automation__automations'>Automation</AppLink>, please note the generated key.
             <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
           </Info>
         </Panel.Section>

apps/client/src/features/app-settings/panel/manage-panel/CustomViews.tsx

@@ -52,9 +52,8 @@ export default function CustomViews() {
 
         <Panel.Section>
           <Info>
-            <span>
+            Upload one <strong>index.html</strong> per view to <strong>/external/&lt;name&gt;/</strong>.
-              Upload one <strong>index.html</strong> per view to <strong>/external/&lt;name&gt;/</strong>.
+            <br />
-            </span>
             External imports are not allowed, include all assets inside the html file.
             <ExternalLink href={customViewsDocs}>See the docs</ExternalLink>
           </Info>

apps/client/src/features/app-settings/panel/manage-panel/ManageRundowns.tsx

@@ -9,7 +9,6 @@ import {
   IoPencilOutline,
   IoTrash,
 } from 'react-icons/io5';
-import { TbGhost3 } from 'react-icons/tb';
 
 import { downloadAsExcel } from '../../../../common/api/excel';
 import { maybeAxiosError } from '../../../../common/api/utils';
@@ -20,7 +19,6 @@ import { DropdownMenu } from '../../../../common/components/dropdown-menu/Dropdo
 import Tag from '../../../../common/components/tag/Tag';
 import { useMutateProjectRundowns, useProjectRundowns } from '../../../../common/hooks-query/useProjectRundowns';
 import { cx } from '../../../../common/utils/styleUtils';
-import { useDirectLinkToBackgroundEdit } from '../../../../views/cuesheet/useCuesheetRundownSelection';
 import * as Panel from '../../panel-utils/PanelUtils';
 import RundownRenameForm from './composite/RundownRenameForm';
 import { ManageRundownForm } from './ManageRundownForm';
@@ -99,8 +97,6 @@ export default function ManageRundowns() {
     await downloadAsExcel(rundownId, title);
   };
 
-  const navigateToCuesheet = useDirectLinkToBackgroundEdit();
-
   return (
     <>
       <Panel.Section>
@@ -157,7 +153,7 @@ export default function ManageRundowns() {
                       </td>
                       <td>
                         <DropdownMenu
-                          render={<IconButton variant='ghosted-white' data-testId='rundown_menu' />}
+                          render={<IconButton variant='ghosted-white' />}
                           items={[
                             {
                               type: 'item',
@@ -184,12 +180,6 @@ export default function ManageRundowns() {
                               label: 'Duplicate',
                               onClick: () => submitRundownDuplicate(id),
                             },
-                            {
-                              type: 'item',
-                              icon: TbGhost3,
-                              label: 'Edit in cuesheet',
-                              onClick: () => navigateToCuesheet(id),
-                            },
                             { type: 'divider' },
                             {
                               type: 'destructive',

apps/client/src/features/app-settings/panel/manage-panel/RundownDefaultSettings.tsx

@@ -16,7 +16,6 @@ export default function RundownDefaultSettings() {
     defaultDangerTime,
     defaultTimerType,
     defaultEndAction,
-    inheritGroupColour,
     setDefaultDuration,
     setLinkPrevious,
     setTimeStrategy,
@@ -24,7 +23,6 @@ export default function RundownDefaultSettings() {
     setDangerTime,
     setDefaultTimerType,
     setDefaultEndAction,
-    setInheritGroupColour,
   } = useEditorSettings((state) => state);
 
   const durationInMs = parseUserTime(defaultDuration);
@@ -46,13 +44,6 @@ export default function RundownDefaultSettings() {
               />
               <Switch size='large' checked={linkPrevious} onCheckedChange={setLinkPrevious} />
             </Panel.ListItem>
-            <Panel.ListItem>
-              <Panel.Field
-                title='Inherit group colour'
-                description='Whether new events and milestones inherit the colour of their parent group'
-              />
-              <Switch size='large' checked={inheritGroupColour} onCheckedChange={setInheritGroupColour} />
-            </Panel.ListItem>
             <Panel.ListItem>
               <Panel.Field
                 title='Timer strategy'

apps/client/src/features/app-settings/panel/settings-panel/McpSection.tsx

@@ -1,54 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { generateUrl } from '../../../../common/api/session';
-import CopyTag from '../../../../common/components/copy-tag/CopyTag';
-import useInfo from '../../../../common/hooks-query/useInfo';
-import { isOntimeCloud, serverURL } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-export default function McpSection() {
-  const { data: infoData } = useInfo();
-  const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
-
-  // generate url
-  useEffect(() => {
-    const baseUrl = (() => {
-      if (isOntimeCloud) return serverURL;
-
-      // for local setups we prefer the localhost IP to avoid remote access
-      if (infoData.networkInterfaces.length > 0) {
-        return `http://${infoData.networkInterfaces[0].address}:${infoData.serverPort}`;
-      }
-      return serverURL;
-    })();
-
-    // we are reusing the endpoint, so locking config and nav have no effect
-    generateUrl({ baseUrl, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
-      .then(setMcpEndpointUrl)
-      .catch(() => {
-        setMcpEndpointUrl('');
-      });
-  }, [infoData]);
-
-  const mcpClientConfig = mcpEndpointUrl
-    ? JSON.stringify({ mcpServers: { ontime: { url: mcpEndpointUrl } } }, null, 2)
-    : '';
-
-  return (
-    <Panel.Section>
-      <Panel.Card>
-        <Panel.SubHeader>MCP Server</Panel.SubHeader>
-        <Panel.Paragraph>Connect any MCP-compatible AI agent to Ontime using the endpoint below.</Panel.Paragraph>
-        <Panel.Divider />
-        <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
-        {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
-        <Panel.Divider />
-        <Panel.Field
-          title='Client configuration snippet'
-          description='Paste this into your AI agent settings under "mcpServers"'
-        />
-        {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
-      </Panel.Card>
-    </Panel.Section>
-  );
-}

apps/client/src/features/app-settings/panel/settings-panel/SettingsPanel.tsx

@@ -4,7 +4,6 @@ import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import CustomViews from '../manage-panel/CustomViews';
 import GeneralSettings from './GeneralSettings';
-import McpSection from './McpSection';
 import ProjectData from './ProjectData';
 import ServerPortSettings from './ServerPortSettings';
 import ViewSettings from './ViewSettings';
@@ -14,7 +13,6 @@ export default function SettingsPanel({ location }: PanelBaseProps) {
   const generalRef = useScrollIntoView<HTMLDivElement>('general', location);
   const viewRef = useScrollIntoView<HTMLDivElement>('view', location);
   const customViewsRef = useScrollIntoView<HTMLDivElement>('custom-views', location);
-  const mcpRef = useScrollIntoView<HTMLDivElement>('mcp', location);
   const portRef = useScrollIntoView<HTMLDivElement>('port', location);
 
   return (
@@ -32,9 +30,6 @@ export default function SettingsPanel({ location }: PanelBaseProps) {
       <div ref={customViewsRef}>
         <CustomViews />
       </div>
-      <div ref={mcpRef}>
-        <McpSection />
-      </div>
       {!isDocker && (
         <div ref={portRef}>
           <ServerPortSettings />

apps/client/src/features/app-settings/panel/settings-panel/composite/CustomTranslationModal.module.scss

@@ -1,3 +0,0 @@
-.footer {
-  width: 100%;
-}

apps/client/src/features/app-settings/panel/settings-panel/composite/CustomTranslationModal.tsx

@@ -1,5 +1,5 @@
 import { TranslationObject, langEn } from 'ontime-types';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { maybeAxiosError } from '../../../../../common/api/utils';
@@ -10,8 +10,6 @@ import Modal from '../../../../../common/components/modal/Modal';
 import { useTranslation } from '../../../../../translation/TranslationProvider';
 import * as Panel from '../../../panel-utils/PanelUtils';
 
-import style from './CustomTranslationModal.module.scss';
-
 interface CustomTranslationModalProps {
   isOpen: boolean;
   onClose: () => void;
@@ -19,7 +17,14 @@ interface CustomTranslationModalProps {
 
 export default function CustomTranslationModal({ isOpen, onClose }: CustomTranslationModalProps) {
   const { userTranslation, postUserTranslation } = useTranslation();
-  const customTranslationFormValues = useMemo(() => toFormValues(userTranslation), [userTranslation]);
+
+  const defaultValues = useMemo(() => {
+    const values: Record<string, string> = {};
+    Object.keys(langEn).forEach((key) => {
+      values[toFormKey(key)] = userTranslation[key as keyof TranslationObject] || '';
+    });
+    return values;
+  }, [userTranslation]);
 
   const {
     handleSubmit,
@@ -28,17 +33,13 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
     formState: { isSubmitting, isDirty, errors, isValid },
     setError,
   } = useForm({
-    defaultValues: customTranslationFormValues,
+    defaultValues,
+    resetOptions: {
+      keepDirtyValues: true,
+    },
     mode: 'onChange',
   });
 
-  // keep data up to date
-  useEffect(() => {
-    if (isOpen) {
-      reset(customTranslationFormValues);
-    }
-  }, [customTranslationFormValues, isOpen, reset]);
-
   const onSubmit = async (formData: Record<string, string>) => {
     try {
       const translationData: Record<string, string> = {};
@@ -53,10 +54,6 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
     }
   };
 
-  const resetToEnglish = () => {
-    reset(toFormValues(langEn), { keepDefaultValues: true });
-  };
-
   return (
     <Modal
       title='Edit custom translations'
@@ -87,12 +84,9 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
         </Panel.Section>
       }
       footerElements={
-        <div className={style.footer}>
+        <div>
           {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
           <Panel.InlineElements align='apart'>
-            <Button variant='ghosted' size='large' onClick={resetToEnglish} disabled={isSubmitting}>
-              Reset to English
-            </Button>
             <Panel.InlineElements>
               <Button size='large' onClick={onClose}>
                 Cancel
@@ -115,14 +109,6 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
   );
 }
 
-function toFormValues(translation: Partial<TranslationObject>) {
-  const values: Record<string, string> = {};
-  Object.keys(langEn).forEach((key) => {
-    values[toFormKey(key)] = translation[key as keyof TranslationObject] || '';
-  });
-  return values;
-}
-
 function toFormKey(key: string) {
   return key.replace('.', '_');
 }

apps/client/src/features/app-settings/panel/settings-panel/composite/StyleEditorModal.module.scss

@@ -20,5 +20,4 @@
   border: 1px solid $gray-1100;
   border-radius: 3px;
   overflow: hidden;
-  height: 100%;
 }

apps/client/src/features/app-settings/useAppSettingsMenu.tsx

@@ -7,6 +7,7 @@ export type SettingsOption = {
   id: string;
   label: string;
   secondary?: Readonly<SettingsOption[]>;
+  split?: boolean;
   highlight?: string;
 };
 
@@ -19,13 +20,13 @@ const staticOptions = [
       { id: 'settings__general', label: 'General settings' },
       { id: 'settings__view', label: 'View settings' },
       { id: 'settings__custom-views', label: 'Custom views' },
-      { id: 'settings__mcp', label: 'MCP Server' },
+      { id: 'settings__port', label: 'Server port' },
-      ...(isDocker ? [] : [{ id: 'settings__port', label: 'Server port' }]),
     ],
   },
   {
     id: 'project',
     label: 'Project',
+    split: true,
     secondary: [
       { id: 'project__create', label: 'Create...' },
       { id: 'project__list', label: 'Manage projects' },
@@ -45,6 +46,7 @@ const staticOptions = [
   {
     id: 'automation',
     label: 'Automation',
+    split: true,
     secondary: [
       { id: 'automation__settings', label: 'Automation settings' },
       { id: 'automation__automations', label: 'Manage automations' },
@@ -54,6 +56,7 @@ const staticOptions = [
   {
     id: 'sharing',
     label: 'Sharing and reporting',
+    split: true,
     secondary: [
       { id: 'sharing__presets', label: 'URL Presets' },
       {
@@ -66,6 +69,7 @@ const staticOptions = [
   {
     id: 'network',
     label: 'Network',
+    split: true,
     secondary: [
       {
         id: 'network__log',
@@ -80,10 +84,12 @@ const staticOptions = [
   {
     id: 'about',
     label: 'About',
+    split: true,
   },
   {
     id: 'shutdown',
     label: 'Shutdown',
+    split: true,
   },
 ] as const;
 
@@ -97,12 +103,18 @@ export function useAppSettingsMenu() {
 
   const options: Readonly<SettingsOption[]> = useMemo(
     () =>
-      staticOptions.map((option) =>
+      staticOptions.map((option) => ({
+        ...option,
+        // if we are in docker don't show the port option
+        secondary:
+          'secondary' in option
+            ? isDocker && option.id === 'settings'
+              ? [...option.secondary.filter(({ id }) => id !== 'settings__port')]
+              : [...option.secondary]
+            : undefined,
         // if there is an update then highlight the about setting
-        option.id === 'about' && data.hasUpdates
+        highlight: option.id === 'about' && data.hasUpdates ? 'New version available' : undefined,
-          ? Object.assign({}, option, { highlight: 'New version available' })
+      })),
-          : option,
-      ),
     [data],
   );
 

apps/client/src/features/rundown/RundownExport.tsx

@@ -6,7 +6,6 @@ import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary'
 import ViewNavigationMenu from '../../common/components/navigation-menu/ViewNavigationMenu';
 import ProtectRoute from '../../common/components/protect-route/ProtectRoute';
 import { EntryActionsProvider } from '../../common/context/EntryActionsContext';
-import { useLoadedRundownSource } from '../../common/hooks-query/useScopedRundown';
 import { useEntryActions } from '../../common/hooks/useEntryAction';
 import { useIsSmallDevice } from '../../common/hooks/useIsSmallDevice';
 import { handleLinks } from '../../common/utils/linkUtils';
@@ -105,8 +104,6 @@ interface RundownRootProps {
 }
 
 function RundownRoot({ isSmallDevice, isExtracted, viewMode, setViewMode }: RundownRootProps) {
-  const source = useLoadedRundownSource();
-
   return (
     <div className={style.rundownRoot}>
       {isSmallDevice ? (
@@ -115,7 +112,7 @@ function RundownRoot({ isSmallDevice, isExtracted, viewMode, setViewMode }: Rund
         <RundownHeader isExtracted={isExtracted} viewMode={viewMode} setViewMode={setViewMode} />
       )}
       {viewMode === RundownViewMode.List ? <RundownList /> : <RundownTable />}
-      {viewMode === RundownViewMode.Table && <EntryEditModal rundown={source.rundown} />}
+      {viewMode === RundownViewMode.Table && <EntryEditModal />}
       <RenumberCuesDialog />
     </div>
   );

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

@@ -1,6 +1,7 @@
-import { OntimeEntry, Rundown, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { OntimeEntry, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { useMemo } from 'react';
 
+import useRundown from '../../../common/hooks-query/useRundown';
 import EventEditor from './EventEditor';
 import GroupEditor from './GroupEditor';
 import MilestoneEditor from './MilestoneEditor';
@@ -9,18 +10,19 @@ import style from './EntryEditor.module.scss';
 
 interface CuesheetEntryEditorProps {
   entryId: string;
-  rundown: Rundown;
 }
 
-export default function CuesheetEntryEditor({ entryId, rundown }: CuesheetEntryEditorProps) {
+export default function CuesheetEntryEditor({ entryId }: CuesheetEntryEditorProps) {
+  const { data } = useRundown();
+
   const entry = useMemo<OntimeEntry | null>(() => {
-    if (rundown.order.length === 0) {
+    if (data.order.length === 0) {
       return null;
     }
 
-    const event = rundown.entries[entryId];
+    const event = data.entries[entryId];
     return event ?? null;
-  }, [entryId, rundown.entries, rundown.order.length]);
+  }, [entryId, data.order, data.entries]);
 
   if (isOntimeEvent(entry)) {
     return (

apps/client/src/features/rundown/entry-editor/composite/EventEditorTriggers.module.scss

@@ -4,6 +4,18 @@
   gap: 0.75rem;
 }
 
+.section,
+.formSection {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.sectionTitle {
+  font-size: $aux-text-size;
+  color: $label-gray;
+}
+
 .triggerList {
   display: flex;
   flex-direction: column;
@@ -13,13 +25,25 @@
   overflow: hidden;
 }
 
-.triggerHeader {
+.triggerForm {
-  display: grid;
+  display: flex;
-  grid-template-columns: 8rem 1fr 2rem;
+  flex-direction: column;
   gap: 0.5rem;
-  padding: 0.375rem 0.75rem;
+}
-  font-size: $aux-text-size;
+
-  color: $label-gray;
+.formFields {
+  display: grid;
+  grid-template-columns: 8rem 1fr;
+  gap: 0.75rem;
+  align-items: end;
+}
+
+.formActions {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 0.75rem;
+  min-height: 2rem;
 }
 
 .trigger {
@@ -27,22 +51,40 @@
   display: grid;
   grid-template-columns: 8rem 1fr 2rem;
   align-items: center;
-  gap: 0.5rem;
   min-height: 2.5rem;
 
   &:not(:first-child) {
     border-top: 1px solid $white-10;
   }
-
-  &[data-duplicate] {
-    > button:not(:last-child) {
-      border-color: $orange-500;
-    }
-  }
 }
 
-.duplicateMessage {
+.triggerMeta {
-  padding-left: 0.75rem;
+  min-width: 0;
+}
+
+.metaLabel {
+  color: $label-gray;
   font-size: $aux-text-size;
-  color: $orange-500;
+  line-height: 1.2;
+  margin-bottom: 0.125rem;
+}
+
+.automationTitle {
+  overflow-wrap: anywhere;
+}
+
+.validationError,
+.validationSuccess {
+  display: flex;
+  align-items: center;
+  gap: 0.375rem;
+  font-size: $aux-text-size;
+}
+
+.validationError {
+  color: $red-500;
+}
+
+.validationSuccess {
+  color: $green-500;
 }

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

@@ -1,9 +1,11 @@
-import { Trigger } from 'ontime-types';
+import { NormalisedAutomation, TimerLifeCycle, Trigger, timerLifecycleValues } from 'ontime-types';
 import { generateId } from 'ontime-utils';
-import { IoAdd, IoTrash } from 'react-icons/io5';
+import { Fragment, useCallback, useMemo, useState } from 'react';
+import { IoAlertCircle, IoCheckmarkCircle, IoTrash } from 'react-icons/io5';
 
 import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
+import * as Editor from '../../../../common/components/editor-utils/EditorUtils';
 import Info from '../../../../common/components/info/Info';
 import Select from '../../../../common/components/select/Select';
 import { useEntryActionsContext } from '../../../../common/context/EntryActionsContext';
@@ -19,108 +21,174 @@ interface EventEditorTriggersProps {
 
 export default function EventEditorTriggers({ triggers, eventId }: EventEditorTriggersProps) {
   const { data: automationSettings, status: automationStatus } = useAutomationSettings();
-  const { updateEntry } = useEntryActionsContext();
   const automationsEnabled = automationStatus === 'pending' ? undefined : automationSettings.enabledAutomations;
-
+  const showTriggers = triggers.length > 0;
-  const allAutomationOptions = Object.values(automationSettings.automations).map(({ id, title }) => ({
-    value: id,
-    label: title,
-  }));
-  const hasAutomationOptions = allAutomationOptions.length > 0;
-  const triggerOptions = eventTriggerOptions.map((cycle) => ({ value: cycle, label: cycle }));
-
-  const duplicateIds = new Set<string>();
-  const seen = new Map<string, string>();
-  for (const trigger of triggers) {
-    const key = `${trigger.trigger}:${trigger.automationId}`;
-    if (seen.has(key)) {
-      duplicateIds.add(trigger.id);
-    } else {
-      seen.set(key, trigger.id);
-    }
-  }
-
-  const handleAdd = () => {
-    if (!hasAutomationOptions) return;
-    updateEntry({
-      id: eventId,
-      triggers: [
-        ...triggers,
-        { id: generateId(), title: '', trigger: eventTriggerOptions[0], automationId: allAutomationOptions[0].value },
-      ],
-    });
-  };
-
-  const handleDelete = (triggerId: string) => {
-    updateEntry({ id: eventId, triggers: triggers.filter((t) => t.id !== triggerId) });
-  };
-
-  const handleChange = (triggerId: string, field: 'trigger' | 'automationId', value: string) => {
-    const newTriggers = triggers.map((t) => (t.id !== triggerId ? t : { ...t, [field]: value }));
-    updateEntry({ id: eventId, triggers: newTriggers });
-  };
 
   return (
     <div className={style.triggers}>
       {automationsEnabled === false && (
         <Info>Automations are disabled. Event triggers stay configured, but they will not run until enabled.</Info>
       )}
-      {automationsEnabled && !hasAutomationOptions && (
+      {showTriggers && (
-        <Info>
+        <div className={style.section}>
-          <Info.Title>No automations available</Info.Title>
+          <div className={style.sectionTitle}>Applied automations</div>
-          <Info.Body>Create an automation before attaching it to this event.</Info.Body>
+          <ExistingEventTriggers triggers={triggers} eventId={eventId} automations={automationSettings.automations} />
-        </Info>
+        </div>
       )}
-      {triggers.length > 0 && (
+      <Editor.Panel className={style.formSection}>
-        <div className={style.triggerList}>
+        <div className={style.sectionTitle}>Add automation</div>
-          <div className={style.triggerHeader}>
+        <EventTriggerForm triggers={triggers} eventId={eventId} automations={automationSettings.automations} />
-            <span>Lifecycle</span>
+      </Editor.Panel>
-            <span>Automation</span>
+    </div>
-          </div>
+  );
-          {triggers.map((trigger) => {
+}
-            const isDuplicate = duplicateIds.has(trigger.id);
+
-            const lifecycleOptions = isDuplicate
+interface EventTriggerFormProps {
-              ? triggerOptions.map((opt) => (opt.value === trigger.trigger ? { ...opt, label: `${opt.label} *` } : opt))
+  eventId: string;
-              : triggerOptions;
+  triggers?: Trigger[];
-            const automationOptions = isDuplicate
+  automations: NormalisedAutomation;
-              ? allAutomationOptions.map((opt) =>
+}
-                  opt.value === trigger.automationId ? { ...opt, label: `${opt.label} *` } : opt,
+
-                )
+function EventTriggerForm({ eventId, triggers, automations }: EventTriggerFormProps) {
-              : allAutomationOptions;
+  const { updateEntry } = useEntryActionsContext();
+  const [automationId, setAutomationId] = useState<string | undefined>(undefined);
+  const [cycleValue, setCycleValue] = useState(TimerLifeCycle.onStart);
+
+  const handleSubmit = (triggerLifeCycle: TimerLifeCycle, automationId: string) => {
+    const newTriggers = triggers ?? new Array<Trigger>();
+    const id = generateId();
+    newTriggers.push({ id, title: '', trigger: triggerLifeCycle, automationId });
+    updateEntry({ id: eventId, triggers: newTriggers });
+  };
+
+  const getValidationError = (cycle: TimerLifeCycle, automationId?: string): string | undefined => {
+    if (automationId === undefined) {
+      return 'Select an automation';
+    }
+    if (!Object.keys(automations).includes(automationId)) {
+      return 'This automation does not exist';
+    }
+    if (triggers === undefined) {
+      return;
+    }
+    return Object.values(triggers).some((t) => t.automationId === automationId && t.trigger === cycle)
+      ? 'Automation can only be used once'
+      : undefined;
+  };
+
+  const validationError = getValidationError(cycleValue, automationId);
+  const validationLabel = validationError ?? 'Ready to add automation';
+
+  const triggerOptions = useMemo(
+    () => [
+      { value: null, label: 'Select lifecycle' },
+      ...eventTriggerOptions.map((cycle) => ({ value: cycle, label: cycle })),
+    ],
+    [], // eventTriggerOptions is a constant, no need for dependency
+  );
+
+  const automationOptions = useMemo(
+    () => [
+      { value: null, label: 'Select Automation' },
+      ...Object.values(automations).map(({ id, title }) => ({ value: id, label: title })),
+    ],
+    [automations], // This needs to be a dependency as it can change
+  );
+
+  return (
+    <div className={style.triggerForm}>
+      <div className={style.formFields}>
+        <div>
+          <Editor.Label>Lifecycle</Editor.Label>
+          <Select
+            value={cycleValue}
+            onValueChange={(value) => {
+              if (value !== null) setCycleValue(value);
+            }}
+            options={triggerOptions}
+          />
+        </div>
+
+        <div>
+          <Editor.Label>Automation</Editor.Label>
+          <Select
+            value={automationId ?? null}
+            onValueChange={(value) => {
+              if (value !== null) setAutomationId(value);
+            }}
+            options={automationOptions}
+          />
+        </div>
+      </div>
+
+      <div className={style.formActions}>
+        <div className={validationError ? style.validationError : style.validationSuccess}>
+          {validationError ? <IoAlertCircle /> : <IoCheckmarkCircle />}
+          <span>{validationLabel}</span>
+        </div>
+        <Button
+          disabled={validationError !== undefined}
+          onClick={() => automationId && handleSubmit(cycleValue, automationId)}
+        >
+          Add automation
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+interface ExistingEventTriggersProps {
+  eventId: string;
+  triggers: Trigger[];
+  automations: NormalisedAutomation;
+}
+
+function ExistingEventTriggers({ eventId, triggers, automations }: ExistingEventTriggersProps) {
+  const { updateEntry } = useEntryActionsContext();
+
+  const handleDelete = useCallback(
+    (triggerId: string) => {
+      const newTriggers = triggers.filter((trigger) => trigger.id !== triggerId);
+      updateEntry({ id: eventId, triggers: newTriggers });
+    },
+    [eventId, triggers, updateEntry],
+  );
+
+  const filteredTriggers: Record<string, Trigger[]> = {};
+
+  // sort triggers out into groups by the Lifecycle they are on
+  timerLifecycleValues.forEach((triggerType) => {
+    const thisTriggerType = triggers.filter((trigger) => trigger.trigger === triggerType);
+    if (thisTriggerType.length) {
+      Object.assign(filteredTriggers, { [triggerType]: thisTriggerType });
+    }
+  });
+
+  return (
+    <div className={style.triggerList}>
+      {Object.entries(filteredTriggers).map(([triggerLifeCycle, triggerGroup]) => (
+        <Fragment key={triggerLifeCycle}>
+          {triggerGroup.map((trigger) => {
+            const { id, automationId } = trigger;
+            const automationTitle = automations[automationId]?.title ?? '<MISSING AUTOMATION>';
             return (
-              <div key={trigger.id} className={style.trigger} data-duplicate={isDuplicate || undefined}>
+              <div key={id} className={style.trigger}>
-                <Select
+                <div className={style.triggerMeta}>
-                  value={trigger.trigger}
+                  <div className={style.metaLabel}>Lifecycle</div>
-                  onValueChange={(value) => {
+                  <div>{triggerLifeCycle}</div>
-                    if (value !== null) handleChange(trigger.id, 'trigger', value);
+                </div>
-                  }}
+                <div className={style.triggerMeta}>
-                  options={lifecycleOptions}
+                  <div className={style.metaLabel}>Automation</div>
-                />
+                  <div className={style.automationTitle}>{automationTitle}</div>
-                <Select
+                </div>
-                  value={trigger.automationId}
+                <IconButton variant='ghosted-destructive' onClick={() => handleDelete(id)}>
-                  onValueChange={(value) => {
-                    if (value !== null) handleChange(trigger.id, 'automationId', value);
-                  }}
-                  options={automationOptions}
-                />
-                <IconButton variant='ghosted-destructive' onClick={() => handleDelete(trigger.id)}>
                   <IoTrash />
                 </IconButton>
               </div>
             );
           })}
-        </div>
+        </Fragment>
-      )}
+      ))}
-      {duplicateIds.size > 0 && (
-        <span className={style.duplicateMessage}>
-          * Duplicate combinations will only fire once per lifecycle event.
-        </span>
-      )}
-      {hasAutomationOptions && (
-        <Button variant='ghosted' onClick={handleAdd}>
-          <IoAdd /> Add automation
-        </Button>
-      )}
     </div>
   );
 }

apps/client/src/features/rundown/rundown-table/EditorTableSettings.tsx

@@ -0,0 +1,39 @@
+import { Toolbar } from '@base-ui/react/toolbar';
+import type { Column } from '@tanstack/react-table';
+
+import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
+import {
+  ColumnSettings,
+  ViewSettings,
+} from '../../../views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings';
+import { usePersistedRundownOptions } from '../rundown.options';
+
+import style from '../../../views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss';
+
+interface EditorTableSettingsProps {
+  columns: Column<ExtendedEntry, unknown>[];
+  handleResetResizing: () => void;
+  handleResetReordering: () => void;
+  handleClearToggles: () => void;
+}
+
+export default function EditorTableSettings({
+  columns,
+  handleResetResizing,
+  handleResetReordering,
+  handleClearToggles,
+}: EditorTableSettingsProps) {
+  const options = usePersistedRundownOptions();
+
+  return (
+    <Toolbar.Root className={style.tableSettings}>
+      <ViewSettings optionsStore={options} />
+      <ColumnSettings
+        columns={columns}
+        handleResetResizing={handleResetResizing}
+        handleResetReordering={handleResetReordering}
+        handleClearToggles={handleClearToggles}
+      />
+    </Toolbar.Root>
+  );
+}

apps/client/src/features/rundown/rundown-table/RundownTable.tsx

@@ -1,10 +1,7 @@
 import { memo, useEffect, useMemo } from 'react';
 
 import EmptyPage from '../../../common/components/state/EmptyPage';
-import { EntryActionsProvider } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
-import { useLoadedRundownSource } from '../../../common/hooks-query/useScopedRundown';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
 import CuesheetDnd from '../../../views/cuesheet/cuesheet-dnd/CuesheetDnd';
 import CuesheetTable from '../../../views/cuesheet/cuesheet-table/CuesheetTable';
 import { useCuesheetPermissions } from '../../../views/cuesheet/useTablePermissions';
@@ -16,8 +13,6 @@ function RundownTable() {
   const { data: customFields, status: customFieldStatus } = useCustomFields();
   const setPermissions = useCuesheetPermissions((state) => state.setPermissions);
   const { editorMode } = useEditorFollowMode();
-  const source = useLoadedRundownSource();
-  const actions = useEntryActions();
 
   // Editor always has full permissions
   useEffect(() => {
@@ -35,14 +30,12 @@ function RundownTable() {
   const isLoading = !customFields || customFieldStatus === 'pending';
 
   return (
-    <EntryActionsProvider actions={actions}>
+    <CuesheetDnd columns={columns} tableRoot='editor'>
-      <CuesheetDnd columns={columns} tableRoot='editor'>
+      {isLoading ? (
-        {isLoading ? (
+        <EmptyPage text='Loading...' />
-          <EmptyPage text='Loading...' />
+      ) : (
-        ) : (
+        <CuesheetTable columns={columns} cuesheetMode={editorMode} tableRoot='editor' />
-          <CuesheetTable columns={columns} source={source} cuesheetMode={editorMode} tableRoot='editor' />
+      )}
-        )}
+    </CuesheetDnd>
-      </CuesheetDnd>
-    </EntryActionsProvider>
   );
 }

apps/client/src/features/rundown/useEventSelection.ts

@@ -2,7 +2,7 @@ import { EntryId, MaybeNumber, ProjectRundownsList, Rundown, isOntimeEvent } fro
 import { MouseEvent } from 'react';
 import { create } from 'zustand';
 
-import { PROJECT_RUNDOWNS, getRundownQueryKey } from '../../common/api/constants';
+import { CURRENT_RUNDOWN_QUERY_KEY, PROJECT_RUNDOWNS, getRundownQueryKey } from '../../common/api/constants';
 import { ontimeQueryClient } from '../../common/queryClient';
 import { isMacOS } from '../../common/utils/deviceUtils';
 
@@ -137,9 +137,12 @@ export const useEventSelection = create<EventSelectionStore>()((set, get) => ({
 }));
 
 function getLoadedRundownData() {
-  const rundownId = ontimeQueryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
+  const loadedRundownId = ontimeQueryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-  if (!rundownId) return undefined;
+  if (loadedRundownId) {
-  return ontimeQueryClient.getQueryData<Rundown>(getRundownQueryKey(rundownId));
+    return ontimeQueryClient.getQueryData<Rundown>(getRundownQueryKey(loadedRundownId));
+  }
+
+  return ontimeQueryClient.getQueryData<Rundown>(CURRENT_RUNDOWN_QUERY_KEY);
 }
 
 export function getSelectionMode(event: MouseEvent): SelectionMode {

apps/client/src/features/sharing/GenerateLinkForm.tsx

@@ -1,6 +1,6 @@
 import { OntimeView, URLPreset } from 'ontime-types';
 import { generateId } from 'ontime-utils';
-import { useCallback, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { FieldErrors, useForm } from 'react-hook-form';
 
 import { generateUrl } from '../../common/api/session';
@@ -18,7 +18,7 @@ import { preventEscape } from '../../common/utils/keyEvent';
 import { isUrlSafe } from '../../common/utils/regex';
 import { isOntimeCloud, serverURL } from '../../externals';
 import * as Panel from '../app-settings/panel-utils/PanelUtils';
-import CuesheetLinkOptions, { CuesheetPermissionValues } from './composite/CuesheetLinkOptions';
+import CuesheetLinkOptions from './composite/CuesheetLinkOptions';
 
 import style from './GenerateLinkForm.module.scss';
 
@@ -53,26 +53,12 @@ type GenerateLinkState = 'pending' | 'loading' | 'success' | 'error';
 
 export default function GenerateLinkForm({ hostOptions, pathOptions, presets, isLockedToView }: GenerateLinkFormProps) {
   const [formState, setFormState] = useState<GenerateLinkState>('pending');
-  const [url, setUrl] = useState('');
+  const [url, setUrl] = useState(serverURL);
-  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>({
+  const cuesheetReadRef = useRef<HTMLInputElement>(null);
-    read: 'full',
+  const cuesheetWriteRef = useRef<HTMLInputElement>(null);
-    write: 'full',
-  });
   const generatedAlias = useRef<string>(`cuesheet-${generateId()}`);
 
-  const { addPreset, updatePreset } = useUpdateUrlPreset();
+  const { addPreset } = useUpdateUrlPreset();
-  // Tracks the alias we already created this session so re-generating updates rather than duplicates it
-  const createdAlias = useRef<string | null>(null);
-
-  /**
-   * Permissions live outside react-hook-form, so we reset a successful state manually
-   * whenever they change - this re-arms the "Create share link" button as the previous
-   * link no longer reflects the selected permissions.
-   */
-  const handlePermissionsChange = useCallback((permissions: CuesheetPermissionValues) => {
-    setCuesheetPermissions(permissions);
-    setFormState((current) => (current === 'success' ? 'pending' : current));
-  }, []);
 
   const {
     handleSubmit,
@@ -104,20 +90,16 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
     if (options.read === '-') {
       throw new Error('Cannot create a share with no read permissions');
     }
-    const payload = {
+    const presets = await addPreset({
       target: OntimeView.Cuesheet,
       enabled: true,
       alias,
       search: '',
-      displayInNav: false,
       options: {
         read: options.read,
         write: options.write,
       },
-    } as const;
+    });
-    // Re-generating with the same name updates the existing preset instead of failing on a duplicate alias
-    const presets = createdAlias.current === alias ? await updatePreset(alias, payload) : await addPreset(payload);
-    createdAlias.current = alias;
     return presets.find((preset) => preset.alias === alias);
   };
 
@@ -126,8 +108,8 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
       setFormState('loading');
       if (options.path === OntimeView.Cuesheet) {
         const urlPreset = await createPresetFromOptions((options as CuesheetLinkOptions).alias, {
-          read: cuesheetPermissions.read,
+          read: cuesheetReadRef.current?.value ?? 'full',
-          write: cuesheetPermissions.write,
+          write: cuesheetWriteRef.current?.value ?? 'full',
         });
 
         if (!urlPreset) {
@@ -175,7 +157,6 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
     }
   };
 
-  const noReadAccess = watch('path') === OntimeView.Cuesheet && cuesheetPermissions.read === '-';
   const canSubmit = isDirty || formState !== 'success';
 
   return (
@@ -239,7 +220,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
                     })}
                   />
                 </Panel.ListItem>
-                <CuesheetLinkOptions onChange={handlePermissionsChange} />
+                <CuesheetLinkOptions readRef={cuesheetReadRef} writeRef={cuesheetWriteRef} />
               </>
             )}
 
@@ -287,29 +268,18 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
           </Panel.ListGroup>
           <Panel.Error>{errors.root?.message}</Panel.Error>
           <Panel.InlineElements align='end' className={style.end}>
-            <Button
+            <Button type='submit' variant={canSubmit ? 'primary' : 'subtle'} loading={formState === 'loading'}>
-              type='submit'
-              variant={canSubmit ? 'primary' : 'subtle'}
-              loading={formState === 'loading'}
-              disabled={noReadAccess}
-            >
               {canSubmit ? 'Create share link' : 'Link copied to clipboard!'}
             </Button>
           </Panel.InlineElements>
         </div>
         <Panel.Section className={style.column}>
           <Panel.Description>Share this link</Panel.Description>
-          {url ? (
+          <QRCode size={172} value={url} />
-            <>
+          <div className={style.copiableLink} data-testid='copy-link'>
-              <QRCode size={172} value={url} />
+            {url}
-              <div className={style.copiableLink} data-testid='copy-link'>
+          </div>
-                {url}
+          <CopyTag copyValue={url}>Copy link</CopyTag>
-              </div>
-              <CopyTag copyValue={url}>Copy link</CopyTag>
-            </>
-          ) : (
-            <Panel.Description>Your link will appear here once you create it.</Panel.Description>
-          )}
         </Panel.Section>
       </div>
     </form>

apps/client/src/features/sharing/composite/CuesheetLinkOptions.tsx

@@ -1,4 +1,4 @@
-import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import { Fragment, RefObject, useMemo, useState } from 'react';
 
 import RadioGroup from '../../../common/components/radio-group/RadioGroup';
 import Switch from '../../../common/components/switch/Switch';
@@ -10,141 +10,118 @@ import style from './CuesheetLinkOptions.module.scss';
 
 type AccessMode = 'full' | 'custom';
 
-export interface CuesheetPermissionValues {
-  read: string;
-  write: string;
-}
-
 interface CuesheetLinkOptionsProps {
-  /** Existing read permission to seed the form with ('full' | '-' | comma separated keys) */
+  readRef?: RefObject<HTMLInputElement | null>;
-  initialRead?: string;
+  writeRef?: RefObject<HTMLInputElement | null>;
-  /** Existing write permission to seed the form with ('full' | '-' | comma separated keys) */
-  initialWrite?: string;
-  /** Notifies the parent whenever the resolved read/write permissions change */
-  onChange: (permissions: CuesheetPermissionValues) => void;
 }
 
-/** A null result means "full or unset" - there is no explicit per-column selection to seed */
+export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkOptionsProps) {
-function parseKeys(permission: string | undefined): Set<string> | null {
-  if (permission == null || permission === 'full') {
-    return null;
-  }
-  if (permission === '-') {
-    return new Set();
-  }
-  return new Set(permission.split(','));
-}
-
-function modeFromPermission(permission: string | undefined): AccessMode {
-  return permission == null || permission === 'full' ? 'full' : 'custom';
-}
-
-export default function CuesheetLinkOptions({ initialRead, initialWrite, onChange }: CuesheetLinkOptionsProps) {
   const { data } = useCustomFields();
   const customFieldColumns = useMemo(() => makeCuesheetCustomColumns(data), [data]);
-  const allColumns = useMemo(() => [...cuesheetDefaultColumns, ...customFieldColumns], [customFieldColumns]);
 
-  // Parsed seed values - stable for the lifetime of a given preset
+  const [readPermissions, setReadPermissions] = useState<AccessMode>('full');
-  const initialReadKeys = useMemo(() => parseKeys(initialRead), [initialRead]);
+  const [writePermissions, setWritePermissions] = useState<AccessMode>('full');
-  const initialWriteKeys = useMemo(() => parseKeys(initialWrite), [initialWrite]);
 
-  const [readPermissions, setReadPermissions] = useState<AccessMode>(() => modeFromPermission(initialRead));
+  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>(() => {
-  const [writePermissions, setWritePermissions] = useState<AccessMode>(() => modeFromPermission(initialWrite));
+    const initialState: Record<string, boolean> = {};
-
+    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
-  // Default for a column we have not seen yet: honour the seed in custom mode, otherwise grant access
+      initialState[column.value] = true;
-  const defaultRead = useCallback(
-    (key: string) => (initialReadKeys ? initialReadKeys.has(key) : true),
-    [initialReadKeys],
-  );
-  const defaultWrite = useCallback(
-    (key: string) => (initialWriteKeys ? initialWriteKeys.has(key) : true),
-    [initialWriteKeys],
-  );
-
-  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>({});
-  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>({});
-
-  // Custom fields load asynchronously, so reconcile the switch maps whenever the column list grows.
-  // Newly seen columns are seeded from the initial values (or default to on for a fresh link).
-  useEffect(() => {
-    setReadSwitches((prev) => {
-      const next = { ...prev };
-      for (const column of allColumns) {
-        if (!(column.value in next)) next[column.value] = defaultRead(column.value);
-      }
-      return next;
     });
-    setWriteSwitches((prev) => {
+    return initialState;
-      const next = { ...prev };
+  });
-      for (const column of allColumns) {
-        if (!(column.value in next)) next[column.value] = defaultWrite(column.value);
-      }
-      return next;
-    });
-  }, [allColumns, defaultRead, defaultWrite]);
 
-  const isReadOn = (key: string) => readSwitches[key] ?? defaultRead(key);
+  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>(() => {
-  const isWriteOn = (key: string) => writeSwitches[key] ?? defaultWrite(key);
+    const initialState: Record<string, boolean> = {};
+    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
+      initialState[column.value] = true;
+    });
+    return initialState;
+  });
 
   const handleReadModeChange = (value: AccessMode) => {
     setReadPermissions(value);
+
+    setReadSwitches((prevReadSwitches) => {
+      const updatedReadSwitches = { ...prevReadSwitches };
+      Object.keys(updatedReadSwitches).forEach((key) => {
+        updatedReadSwitches[key] = true;
+      });
+      return updatedReadSwitches;
+    });
   };
 
   const handleWriteModeChange = (value: AccessMode) => {
-    setWritePermissions(value);
-    // Full write implies full read
     if (value === 'full') {
       setReadPermissions('full');
     }
+    setWritePermissions(value);
+
+    setReadSwitches((prevReadSwitches) => {
+      const updatedReadSwitches = { ...prevReadSwitches };
+      setWriteSwitches((prevWriteSwitches) => {
+        const updatedWriteSwitches = { ...prevWriteSwitches };
+        [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
+          updatedReadSwitches[column.value] = true;
+          updatedWriteSwitches[column.value] = true;
+        });
+        return updatedWriteSwitches;
+      });
+      return updatedReadSwitches;
+    });
   };
 
-  const handleReadSwitch = (key: string, value: boolean) => {
+  const handleSwitchChange = (key: string, type: 'read' | 'write', value: boolean) => {
-    setReadSwitches((prev) => ({ ...prev, [key]: value }));
+    if (type === 'read') {
-    // A column the recipient cannot read cannot be written either
+      setReadSwitches((prevReadSwitches) => {
-    if (!value) {
+        const updatedReadSwitches = { ...prevReadSwitches, [key]: value };
-      setWriteSwitches((prev) => ({ ...prev, [key]: false }));
+        return updatedReadSwitches;
+      });
+    } else {
+      setWriteSwitches((prevWriteSwitches) => {
+        const updatedWriteSwitches = { ...prevWriteSwitches, [key]: value };
+        return updatedWriteSwitches;
+      });
     }
   };
 
-  const handleWriteSwitch = (key: string, value: boolean) => {
+  const getReadPermissions = () => {
-    setWriteSwitches((prev) => ({ ...prev, [key]: value }));
-    // Granting write access requires read access
-    if (value) {
-      setReadSwitches((prev) => ({ ...prev, [key]: true }));
-    }
-  };
-
-  const resolvedRead = useMemo(() => {
     if (readPermissions === 'full' || writePermissions === 'full') {
       return 'full';
     }
-    const keys = allColumns.filter((column) => isReadOn(column.value)).map((column) => column.value);
-    return keys.length ? keys.join(',') : '-';
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [readPermissions, writePermissions, readSwitches, allColumns]);
 
-  const resolvedWrite = useMemo(() => {
+    return Object.entries(readSwitches)
+      .filter(([_, value]) => value)
+      .map(([key]) => key)
+      .join(',');
+  };
+
+  const getWritePermissions = () => {
     if (writePermissions === 'full') {
       return 'full';
     }
-    const keys = allColumns.filter((column) => isWriteOn(column.value)).map((column) => column.value);
-    return keys.length ? keys.join(',') : '-';
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [writePermissions, writeSwitches, allColumns]);
 
-  // Notify the parent of the resolved permissions. onChange is expected to be stable.
+    return Object.entries(writeSwitches)
-  useEffect(() => {
+      .filter(([_, value]) => value)
-    onChange({ read: resolvedRead, write: resolvedWrite });
+      .map(([key]) => key)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+      .join(',');
-  }, [resolvedRead, resolvedWrite]);
+  };
-
-  const noReadAccess = resolvedRead === '-';
 
   return (
     <Panel.Indent>
+      <input name='read' hidden readOnly ref={readRef} value={getReadPermissions() || '-'} />
+      <input name='write' hidden readOnly ref={writeRef} value={getWritePermissions() || '-'} />
       <div>
-        <Panel.Field title='Access mode' description='Which parts of the data the link gives access to' />
+        <Panel.Field title='Access mode' description='Which parts of the data will the link give access to' />
         <div>
+          <RadioGroup
+            value={writePermissions}
+            onValueChange={handleWriteModeChange}
+            orientation='horizontal'
+            items={[
+              { value: 'full', label: 'Full write (edit all existing and future columns)' },
+              { value: 'custom', label: 'Custom write' },
+            ]}
+          />
           <RadioGroup
             value={readPermissions}
             onValueChange={handleReadModeChange}
@@ -155,18 +132,8 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
               { value: 'custom', label: 'Custom read' },
             ]}
           />
-          <RadioGroup
-            value={writePermissions}
-            onValueChange={handleWriteModeChange}
-            orientation='horizontal'
-            items={[
-              { value: 'full', label: 'Full write (edit all existing and future columns)' },
-              { value: 'custom', label: 'Custom write' },
-            ]}
-          />
         </div>
       </div>
-      {noReadAccess && <Panel.Error>Links must contain at least one readable column.</Panel.Error>}
       <div className={style.twoCols}>
         <div className={style.grid}>
           <Panel.Description>Ontime columns</Panel.Description>
@@ -176,14 +143,14 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
             <Fragment key={column.value}>
               <div>{column.label}</div>
               <Switch
-                checked={isReadOn(column.value)}
+                checked={Boolean(readSwitches[column.value])}
-                onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
+                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
                 disabled={readPermissions === 'full' || writePermissions === 'full'}
                 data-testid={`read-${column.value}`}
               />
               <Switch
-                checked={isWriteOn(column.value)}
+                checked={Boolean(writeSwitches[column.value])}
-                onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
+                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
                 disabled={writePermissions === 'full'}
                 data-testid={`write-${column.value}`}
               />
@@ -197,16 +164,16 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
             <Panel.Description>Write</Panel.Description>
             {customFieldColumns.map((column) => (
               <Fragment key={column.value}>
-                <div>{column.label}</div>
+                {column.label}
                 <Switch
-                  checked={isReadOn(column.value)}
+                  checked={Boolean(readSwitches[column.value])}
-                  onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
+                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
                   disabled={readPermissions === 'full' || writePermissions === 'full'}
                   data-testid={`read-${column.value}`}
                 />
                 <Switch
-                  checked={isWriteOn(column.value)}
+                  checked={Boolean(writeSwitches[column.value])}
-                  onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
+                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
                   disabled={writePermissions === 'full'}
                   data-testid={`write-${column.value}`}
                 />

apps/client/src/index.scss

@@ -81,7 +81,6 @@ html,
   user-select: none;
   -webkit-app-region: drag;
   isolation: isolate;
-  background-color: $ui-black; // prevent the safari from showing white background
 }
 
 // reset button styles

apps/client/src/sentry.config.ts

@@ -82,5 +82,5 @@ export const initializeSentry = () => {
     },
   });
 
-  return Sentry.withSentryReactRouterV7Routing(Routes);
+  return Sentry.withSentryReactRouterV6Routing(Routes);
 };

apps/client/src/translation/languages/de.ts

@@ -28,7 +28,6 @@ export const langDe: TranslationObject = {
   'timeline.done': 'Beendet',
   'timeline.due': 'fällig',
   'timeline.followedby': 'Gefolgt von',
-  'timeline.standby': 'Bereitschaft',
   'project.title': 'Titel',
   'project.description': 'Beschreibung',
   'project.info': 'Projektinfo',

apps/client/src/translation/languages/es.ts

@@ -28,7 +28,6 @@ export const langEs: TranslationObject = {
   'timeline.done': 'Terminado',
   'timeline.due': 'pendiente',
   'timeline.followedby': 'Seguido por',
-  'timeline.standby': 'En espera',
   'project.title': 'Título',
   'project.description': 'Descripción',
   'project.info': 'Información del proyecto',

apps/client/src/translation/languages/fr.ts

@@ -28,7 +28,6 @@ export const langFr: TranslationObject = {
   'timeline.done': 'Terminé',
   'timeline.due': 'dû',
   'timeline.followedby': 'Suivi de',
-  'timeline.standby': 'En attente',
   'project.title': 'Titre',
   'project.description': 'Description',
   'project.info': 'Informations du projet',

apps/client/src/translation/languages/it.ts

@@ -28,7 +28,6 @@ export const langIt: TranslationObject = {
   'timeline.done': 'Terminato',
   'timeline.due': 'previsto',
   'timeline.followedby': 'Seguito da',
-  'timeline.standby': 'In attesa',
   'project.title': 'Titolo',
   'project.description': 'Descrizione',
   'project.info': 'Informazioni sul progetto',

apps/client/src/translation/languages/pt.ts

@@ -28,7 +28,6 @@ export const langPt: TranslationObject = {
   'timeline.done': 'Concluído',
   'timeline.due': 'Pendente',
   'timeline.followedby': 'Seguido por',
-  'timeline.standby': 'Em espera',
   'project.title': 'Título',
   'project.description': 'Descrição',
   'project.info': 'Informações do projeto',

apps/client/src/views/ViewLoader.tsx

@@ -24,18 +24,16 @@ export default function ViewLoader({ children }: PropsWithChildren) {
   const colourFromParams = searchParams.get('keyColour') ?? '#101010';
 
   return (
-    <>
+    <Suspense
-      <style>{`body { background: var(--background-color-override, ${colourFromParams}); }`}</style>
+      fallback={
-      <Suspense
+        <>
-        fallback={
+          <style>{`body { background: var(--background-color-override, ${colourFromParams}); }`}</style>
-          <>
+          <Loader />
-            <Loader />
+        </>
-          </>
+      }
-        }
+    >
-      >
+      <OverrideStyles />
-        <OverrideStyles />
+      {children}
-        {children}
+    </Suspense>
-      </Suspense>
-    </>
   );
 }

apps/client/src/views/countdown/Countdown.scss

@@ -1,5 +1,4 @@
 @use '@/theme/viewerDefs' as *;
-@use 'sass:color';
 
 $item-height: 3.5rem;
 
@@ -119,8 +118,7 @@ $item-height: 3.5rem;
   }
 
   .sub--live {
-    // we need to dim this if the schedule times are ahead of schedule they will be green and diaper in a full green background
+    background-color: $active-green;
-    background-color: color.adjust($active-green, $lightness: -10%);
   }
 
   .sub--armed {
@@ -134,10 +132,6 @@ $item-height: 3.5rem;
 
   .sub__schedule {
     grid-area: schedule;
-  }
-
-  .sub__schedule-inline {
-    grid-area: schedule;
     padding-top: 0.5rem;
 
     display: flex;
@@ -146,6 +140,22 @@ $item-height: 3.5rem;
     color: var(--label-color-override, $viewer-label-color);
   }
 
+  .sub__schedule--delayed {
+    color: $ontime-delay-text;
+  }
+
+  .sub__schedule--strike {
+    text-decoration: line-through;
+  }
+
+  .sub__schedule--over {
+    color: $playback-over;
+  }
+
+  .sub__schedule--under {
+    color: $playback-under;
+  }
+
   .sub__title {
     grid-area: title;
     padding-bottom: 0.5rem;

apps/client/src/views/countdown/CountdownSelect.tsx

@@ -71,7 +71,7 @@ export default function CountdownSelect({ events, subscriptions, disableEdit }:
             className={cx(['sub', isSelected && 'sub--selected'])}
           >
             <div className='sub__binder' style={{ '--user-color': event?.colour ?? '' }} />
-            <div className='sub__schedule-inline'>
+            <div className='sub__schedule'>
               <ClockTime value={event.timeStart} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />
               →
               <ClockTime value={event.timeEnd} preferredFormat12='h:mm a' preferredFormat24='HH:mm' />

apps/client/src/views/countdown/CountdownSubscriptions.tsx

@@ -1,24 +1,33 @@
 import { MaybeNumber, OntimeEvent } from 'ontime-types';
-import { getExpectedStart } from 'ontime-utils';
+import { dayInMs } from 'ontime-utils';
 import { useEffect, useRef, useState } from 'react';
 import { IoPencil } from 'react-icons/io5';
 
 import Button from '../../common/components/buttons/Button';
-import ScheduleTime from '../../common/components/schedule-time/ScheduleTime';
 import useReport from '../../common/hooks-query/useReport';
 import { useFadeOutOnInactivity } from '../../common/hooks/useFadeOutOnInactivity';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useExpectedStartData, usePlayback, useSelectedEventId } from '../../common/hooks/useSocket';
+import { getOffsetState } from '../../common/utils/offset';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
 import { cx } from '../../common/utils/styleUtils';
 import { throttle } from '../../common/utils/throttle';
 import FollowButton from '../../features/operator/follow-button/FollowButton';
+import ClockTime from '../common/clock-time/ClockTime';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
+import {
+  CountdownEvent,
+  extendEventData,
+  getIsLive,
+  isOutsideRange,
+  preferredFormat12,
+  preferredFormat24,
+  useSubscriptionDisplayData,
+} from './countdown.utils';
 
 import './Countdown.scss';
-import { getIsLive, useSubscriptionDisplayData } from './countdown.utils';
 
 interface CountdownSubscriptionsProps {
   subscribedEvents: ExtendedEntry<OntimeEvent>[];
@@ -26,7 +35,6 @@ interface CountdownSubscriptionsProps {
 }
 
 export default function CountdownSubscriptions({ subscribedEvents, goToEditMode }: CountdownSubscriptionsProps) {
-  'use memo';
   const { mainSource, secondarySource, showExpected } = useCountdownOptions();
   const playback = usePlayback();
   const selectedEventId = useSelectedEventId();
@@ -93,17 +101,7 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
         const secondaryData = getPropertyValue(event, secondarySource);
         const isLive = getIsLive(event.id, selectedEventId, playback);
         const isArmed = !isLive && event.id === selectedEventId;
-        const { totalGap, isLinkedToLoaded } = event;
+        const countdownEvent = extendEventData(event, currentDay, actualStart, plannedStart, offset, mode, reportData);
-        const expectedStart = getExpectedStart(event, {
-          currentDay,
-          totalGap,
-          actualStart,
-          plannedStart,
-          isLinkedToLoaded,
-          offset,
-          mode,
-        });
-        const { endedAt } = reportData[event.id] ?? { endedAt: null };
         const displayTitle = getPropertyValue(event, mainSource ?? 'title');
         return (
           <div
@@ -113,13 +111,8 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
             data-testid={event.cue}
           >
             <div className='sub__binder' style={{ '--user-color': event.colour }} />
-            <ScheduleTime
+            <ScheduleTime event={countdownEvent} showExpected={showExpected} />
-              event={event}
+            <SubscriptionStatus event={countdownEvent} />
-              expectedStart={expectedStart}
-              showExpected={showExpected}
-              className='sub__schedule'
-            />
-            <SubscriptionStatus event={event} expectedStart={expectedStart} endedAt={endedAt} />
             <div className={cx(['sub__title', !displayTitle && 'subdued'])}>{displayTitle}</div>
             {secondaryData && <div className='sub__secondary'>{secondaryData}</div>}
           </div>
@@ -135,15 +128,73 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
   );
 }
 
-interface SubscriptionStatusProps {
+type ScheduleTimeProps = {
-  event: ExtendedEntry<OntimeEvent>;
+  event: CountdownEvent;
-  endedAt: MaybeNumber;
+  showExpected: boolean;
-  expectedStart: number;
+};
+//TODO: consider relative mode
+export function ScheduleTime(props: ScheduleTimeProps) {
+  const { event, showExpected } = props;
+  const { timeStart, duration, delay, expectedStart, countToEnd } = event;
+
+  const plannedStart = timeStart + delay + event.dayOffset * dayInMs;
+
+  // only show new exacted value if outside  range of the planned value
+  const isExpectedValueShow = showExpected && isOutsideRange(plannedStart, expectedStart);
+
+  const plannedStateClass = isExpectedValueShow ? 'sub__schedule--strike' : delay !== 0 ? 'sub__schedule--delayed' : '';
+
+  const expectedStateClass = `sub__schedule--${getOffsetState(expectedStart - plannedStart)}`;
+  const plannedEnd = plannedStart + duration + delay;
+  const expectedEnd = countToEnd ? Math.max(expectedStart + duration, plannedEnd) : expectedStart + duration;
+  const expectedEndClass = `sub__schedule--${getOffsetState(expectedEnd - plannedEnd)}`;
+
+  return (
+    <div className='sub__schedule'>
+      <ClockTime
+        value={plannedStart}
+        preferredFormat12={preferredFormat12}
+        preferredFormat24={preferredFormat24}
+        className={plannedStateClass}
+      />
+      {!isExpectedValueShow && (
+        <>
+          →
+          <ClockTime
+            value={plannedEnd}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+            className={plannedStateClass}
+          />
+        </>
+      )}
+      {isExpectedValueShow && (
+        <>
+          <ClockTime
+            value={expectedStart}
+            className={expectedStateClass}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+          />
+          →
+          <ClockTime
+            value={expectedEnd}
+            className={expectedEndClass}
+            preferredFormat12={preferredFormat12}
+            preferredFormat24={preferredFormat24}
+          />
+        </>
+      )}
+    </div>
+  );
 }
 
-function SubscriptionStatus({ event, endedAt, expectedStart }: SubscriptionStatusProps) {
+interface SubscriptionStatusProps {
-  'use memo';
+  event: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number };
-  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event, endedAt, expectedStart);
+}
+
+function SubscriptionStatus({ event }: SubscriptionStatusProps) {
+  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event);
 
   return (
     <>

apps/client/src/views/countdown/SingleEventCountdown.scss

@@ -7,6 +7,27 @@
   gap: 5rem;
 }
 
+.event__title {
+  background-color: var(--card-background-color-override, $viewer-card-bg-color);
+  padding: $view-card-padding;
+  border-radius: $element-border-radius;
+  font-size: clamp(40px, 4.5vw, 80px);
+  line-height: 1.1;
+  text-align: center;
+  border-left: 0.25em solid;
+  border-color: var(--card-background-color-override, $viewer-card-bg-color);
+
+  .secondary {
+    text-align: left;
+    font-size: $title-font-size;
+  }
+
+  .sub__schedule {
+    color: inherit;
+    font-size: $base-font-size;
+  }
+}
+
 .event__status {
   color: var(--secondary-color-override, $viewer-secondary-color);
   font-size: $header-font-size;

apps/client/src/views/countdown/SingleEventCountdown.tsx

@@ -3,7 +3,6 @@ import { getExpectedStart } from 'ontime-utils';
 import { IoPencil } from 'react-icons/io5';
 
 import Button from '../../common/components/buttons/Button';
-import TitleCard from '../../common/components/title-card/TitleCard';
 import useReport from '../../common/hooks-query/useReport';
 import { useFadeOutOnInactivity } from '../../common/hooks/useFadeOutOnInactivity';
 import { useExpectedStartData } from '../../common/hooks/useSocket';
@@ -12,9 +11,10 @@ import { cx } from '../../common/utils/styleUtils';
 import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
 import { getPropertyValue } from '../common/viewUtils';
 import { useCountdownOptions } from './countdown.options';
+import { useSubscriptionDisplayData } from './countdown.utils';
+import { ScheduleTime } from './CountdownSubscriptions';
 
 import './SingleEventCountdown.scss';
-import { useSubscriptionDisplayData } from './countdown.utils';
 
 interface SingleEventCountdownProps {
   subscribedEvent: ExtendedEntry<OntimeEvent>;
@@ -39,22 +39,19 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
   });
 
   const { endedAt } = reportData[subscribedEvent.id] ?? { endedAt: null };
-  const title = getPropertyValue(subscribedEvent, mainSource ?? 'title');
+  const countdownEvent = { ...subscribedEvent, expectedStart, endedAt };
+  const titleTmp = getPropertyValue(subscribedEvent, mainSource ?? 'title');
+  const title = titleTmp?.length ? titleTmp : ' '; // insert utf-8 empty space to avoid the line collapsing;
   const secondaryData = getPropertyValue(subscribedEvent, secondarySource);
 
   return (
     <div className='single-container' data-testid='countdown-event'>
-      <SubscriptionStatus event={subscribedEvent} expectedStart={expectedStart} endedAt={endedAt} />
+      <SubscriptionStatus event={countdownEvent} />
-      <TitleCard
+      <div className='event__title' style={{ borderColor: countdownEvent.colour }}>
-        title={title}
+        <ScheduleTime event={countdownEvent} showExpected={showExpected} />
-        secondary={secondaryData}
+        {title}
-        colour={subscribedEvent.colour}
+        {secondaryData && <div className='secondary'>{secondaryData}</div>}
-        textAlign='center'
+      </div>
-        size='lg'
-        event={subscribedEvent}
-        showExpected={showExpected}
-        expectedStart={expectedStart}
-      />
       <div className={cx(['fab-container', !showFab && 'fab-container--hidden'])}>
         <Button variant='primary' size='xlarge' onClick={goToEditMode}>
           <IoPencil /> Edit
@@ -65,13 +62,11 @@ export default function SingleEventCountdown({ subscribedEvent, goToEditMode }:
 }
 
 interface SubscriptionStatusProps {
-  event: ExtendedEntry<OntimeEvent>;
+  event: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number };
-  endedAt: MaybeNumber;
-  expectedStart: number;
 }
 
-function SubscriptionStatus({ event, endedAt, expectedStart }: SubscriptionStatusProps) {
+function SubscriptionStatus({ event }: SubscriptionStatusProps) {
-  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event, endedAt, expectedStart);
+  const { status, statusDisplay, timeDisplay } = useSubscriptionDisplayData(event);
 
   return (
     <>

apps/client/src/views/countdown/countdown.utils.ts

@@ -1,5 +1,5 @@
-import { EntryId, MaybeNumber, OntimeEntry, OntimeEvent, Playback } from 'ontime-types';
+import { EntryId, MaybeNumber, OffsetMode, OntimeEntry, OntimeEvent, OntimeReport, Playback } from 'ontime-types';
-import { MILLIS_PER_MINUTE, millisToString, removeLeadingZero } from 'ontime-utils';
+import { MILLIS_PER_MINUTE, getExpectedStart, millisToString, removeLeadingZero } from 'ontime-utils';
 
 import { useCountdownSocket } from '../../common/hooks/useSocket';
 import { ExtendedEntry } from '../../common/utils/rundownMetadata';
@@ -13,6 +13,9 @@ export function sanitiseTitle(title: string | null) {
   return title ?? '{no title}';
 }
 
+export const preferredFormat12 = 'h:mm a';
+export const preferredFormat24 = 'HH:mm';
+
 /**
  * Whether the current event is live
  */
@@ -37,9 +40,7 @@ export const timerProgress: TimerMessage = {
  * Handles events in different days but disregards whether an event has actually played
  */
 export function useSubscriptionDisplayData(
-  subscribedEvent: ExtendedEntry<OntimeEvent>,
+  subscribedEvent: ExtendedEntry<OntimeEvent> & { endedAt: MaybeNumber; expectedStart: number },
-  endedAt: MaybeNumber,
-  expectedStart: number,
 ): { status: ProgressStatus; statusDisplay: string; timeDisplay: string } {
   const { playback, current, clock } = useCountdownSocket();
   const { getLocalizedString } = useTranslation();
@@ -83,11 +84,11 @@ export function useSubscriptionDisplayData(
     return {
       status: 'done',
       statusDisplay: getLocalizedString(timerProgress['done']),
-      timeDisplay: formatTime(endedAt, { format12: 'h:mm a', format24: 'HH:mm' }),
+      timeDisplay: formatTime(subscribedEvent.endedAt, { format12: preferredFormat12, format24: preferredFormat24 }),
     };
   }
 
-  if (expectedStart - clock <= 0) {
+  if (subscribedEvent.expectedStart - clock <= 0) {
     return {
       status: 'due',
       statusDisplay: getLocalizedString(timerProgress['future']), // We use future here on purpose for the look of it
@@ -98,7 +99,7 @@ export function useSubscriptionDisplayData(
   return {
     status: 'future',
     statusDisplay: getLocalizedString(timerProgress['future']),
-    timeDisplay: bigDuration(expectedStart - clock),
+    timeDisplay: bigDuration(subscribedEvent.expectedStart - clock),
   };
 }
 
@@ -162,3 +163,32 @@ export function isLinkedToLoadedEvent(events: OntimeEvent[], loadedId: EntryId |
 
   return true;
 }
+
+export function isOutsideRange(a: number, b: number): boolean {
+  return Math.abs(a - b) > MILLIS_PER_MINUTE;
+}
+
+export type CountdownEvent = ExtendedEntry<OntimeEvent> & { expectedStart: number; endedAt: MaybeNumber };
+
+export function extendEventData(
+  event: ExtendedEntry<OntimeEvent>,
+  currentDay: number,
+  actualStart: MaybeNumber,
+  plannedStart: MaybeNumber,
+  offset: number,
+  mode: OffsetMode,
+  reportData: OntimeReport,
+): CountdownEvent {
+  const { totalGap, isLinkedToLoaded } = event;
+  const expectedStart = getExpectedStart(event, {
+    currentDay,
+    totalGap,
+    actualStart,
+    plannedStart,
+    isLinkedToLoaded,
+    offset,
+    mode,
+  });
+  const { endedAt } = reportData[event.id] ?? { endedAt: null };
+  return { ...event, expectedStart, endedAt };
+}

apps/client/src/views/cuesheet/CuesheetPage.module.scss

@@ -14,7 +14,3 @@
     'table';
   color: $ui-white;
 }
-
-.rundownSelect {
-  min-width: min(20rem, calc(100vw - 6rem));
-}

apps/client/src/views/cuesheet/CuesheetPage.tsx

@@ -4,34 +4,28 @@ import { IoApps } from 'react-icons/io5';
 import IconButton from '../../common/components/buttons/IconButton';
 import NavigationMenu from '../../common/components/navigation-menu/NavigationMenu';
 import { EntryActionsProvider } from '../../common/context/EntryActionsContext';
-import { useScopedRundown } from '../../common/hooks-query/useScopedRundown';
+import { useEntryActions } from '../../common/hooks/useEntryAction';
-import { useScopedEntryActions } from '../../common/hooks/useEntryAction';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import { getIsNavigationLocked } from '../../externals';
 import CuesheetOverview from '../../features/overview/CuesheetOverview';
 import EntryEditModal from './cuesheet-edit-modal/EntryEditModal';
 import CuesheetProgress from './cuesheet-progress/CuesheetProgress';
 import CuesheetTableWrapper from './CuesheetTableWrapper';
-import { FOLLOW_LOADED_RUNDOWN_ID, useCuesheetRundownSelection } from './useCuesheetRundownSelection';
 
 import styles from './CuesheetPage.module.scss';
 
 export default function CuesheetPage() {
-  'use memo';
   const [isMenuOpen, menuHandler] = useDisclosure();
-  const { selectedRundownId, loadedRundownId, setSelectedRundownId, projectRundowns } = useCuesheetRundownSelection();
+  const entryActions = useEntryActions();
-  const source = useScopedRundown(selectedRundownId === FOLLOW_LOADED_RUNDOWN_ID ? loadedRundownId : selectedRundownId);
-
-  const actions = useScopedEntryActions(source.rundownId);
 
   useWindowTitle('Cuesheet');
 
   const isLocked = getIsNavigationLocked();
 
   return (
-    <EntryActionsProvider actions={actions}>
+    <EntryActionsProvider actions={entryActions}>
       <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />
-      <EntryEditModal rundown={source.rundown} />
+      <EntryEditModal />
       <div className={styles.tableWrapper} data-testid='cuesheet'>
         <CuesheetOverview>
           {!isLocked && (
@@ -41,13 +35,7 @@ export default function CuesheetPage() {
           )}
         </CuesheetOverview>
         <CuesheetProgress />
-        <CuesheetTableWrapper
+        <CuesheetTableWrapper />
-          source={source}
-          selectedRundownId={selectedRundownId}
-          loadedRundownId={loadedRundownId}
-          setSelectedRundownId={setSelectedRundownId}
-          projectRundowns={projectRundowns}
-        />
       </div>
     </EntryActionsProvider>
   );

apps/client/src/views/cuesheet/CuesheetTableWrapper.tsx

@@ -1,40 +1,18 @@
-import { MaybeString, ProjectRundown } from 'ontime-types';
 import { memo, use, useMemo } from 'react';
 
-import Select from '../../common/components/select/Select';
 import EmptyPage from '../../common/components/state/EmptyPage';
 import { PresetContext } from '../../common/context/PresetContext';
 import useCustomFields from '../../common/hooks-query/useCustomFields';
-import type { RundownSource } from '../../common/hooks-query/useScopedRundown';
-import { AppMode } from '../../ontimeConfig';
 import CuesheetDnd from './cuesheet-dnd/CuesheetDnd';
 import { makeCuesheetColumns } from './cuesheet-table/cuesheet-table-elements/cuesheetColsFactory';
 import CuesheetTable from './cuesheet-table/CuesheetTable';
 import { useApplyCuesheetPolicy } from './useApplyCuesheetPolicy';
-import { FOLLOW_LOADED_RUNDOWN_ID } from './useCuesheetRundownSelection';
-
-import styles from './CuesheetPage.module.scss';
-
-interface CuesheetTableWrapperProps {
-  source: RundownSource;
-  selectedRundownId: MaybeString;
-  loadedRundownId: string;
-  setSelectedRundownId: (rundownId: string) => void;
-  projectRundowns: ProjectRundown[];
-}
 
 export default memo(CuesheetTableWrapper);
-function CuesheetTableWrapper({
+function CuesheetTableWrapper() {
-  source,
-  selectedRundownId,
-  setSelectedRundownId,
-  loadedRundownId,
-  projectRundowns,
-}: CuesheetTableWrapperProps) {
-  const preset = use(PresetContext);
-  const isCurrentRundown = source.rundownId !== null && source.rundownId === loadedRundownId;
-  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset, { canRunMode: isCurrentRundown });
   const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const preset = use(PresetContext);
+  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset);
 
   const columns = useMemo(
     () => makeCuesheetColumns(customFields, cuesheetMode, preset),
@@ -50,66 +28,11 @@ function CuesheetTableWrapper({
       ) : (
         <CuesheetTable
           columns={columns}
-          source={source}
           cuesheetMode={cuesheetMode}
           tableRoot='cuesheet'
           setCuesheetMode={setCuesheetMode}
-          isCurrentRundown={isCurrentRundown}
-          insertElement={
-            <>
-              <RundownSelect
-                cuesheetMode={cuesheetMode}
-                selectedRundownId={selectedRundownId}
-                loadedRundownId={loadedRundownId}
-                setSelectedRundownId={setSelectedRundownId}
-                projectRundowns={projectRundowns}
-              />
-            </>
-          }
         />
       )}
     </CuesheetDnd>
   );
 }
-
-interface RundownSelectProps {
-  cuesheetMode: AppMode;
-  selectedRundownId: MaybeString;
-  loadedRundownId: string;
-  setSelectedRundownId: (rundownId: string) => void;
-  projectRundowns: ProjectRundown[];
-}
-
-function RundownSelect({
-  cuesheetMode,
-  projectRundowns,
-  loadedRundownId,
-  selectedRundownId,
-  setSelectedRundownId,
-}: RundownSelectProps) {
-  'use memo';
-  const options = projectRundowns.map(({ id, title }) => ({
-    value: id,
-    label: loadedRundownId === id ? `${title} (loaded)` : title,
-  }));
-  options.unshift({
-    value: FOLLOW_LOADED_RUNDOWN_ID,
-    label: 'Follow loaded', // TODO: Better wording and maybe icon? and translation
-  });
-
-  return (
-    <div className={styles.rundownSelect}>
-      <Select
-        value={selectedRundownId ?? undefined}
-        options={options}
-        onValueChange={(value) => {
-          if (value) {
-            setSelectedRundownId(value);
-          }
-        }}
-        disabled={cuesheetMode === AppMode.Run}
-        fluid
-      />
-    </div>
-  );
-}

apps/client/src/views/cuesheet/__tests__/cuesheet.policies.test.ts

@@ -20,7 +20,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
       alias: 'cuesheet-read-only',
       target: OntimeView.Cuesheet,
       search: '',
-      displayInNav: false,
       options: {
         read: 'full',
         write: '-',
@@ -42,7 +41,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
       alias: 'cuesheet-flag',
       target: OntimeView.Cuesheet,
       search: '',
-      displayInNav: false,
       options: {
         read: 'full',
         write: 'flag',
@@ -64,7 +62,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
       alias: 'cuesheet-default',
       target: OntimeView.Cuesheet,
       search: '',
-      displayInNav: false,
     };
 
     const policy = getCuesheetColumnAccessPolicy(preset, AppMode.Edit);
@@ -79,7 +76,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
       alias: 'cuesheet-granular',
       target: OntimeView.Cuesheet,
       search: '',
-      displayInNav: false,
       options: {
         read: 'cue,title',
         write: 'title',

apps/client/src/views/cuesheet/__tests__/useApplyCuesheetPolicy.test.ts

@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { AppMode } from '../../../ontimeConfig';
-import { getEffectiveCuesheetMode } from '../useApplyCuesheetPolicy';
-
-describe('getEffectiveCuesheetMode()', () => {
-  it('honors the stored mode when the user can change mode on the current rundown', () => {
-    const permissions = { canChangeMode: true };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Edit, { canRunMode: true })).toBe(AppMode.Edit);
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Run, { canRunMode: true })).toBe(AppMode.Run);
-  });
-
-  it('forces Run mode when the preset forbids mode changes', () => {
-    const permissions = { canChangeMode: false };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Edit, { canRunMode: true })).toBe(AppMode.Run);
-  });
-
-  it('forces Edit mode for background rundowns without changing the permission policy', () => {
-    const permissions = { canChangeMode: true };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Run, { canRunMode: false })).toBe(AppMode.Edit);
-  });
-});

apps/client/src/views/cuesheet/__tests__/useCuesheetRundownSelection.test.ts

@@ -1,21 +0,0 @@
-import {
-  FOLLOW_LOADED_RUNDOWN_ID,
-  getCuesheetRundownStorageKey,
-  resolveSelectedRundownId,
-} from '../useCuesheetRundownSelection';
-
-describe('useCuesheetRundownSelection helpers', () => {
-  it('builds a project-scoped storage key', () => {
-    expect(getCuesheetRundownStorageKey('http://localhost:4001', 'My Project')).toBe(
-      'cuesheet-selected-rundown:http://localhost:4001:My Project',
-    );
-  });
-
-  it('falls back to the follow loaded rundown when the stored selection is missing', () => {
-    expect(resolveSelectedRundownId('missing', new Set(['loaded', 'other']))).toBe(FOLLOW_LOADED_RUNDOWN_ID);
-  });
-
-  it('keeps the stored selection when it still exists in the current project', () => {
-    expect(resolveSelectedRundownId('other', new Set(['loaded', 'other']))).toBe('other');
-  });
-});

apps/client/src/views/cuesheet/cuesheet-edit-modal/EntryEditModal.tsx

@@ -1,16 +1,11 @@
-import { Rundown } from 'ontime-types';
 import { memo } from 'react';
 
 import Modal from '../../../common/components/modal/Modal';
 import CuesheetEntryEditor from '../../../features/rundown/entry-editor/CuesheetEventEditor';
 import { useEditModal } from './useEditModal';
 
-interface EntryEditModalProps {
-  rundown: Rundown;
-}
-
 export default memo(EntryEditModal);
-function EntryEditModal({ rundown }: EntryEditModalProps) {
+function EntryEditModal() {
   const entryId = useEditModal((state) => state.selectedEntryId);
   const closeModal = useEditModal((state) => state.clearSelection);
 
@@ -24,7 +19,7 @@ function EntryEditModal({ rundown }: EntryEditModalProps) {
       onClose={closeModal}
       title='Edit entry'
       showCloseButton
-      bodyElements={<CuesheetEntryEditor entryId={entryId} rundown={rundown} />}
+      bodyElements={<CuesheetEntryEditor entryId={entryId} />}
     />
   );
 }

apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx

@@ -1,7 +1,7 @@
 import { useTableNav } from '@table-nav/react';
 import { ColumnDef, Table, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import { OntimeEntry, SupportedEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { OntimeEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
-import { ComponentProps, ReactNode, memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { ComponentProps, memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import {
   ContextProp,
   ItemProps,
@@ -14,20 +14,21 @@ import {
 import EmptyPage from '../../../common/components/state/EmptyPage';
 import EmptyTableBody from '../../../common/components/state/EmptyTableBody';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
-import type { RundownSource } from '../../../common/hooks-query/useScopedRundown';
+import { useFlatRundownWithMetadata } from '../../../common/hooks-query/useRundown';
+import { useSelectedEventId } from '../../../common/hooks/useSocket';
 import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
+import EditorTableSettings from '../../../features/rundown/rundown-table/EditorTableSettings';
 import { usePersistedRundownOptions } from '../../../features/rundown/rundown.options';
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
 import { AppMode } from '../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../cuesheet.options';
-import { useCuesheetPermissions } from '../useTablePermissions';
 import { CuesheetHeader, SortableCuesheetHeader } from './cuesheet-table-elements/CuesheetHeader';
 import DelayRow from './cuesheet-table-elements/DelayRow';
 import EventRow from './cuesheet-table-elements/EventRow';
 import GroupRow from './cuesheet-table-elements/GroupRow';
 import MilestoneRow from './cuesheet-table-elements/MilestoneRow';
 import TableMenu from './cuesheet-table-menu/TableMenu';
-import CuesheetTableHeaderToolbar from './cuesheet-table-settings/CuesheetTableHeaderToolbar';
+import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
 import { useColumnOrder, useColumnSizes, useColumnVisibility } from './useColumnManager';
 
 import style from './CuesheetTable.module.scss';
@@ -35,41 +36,30 @@ import style from './CuesheetTable.module.scss';
 type CuesheetTableBaseProps = {
   columns: ColumnDef<ExtendedEntry>[];
   cuesheetMode: AppMode;
-  source: RundownSource;
-  insertElement?: ReactNode;
 };
 
 type EditorCuesheetTableProps = CuesheetTableBaseProps & {
   tableRoot: 'editor';
   setCuesheetMode?: undefined;
-  isCurrentRundown?: undefined;
 };
 
 type ViewCuesheetTableProps = CuesheetTableBaseProps & {
   tableRoot: 'cuesheet';
   setCuesheetMode: (mode: AppMode) => void;
-  isCurrentRundown?: boolean;
 };
 
 type CuesheetTableProps = EditorCuesheetTableProps | ViewCuesheetTableProps;
 
-export default function CuesheetTable({
+export default function CuesheetTable({ columns, cuesheetMode, tableRoot, setCuesheetMode }: CuesheetTableProps) {
-  columns,
+  const { data, status } = useFlatRundownWithMetadata();
-  cuesheetMode,
+  const { updateEntry, updateTimer } = useEntryActionsContext();
-  source,
-  tableRoot,
-  setCuesheetMode,
-  isCurrentRundown,
-  insertElement,
-}: CuesheetTableProps) {
-  const { flatRundown, status, selectedEventId } = source;
-  const { updateEntry, updateTimer, addEntry } = useEntryActionsContext();
-  const canCreateEntries = useCuesheetPermissions((state) => state.canCreateEntries) && cuesheetMode === AppMode.Edit;
 
   const useOptions = tableRoot === 'editor' ? usePersistedRundownOptions : usePersistedCuesheetOptions;
-  const optionsStore = useOptions();
+  const showDelayedTimes = useOptions((state) => state.showDelayedTimes);
-  const { showDelayedTimes, hideTableSeconds, hideIndexColumn } = optionsStore;
+  const hideTableSeconds = useOptions((state) => state.hideTableSeconds);
+  const hideIndexColumn = useOptions((state) => state.hideIndexColumn);
 
+  const selectedEventId = useSelectedEventId();
   const cursor = useEventSelection((state) => state.cursor);
   const setScrollHandler = useEventSelection((state) => state.setScrollHandler);
 
@@ -80,7 +70,7 @@ export default function CuesheetTable({
     () => ({
       handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom = false) => {
         // check if value is the same
-        const event = flatRundown[rowIndex];
+        const event = data[rowIndex];
 
         if (!event) {
           return;
@@ -111,7 +101,7 @@ export default function CuesheetTable({
         hideIndexColumn,
       },
     }),
-    [cuesheetMode, flatRundown, hideIndexColumn, hideTableSeconds, showDelayedTimes, updateEntry, updateTimer],
+    [cuesheetMode, data, hideIndexColumn, hideTableSeconds, showDelayedTimes, updateEntry, updateTimer],
   );
 
   const { columnOrder, resetColumnOrder } = useColumnOrder(columns, tableRoot);
@@ -119,7 +109,7 @@ export default function CuesheetTable({
   const { columnVisibility, setColumnVisibility } = useColumnVisibility(tableRoot);
 
   const table = useReactTable({
-    data: flatRundown,
+    data,
     columns,
     columnResizeMode: 'onChange',
     state: {
@@ -147,13 +137,13 @@ export default function CuesheetTable({
       return;
     }
 
-    const eventIndex = flatRundown.findIndex((event) => event.id === selectedEventId);
+    const eventIndex = data.findIndex((event) => event.id === selectedEventId);
     if (eventIndex === -1) {
       return;
     }
 
     virtuosoRef.current.scrollToIndex({ index: eventIndex, behavior: 'auto', align: 'start', offset: -50 });
-  }, [cuesheetMode, flatRundown, selectedEventId]);
+  }, [cuesheetMode, data, selectedEventId]);
 
   // Provide an imperative scroll handler for explicit jumps (finder/keyboard)
   useEffect(() => {
@@ -162,7 +152,7 @@ export default function CuesheetTable({
         return;
       }
 
-      const eventIndex = flatRundown.findIndex((event) => event.id === entryId);
+      const eventIndex = data.findIndex((event) => event.id === entryId);
       if (eventIndex === -1) {
         return;
       }
@@ -175,7 +165,7 @@ export default function CuesheetTable({
     return () => {
       setScrollHandler(null);
     };
-  }, [flatRundown, setScrollHandler]);
+  }, [data, setScrollHandler]);
 
   /**
    * To improve performance on resizing, we memoise the column sizes
@@ -204,9 +194,8 @@ export default function CuesheetTable({
       listeners,
       rows,
       table,
-      handleAddNew: canCreateEntries ? (type: SupportedEntry) => addEntry({ type }) : undefined,
     }),
-    [columnSizeVars, cursor, listeners, rows, table, addEntry, canCreateEntries],
+    [columnSizeVars, cursor, listeners, rows, table],
   );
 
   const computeItemKey = useCallback((_: number, item: ExtendedEntry) => item.id, []);
@@ -228,7 +217,7 @@ export default function CuesheetTable({
     });
   }, [cuesheetMode, hideIndexColumn, table]);
 
-  const isLoading = !flatRundown || status === 'pending';
+  const isLoading = !data || status === 'pending';
 
   if (isLoading) {
     return <EmptyPage text='Loading...' />;
@@ -236,27 +225,26 @@ export default function CuesheetTable({
 
   return (
     <>
-      <CuesheetTableHeaderToolbar
+      {tableRoot === 'editor' ? (
-        columns={allLeafColumns}
+        <EditorTableSettings
-        optionsStore={optionsStore}
+          columns={allLeafColumns}
-        handleResetResizing={resetColumnResizing}
+          handleResetResizing={resetColumnResizing}
-        handleResetReordering={resetColumnOrder}
+          handleResetReordering={resetColumnOrder}
-        handleClearToggles={setAllVisible}
+          handleClearToggles={setAllVisible}
-        insertElement={insertElement}
+        />
-        modeControls={
+      ) : (
-          tableRoot === 'cuesheet'
+        <CuesheetTableSettings
-            ? {
+          columns={allLeafColumns}
-                cuesheetMode,
+          cuesheetMode={cuesheetMode}
-                setCuesheetMode,
+          setCuesheetMode={setCuesheetMode}
-                isCurrentRundown,
+          handleResetResizing={resetColumnResizing}
-              }
+          handleResetReordering={resetColumnOrder}
-            : undefined
+          handleClearToggles={setAllVisible}
-        }
+        />
-        showShare={tableRoot === 'cuesheet'}
+      )}
-      />
       <TableVirtuoso
         ref={virtuosoRef}
-        data={flatRundown}
+        data={data}
         context={virtuosoContext}
         style={tableRoot === 'editor' ? { paddingLeft: '1rem' } : undefined}
         computeItemKey={computeItemKey}
@@ -276,13 +264,10 @@ interface CuesheetVirtuosoContext {
   listeners: ReturnType<typeof useTableNav>['listeners'];
   rows: ReturnType<Table<ExtendedEntry>['getRowModel']>['rows'];
   table: Table<ExtendedEntry>;
-  handleAddNew?: (type: SupportedEntry) => void;
 }
 
-const EmptyPlaceholder = memo(function EmptyPlaceholder({
+const EmptyPlaceholder = memo(function EmptyPlaceholder() {
-  context,
+  return <EmptyTableBody text='No data in rundown' />;
-}: TableProps & ContextProp<CuesheetVirtuosoContext>) {
-  return <EmptyTableBody handleAddNew={context.handleAddNew} />;
 });
 
 const CuesheetTableElement = memo(function CuesheetTableElement({

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/DurationInput.tsx

@@ -49,10 +49,6 @@ function DurationInput({
     setIsEditing(false);
     setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
   };
-  const handleTabOut = useCallback(() => {
-    setIsEditing(false);
-    // Tab moves focus naturally; do not steal it back to parent
-  }, []);
 
   const handleUpdate = useCallback(
     (newValue: string) => {
@@ -99,10 +95,8 @@ function DurationInput({
       ref={inputRef}
       initialValue={timeString}
       allowSubmitSameValue={!lockedValue} // if the value is not locked, submitting will lock the value
-      submitOnTab={false}
       handleUpdate={handleUpdate}
       handleCancelUpdate={handleFakeBlur}
-      handleTabCancel={handleTabOut}
     />
   ) : (
     <TextLikeInput

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EditableImage.tsx

@@ -30,16 +30,15 @@ function EditableImage({ initialValue, readOnly, updateValue }: EditableImagePro
     }
   };
 
-  if (!initialValue && readOnly) {
-    return null;
-  }
-
   if (!initialValue) {
     return (
       <Input
         variant='ghosted'
         className={style.imageInput}
         fluid
+        readOnly={readOnly}
+        // we disable the field to prevent receiving focus
+        disabled={readOnly}
         placeholder='Paste image URL'
         onBlur={(event) => handleUpdate(event.currentTarget.value)}
         onKeyDown={(event) => {

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EventRow.tsx

@@ -1,7 +1,7 @@
 import { Table, flexRender } from '@tanstack/react-table';
 import { EntryId, OntimeEntry, RGBColour, SupportedEntry } from 'ontime-types';
 import { colourToHex, cssOrHexToColour } from 'ontime-utils';
-import { CSSProperties, memo, useMemo } from 'react';
+import { CSSProperties, useMemo } from 'react';
 import { IoEllipsisHorizontal } from 'react-icons/io5';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
@@ -30,8 +30,7 @@ interface EventRowProps {
   hasCursor?: boolean;
 }
 
-export default memo(EventRow);
+export default function EventRow({
-function EventRow({
   rowId,
   id,
   eventIndex,
@@ -56,25 +55,24 @@ function EventRow({
 
   const openMenu = useCuesheetTableMenu((store) => store.openMenu);
 
-  const { rowBgColour, backgroundColor, mutedText } = useMemo(() => {
+  const { color, backgroundColor } = getAccessibleColour(colour);
-    const accessible = getAccessibleColour(colour);
+  const tmpColour = cssOrHexToColour(color) as RGBColour; // we know this to be a correct colour
-    const tmpColour = cssOrHexToColour(accessible.color) as RGBColour;
+  const mutedText = colourToHex({ ...tmpColour, alpha: tmpColour.alpha * 0.8 });
 
-    let rowBgColour: string | undefined;
+  const rowBgColour: string | undefined = useMemo(() => {
     if (isLoaded) {
-      rowBgColour = '#087A27'; // $active-green
+      return '#087A27'; // $active-green
     } else if (colour) {
-      const accessibleBg = cssOrHexToColour(accessible.backgroundColor);
+      // the colour is user defined and might be invalid
-      if (accessibleBg !== null) {
+      const accessibleBackgroundColor = cssOrHexToColour(getAccessibleColour(colour).backgroundColor);
-        rowBgColour = colourToHex({ ...accessibleBg, alpha: accessibleBg.alpha * 0.25 });
+      if (accessibleBackgroundColor !== null) {
+        return colourToHex({
+          ...accessibleBackgroundColor,
+          alpha: accessibleBackgroundColor.alpha * 0.25,
+        });
       }
     }
-
+    return;
-    return {
-      rowBgColour,
-      backgroundColor: accessible.backgroundColor,
-      mutedText: colourToHex({ ...tmpColour, alpha: tmpColour.alpha * 0.8 }),
-    };
   }, [colour, isLoaded]);
 
   return (

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/GroupRow.tsx

@@ -1,6 +1,6 @@
 import { Table, flexRender } from '@tanstack/react-table';
 import { EntryId, SupportedEntry } from 'ontime-types';
-import { CSSProperties, memo } from 'react';
+import { CSSProperties } from 'react';
 import { IoEllipsisHorizontal } from 'react-icons/io5';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
@@ -20,8 +20,7 @@ interface GroupRowProps {
   hasCursor?: boolean;
 }
 
-export default memo(GroupRow);
+export default function GroupRow({
-function GroupRow({
   groupId,
   colour,
   rowId,

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/MilestoneRow.tsx

@@ -1,7 +1,7 @@
 import { Table, flexRender } from '@tanstack/react-table';
 import { EntryId, SupportedEntry } from 'ontime-types';
 import { colourToHex, cssOrHexToColour } from 'ontime-utils';
-import { CSSProperties, memo, useMemo } from 'react';
+import { CSSProperties } from 'react';
 import { IoEllipsisHorizontal } from 'react-icons/io5';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
@@ -25,8 +25,7 @@ interface MilestoneRowProps {
   hasCursor?: boolean;
 }
 
-export default memo(MilestoneRow);
+export default function MilestoneRow({
-function MilestoneRow({
   entryId,
   isPast,
   parentBgColour,
@@ -46,12 +45,17 @@ function MilestoneRow({
 
   const openMenu = useCuesheetTableMenu((store) => store.openMenu);
 
-  const rowBgColour = useMemo(() => {
+  let rowBgColour: string | undefined;
-    if (!colour) return undefined;
+  if (colour) {
-    const accessibleBg = cssOrHexToColour(getAccessibleColour(colour).backgroundColor);
+    // the colour is user defined and might be invalid
-    if (accessibleBg === null) return undefined;
+    const accessibleBackgroundColor = cssOrHexToColour(getAccessibleColour(colour).backgroundColor);
-    return colourToHex({ ...accessibleBg, alpha: accessibleBg.alpha * 0.25 });
+    if (accessibleBackgroundColor !== null) {
-  }, [colour]);
+      rowBgColour = colourToHex({
+        ...accessibleBackgroundColor,
+        alpha: accessibleBackgroundColor.alpha * 0.25,
+      });
+    }
+  }
 
   return (
     <tr

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SingleLineCell.tsx

@@ -8,24 +8,13 @@ interface SingleLineCellProps {
   fieldId?: string;
   fieldLabel?: string;
   allowSubmitSameValue?: boolean;
-  submitOnTab?: boolean;
   handleUpdate: (newValue: string) => void;
   handleCancelUpdate?: () => void;
-  handleTabCancel?: () => void;
 }
 
 const SingleLineCell = forwardRef(
   (
-    {
+    { initialValue, fieldId, fieldLabel, allowSubmitSameValue, handleUpdate, handleCancelUpdate }: SingleLineCellProps,
-      initialValue,
-      fieldId,
-      fieldLabel,
-      allowSubmitSameValue,
-      submitOnTab,
-      handleUpdate,
-      handleCancelUpdate,
-      handleTabCancel,
-    }: SingleLineCellProps,
     inputRef,
   ) => {
     const ref = useRef<HTMLInputElement | null>(null);
@@ -36,9 +25,7 @@ const SingleLineCell = forwardRef(
       allowKeyboardNavigation: true,
       submitOnEnter: true, // single line should submit on enter
       submitOnCtrlEnter: true,
-      submitOnTab,
       onCancelUpdate: handleCancelUpdate,
-      onTabCancel: handleTabCancel,
     });
 
     // expose a subset of the methods to the parent

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/TimeInput.tsx

@@ -50,10 +50,6 @@ function TimeInputDuration({
     setIsEditing(false);
     setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
   };
-  const handleTabOut = useCallback(() => {
-    setIsEditing(false);
-    // Tab moves focus naturally; do not steal it back to parent
-  }, []);
 
   const handleUpdate = useCallback(
     (newValue: string) => {
@@ -100,10 +96,8 @@ function TimeInputDuration({
       ref={inputRef}
       initialValue={timeString}
       allowSubmitSameValue={!lockedValue} // if the value is not locked, submitting will lock the value
-      submitOnTab={false}
       handleUpdate={handleUpdate}
       handleCancelUpdate={handleFakeBlur}
-      handleTabCancel={handleTabOut}
     />
   ) : (
     <TextLikeInput

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss

@@ -8,24 +8,6 @@
   gap: 1rem;
   font-size: $inner-section-text-size;
   border-radius: 3px 3px 0 0;
-
-  transition: background-color 0.2s ease-in-out;
-
-  &[data-background-rundown='true'] {
-    background-color: rgba($ontime-color, 0.5);
-
-    .apart::before {
-      content: 'BACKGROUND EDIT';
-      color: $ui-white;
-      animation: blinker 2s ease-in-out infinite;
-    }
-  }
-}
-
-@keyframes blinker {
-  50% {
-    color: transparent;
-  }
 }
 
 .sectionTitle {
@@ -61,9 +43,6 @@
 
 .apart {
   margin-left: auto;
-  display: flex;
-  align-items: center;
-  gap: 1rem;
 }
 
 /** styles should match RundownHeader.module.scss */
@@ -91,17 +70,12 @@
   font-size: calc(1rem - 2px);
   font-weight: 600;
 
-  &[data-disabled] {
-    cursor: not-allowed;
-    opacity: 0.4;
-  }
-
   &:focus-visible {
     background: transparent;
     outline: 1px solid $blue-500;
   }
 
-  &:hover:not([data-disabled]):not(:active) {
+  &:hover:not(:disabled):not(:active) {
     background: $gray-1000;
   }
 
@@ -113,7 +87,7 @@
     background: $blue-700;
     color: $ui-white;
 
-    &:hover:not([data-disabled]):not(:active) {
+    &:hover:not(:disabled):not(:active) {
       background: $blue-600;
     }
   }

apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.tsx

@@ -11,92 +11,78 @@ import Checkbox from '../../../../common/components/checkbox/Checkbox';
 import * as Editor from '../../../../common/components/editor-utils/EditorUtils';
 import PopoverContents from '../../../../common/components/popover/Popover';
 import type { ExtendedEntry } from '../../../../common/utils/rundownMetadata';
+import { cx } from '../../../../common/utils/styleUtils';
 import { AppMode } from '../../../../ontimeConfig';
+import { CuesheetOptions, usePersistedCuesheetOptions } from '../../cuesheet.options';
 import { useCuesheetPermissions } from '../../useTablePermissions';
 import CuesheetShareModal from './CuesheetShareModal';
 
 import style from './CuesheetTableSettings.module.scss';
 
-type TableHeaderOptionsStore = {
+interface CuesheetTableSettingsProps {
-  hideTableSeconds: boolean;
+  columns: Column<ExtendedEntry, unknown>[];
-  hideIndexColumn: boolean;
-  showDelayedTimes: boolean;
-  hideDelays: boolean;
-  setOption: <K extends keyof TableHeaderOptionValues>(key: K, value: TableHeaderOptionValues[K]) => void;
-};
-
-type TableHeaderOptionValues = Pick<
-  TableHeaderOptionsStore,
-  'hideTableSeconds' | 'hideIndexColumn' | 'showDelayedTimes' | 'hideDelays'
->;
-
-type TableModeControls = {
   cuesheetMode: AppMode;
   setCuesheetMode: (mode: AppMode) => void;
-  isCurrentRundown?: boolean;
-};
-
-interface CuesheetTableHeaderToolbarProps {
-  columns: Column<ExtendedEntry, unknown>[];
-  optionsStore: TableHeaderOptionsStore;
   handleResetResizing: () => void;
   handleResetReordering: () => void;
   handleClearToggles: () => void;
-  insertElement?: ReactNode;
-  modeControls?: TableModeControls;
-  showShare?: boolean;
 }
 
-export default function CuesheetTableHeaderToolbar({
+export interface ViewSettingsProps {
+  optionsStore: CuesheetOptions;
+}
+
+export interface ColumnSettingsProps {
+  columns: Column<ExtendedEntry, unknown>[];
+  handleResetResizing: () => void;
+  handleResetReordering: () => void;
+  handleClearToggles: () => void;
+}
+
+export default function CuesheetTableSettings({
   columns,
-  optionsStore,
+  cuesheetMode,
+  setCuesheetMode,
   handleResetResizing,
   handleResetReordering,
   handleClearToggles,
-  insertElement,
+}: CuesheetTableSettingsProps) {
-  modeControls,
-  showShare = false,
-}: CuesheetTableHeaderToolbarProps) {
   const canChangeMode = useCuesheetPermissions((state) => state.canChangeMode);
   const canShare = useCuesheetPermissions((state) => state.canShare);
+  const options = usePersistedCuesheetOptions();
 
   const toggleCuesheetMode = (mode: AppMode[]) => {
+    // we need to stop user from deselecting a mode
     const newValue = mode.at(0);
-    if (!newValue || !modeControls) return;
+    if (!newValue) return;
-    modeControls.setCuesheetMode(newValue);
+    setCuesheetMode(newValue);
   };
 
-  const isBackground = !(modeControls?.isCurrentRundown ?? true);
-
   return (
-    <Toolbar.Root className={style.tableSettings} data-background-rundown={isBackground}>
+    <Toolbar.Root className={style.tableSettings}>
-      <ViewSettings optionsStore={optionsStore} />
+      <ViewSettings optionsStore={options} />
       <ColumnSettings
         columns={columns}
         handleResetResizing={handleResetResizing}
         handleResetReordering={handleResetReordering}
         handleClearToggles={handleClearToggles}
       />
-      {modeControls && canChangeMode && (
+      {canChangeMode && (
-        <div className={style.apart}>
+        <ToggleGroup
-          {insertElement}
+          value={[cuesheetMode]}
-          <ToggleGroup
+          onValueChange={toggleCuesheetMode}
-            value={[modeControls.cuesheetMode]}
+          className={cx([style.group, style.apart])}
-            onValueChange={toggleCuesheetMode}
+        >
-            className={style.group}
+          <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
-            disabled={!modeControls.isCurrentRundown}
+            Run
-          >
+          </Toolbar.Button>
-            <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
+          <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
-              Run
+            Edit
-            </Toolbar.Button>
+          </Toolbar.Button>
-            <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
+        </ToggleGroup>
-              Edit
-            </Toolbar.Button>
-          </ToggleGroup>
-        </div>
       )}
 
-      {showShare && canShare && (
+      {canShare && (
         <>
           <Editor.Separator orientation='vertical' />
           <CuesheetShareModal />
@@ -106,18 +92,9 @@ export default function CuesheetTableHeaderToolbar({
   );
 }
 
-interface ViewSettingsProps {
+export function ViewSettings({ optionsStore }: ViewSettingsProps) {
-  optionsStore: TableHeaderOptionsStore;
+  const options = optionsStore;
-}
 
-interface ColumnSettingsProps {
-  columns: Column<ExtendedEntry, unknown>[];
-  handleResetResizing: () => void;
-  handleResetReordering: () => void;
-  handleClearToggles: () => void;
-}
-
-function ViewSettings({ optionsStore }: ViewSettingsProps) {
   return (
     <Popover.Root>
       <Popover.Trigger
@@ -138,15 +115,15 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
           <Editor.Label className={style.sectionTitle}>Element visibility</Editor.Label>
           <Editor.Label className={style.option}>
             <Checkbox
-              defaultChecked={optionsStore.hideTableSeconds}
+              defaultChecked={options.hideTableSeconds}
-              onCheckedChange={(checked) => optionsStore.setOption('hideTableSeconds', checked)}
+              onCheckedChange={(checked) => options.setOption('hideTableSeconds', checked)}
             />
             Hide seconds in table
           </Editor.Label>
           <Editor.Label className={style.option}>
             <Checkbox
-              defaultChecked={optionsStore.hideIndexColumn}
+              defaultChecked={options.hideIndexColumn}
-              onCheckedChange={(checked) => optionsStore.setOption('hideIndexColumn', checked)}
+              onCheckedChange={(checked) => options.setOption('hideIndexColumn', checked)}
             />
             Hide index column
           </Editor.Label>
@@ -156,15 +133,15 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
           <Editor.Label className={style.sectionTitle}>Table Behaviour</Editor.Label>
           <Editor.Label className={style.option}>
             <Checkbox
-              defaultChecked={optionsStore.showDelayedTimes}
+              defaultChecked={options.showDelayedTimes}
-              onCheckedChange={(checked) => optionsStore.setOption('showDelayedTimes', checked)}
+              onCheckedChange={(checked) => options.setOption('showDelayedTimes', checked)}
             />
             Show delayed times
           </Editor.Label>
           <Editor.Label className={style.option}>
             <Checkbox
-              defaultChecked={optionsStore.hideDelays}
+              defaultChecked={options.hideDelays}
-              onCheckedChange={(checked) => optionsStore.setOption('hideDelays', checked)}
+              onCheckedChange={(checked) => options.setOption('hideDelays', checked)}
             />
             Hide delay entries
           </Editor.Label>
@@ -174,7 +151,7 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
   );
 }
 
-function ColumnSettings({
+export function ColumnSettings({
   columns,
   handleResetResizing,
   handleResetReordering,
@@ -200,7 +177,6 @@ function ColumnSettings({
           {columns.map((column) => {
             const columnHeader = column.columnDef.header;
             const visible = column.getIsVisible();
-
             return (
               <Editor.Label key={`${column.id}-${visible}`} className={style.option}>
                 <Checkbox defaultChecked={visible} onCheckedChange={column.toggleVisibility} />

apps/client/src/views/cuesheet/useApplyCuesheetPolicy.ts

@@ -5,33 +5,12 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { sessionScope } from '../../externals';
 import { AppMode, sessionKeys } from '../../ontimeConfig';
 import { getCuesheetPermissionsPolicy } from './cuesheet.policies';
-import type { CuesheetPermissions } from './useTablePermissions';
 import { useCuesheetPermissions } from './useTablePermissions';
 
-type CuesheetPolicyOptions = {
-  // Run mode is only meaningful for the loaded rundown — background rundowns force Edit.
-  canRunMode: boolean;
-};
-
-export function getEffectiveCuesheetMode(
-  permissions: Pick<CuesheetPermissions, 'canChangeMode'>,
-  storedMode: AppMode,
-  { canRunMode }: CuesheetPolicyOptions,
-) {
-  if (!permissions.canChangeMode) {
-    return AppMode.Run;
-  }
-
-  return canRunMode ? storedMode : AppMode.Edit;
-}
-
 /**
  * Applies cuesheet permissions to shared state and exposes the effective mode for the UI.
  */
-export function useApplyCuesheetPolicy(
+export function useApplyCuesheetPolicy(preset: URLPreset | undefined): {
-  preset: URLPreset | undefined,
-  { canRunMode }: CuesheetPolicyOptions,
-): {
   cuesheetMode: AppMode;
   setCuesheetMode: (mode: AppMode) => void;
 } {
@@ -47,14 +26,16 @@ export function useApplyCuesheetPolicy(
     defaultValue: preset ? AppMode.Run : AppMode.Edit,
   });
 
-  const cuesheetMode = getEffectiveCuesheetMode(permissions, storedCuesheetMode, { canRunMode });
+  const cuesheetMode = permissions.canChangeMode ? storedCuesheetMode : AppMode.Run;
-
   const setCuesheetMode = useCallback(
     (mode: AppMode) => {
-      if (!permissions.canChangeMode || !canRunMode) return;
+      if (!permissions.canChangeMode) {
+        return;
+      }
+
       setStoredCuesheetMode(mode);
     },
-    [canRunMode, permissions.canChangeMode, setStoredCuesheetMode],
+    [permissions.canChangeMode, setStoredCuesheetMode],
   );
 
   // Keep the shared permissions store aligned with the active preset policy.

apps/client/src/views/cuesheet/useCuesheetRundownSelection.ts

@@ -1,65 +0,0 @@
-import { useSessionStorage } from '@mantine/hooks';
-import { startTransition, useCallback, useMemo } from 'react';
-import { useNavigate } from 'react-router';
-
-import { useOrderedProjectList } from '../../common/hooks-query/useProjectList';
-import { useProjectRundowns } from '../../common/hooks-query/useProjectRundowns';
-import { serverURL } from '../../externals';
-
-export const FOLLOW_LOADED_RUNDOWN_ID = '__follow-loaded__' as const;
-
-export function getCuesheetRundownStorageKey(server: string, projectFilename: string) {
-  return `cuesheet-selected-rundown:${server}:${projectFilename}`;
-}
-
-export function resolveSelectedRundownId(storedSelectedRundownId: string | null, availableRundownIds: Set<string>) {
-  if (storedSelectedRundownId && availableRundownIds.has(storedSelectedRundownId)) return storedSelectedRundownId;
-  return FOLLOW_LOADED_RUNDOWN_ID;
-}
-
-export function useCuesheetRundownSelection() {
-  'use memo';
-
-  const { data: projectRundowns } = useProjectRundowns();
-  const {
-    data: { lastLoadedProject },
-  } = useOrderedProjectList();
-  const storageKey = useMemo(() => getCuesheetRundownStorageKey(serverURL, lastLoadedProject), [lastLoadedProject]);
-  const [storedSelectedRundownId, setStoredSelectedRundownId] = useSessionStorage<string | null>({
-    key: storageKey,
-    defaultValue: FOLLOW_LOADED_RUNDOWN_ID,
-  });
-
-  const availableRundownIds = new Set(projectRundowns.rundowns.map(({ id }) => id)).add(FOLLOW_LOADED_RUNDOWN_ID);
-  const { loaded: loadedRundownId } = projectRundowns;
-
-  const selectedRundownId = resolveSelectedRundownId(storedSelectedRundownId, availableRundownIds);
-
-  return {
-    loadedRundownId,
-    selectedRundownId,
-    projectRundowns: projectRundowns.rundowns,
-    setSelectedRundownId: (rundownId: string) => {
-      startTransition(() => {
-        setStoredSelectedRundownId(rundownId);
-      });
-    },
-  };
-}
-
-export function useDirectLinkToBackgroundEdit() {
-  const {
-    data: { lastLoadedProject },
-  } = useOrderedProjectList();
-  const navigate = useNavigate();
-  const storageKey = getCuesheetRundownStorageKey(serverURL, lastLoadedProject);
-  const [_, setStoredSelectedRundownId] = useSessionStorage<string | null>({ key: storageKey, defaultValue: null });
-
-  return useCallback(
-    async (rundownId: string) => {
-      await navigate('/cuesheet');
-      startTransition(() => setStoredSelectedRundownId(rundownId));
-    },
-    [setStoredSelectedRundownId, navigate],
-  );
-}

apps/client/src/views/studio/StudioClock.scss

@@ -45,9 +45,6 @@ $studio-idle: $red-1300;
     top: 0;
     top: 50%;
     left: 50%;
-
-    margin-top: -0.5rem;
-    margin-left: -0.5rem;
   }
 
   .tick--active {

apps/client/src/views/timeline/Timeline.module.scss

@@ -1,8 +1,6 @@
 @use '@/theme/viewerDefs' as *;
 
 $timeline-height: 1rem;
-$group-band-height: 0.5rem;
-$group-band-gap: 0.25rem;
 $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-override, $viewer-background-color));
 
 .timelineContainer {
@@ -19,21 +17,7 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
   position: relative;
   font-weight: 600;
   height: 100%;
-  // reserve the top region (progress bar + gap + group band) with the card background
+  box-shadow: inset 0 1rem 0 0 var(--card-background-color-override, $viewer-card-bg-color);
-  box-shadow: inset 0 calc(#{$timeline-height} + #{$group-band-gap} + #{$group-band-height}) 0 0
-    var(--card-background-color-override, $viewer-card-bg-color);
-}
-
-.groupBand {
-  height: $group-band-height;
-  margin-top: $group-band-gap;
-  width: 100%;
-  background: var(--group-colour, transparent);
-  display: flex;
-  align-items: center;
-  position: relative;
-  z-index: 2;
-  overflow: visible;
 }
 
 .column {
@@ -108,6 +92,7 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
   border-top: 2px solid var(--background-color-override, $viewer-background-color);
   box-shadow: 0 0.25rem 0 0 var(--color, $gray-300);
 
+  text-transform: capitalize;
   white-space: normal;
 
   &[data-status='done'] {
@@ -134,7 +119,6 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
 
   .status {
     width: fit-content;
-    text-transform: uppercase;
   }
 
   .status.due {

apps/client/src/views/timeline/Timeline.tsx

@@ -55,6 +55,10 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
     return calculateTimelineLayout(playableEvents, scheduleStart, scheduleEnd, screenWidth, !fixedSize);
   }, [rundown, scheduleStart, scheduleEnd, screenWidth, fixedSize]);
 
+  if (totalDuration === 0) {
+    return null;
+  }
+
   // Pre-calculate event statuses
   let currentStatus: ProgressStatus = selectedEventId ? 'done' : 'future';
   const statusMap: Record<string, ProgressStatus> = {};
@@ -101,7 +105,6 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
               title={displayTitle}
               cue={event.cue}
               width={position.width}
-              groupColour={event.groupColour}
             />
           );
         })}

apps/client/src/views/timeline/TimelineEntry.tsx

@@ -26,7 +26,6 @@ interface TimelineEntryProps {
   title: string;
   width: number;
   cue: string;
-  groupColour?: string;
   ref?: RefObject<HTMLDivElement | null>;
 }
 
@@ -49,7 +48,6 @@ export function TimelineEntry({
   title,
   width,
   cue,
-  groupColour,
   ref,
 }: TimelineEntryProps) {
   const formattedStartTime = formatTime(start, formatOptions);
@@ -69,7 +67,6 @@ export function TimelineEntry({
         {
           '--color': colour,
           '--lighter': lighterColour ?? '',
-          '--group-colour': groupColour ?? 'transparent',
           left: `${left}px`,
           width: `${width}px`,
         } as CSSProperties
@@ -77,7 +74,6 @@ export function TimelineEntry({
       data-testid={cue}
     >
       {status === 'live' ? <ActiveBlock /> : <div data-status={status} className={style.timelineBlock} />}
-      <div className={style.groupBand} />
       <div
         className={cx([style.content, width < 20 && style.hide, !hasLink && style.separeLeft])}
         data-status={status}
@@ -157,8 +153,6 @@ function TimelineEntryStatus({
     statusText = getLocalizedString('timeline.live');
   } else if (statusText === 'pending') {
     statusText = getLocalizedString('timeline.due');
-  } else if (statusText === 'done') {
-    statusText = getLocalizedString('timeline.done');
   }
 
   const isDue = status === 'future' && timeToStart <= 0;

apps/client/src/views/timeline/TimelinePage.tsx

@@ -38,8 +38,6 @@ export default function TimelinePageLoader() {
 function TimelinePage({ events, customFields, projectData, settings }: TimelineData) {
   const selectedEventId = useSelectedEventId();
   const { mainSource, timeformat } = useTimelineOptions();
-  const { getLocalizedString } = useTranslation();
-
   // holds copy of the rundown with only relevant events
   const { scopedRundown, firstStart, totalDuration } = useScopedRundown(events, selectedEventId);
 
@@ -52,8 +50,6 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD
   const defaultFormat = getDefaultFormat(settings?.timeFormat);
   const progressOptions = useMemo(() => getTimelineOptions(defaultFormat, customFields), [defaultFormat, customFields]);
 
-  const hasContent = totalDuration > 0;
-
   return (
     <div className='timeline' data-testid='timeline-view'>
       <ViewParamsEditor target={OntimeView.Timeline} viewOptions={progressOptions} />
@@ -65,16 +61,12 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD
 
       <TimelineSections now={now} next={next} followedBy={followedBy} mainSource={mainSource} />
 
-      {hasContent ? (
+      <Timeline
-        <Timeline
+        firstStart={firstStart}
-          firstStart={firstStart}
+        rundown={scopedRundown}
-          rundown={scopedRundown}
+        selectedEventId={selectedEventId}
-          selectedEventId={selectedEventId}
+        totalDuration={totalDuration}
-          totalDuration={totalDuration}
+      />
-        />
-      ) : (
-        <EmptyPage text={getLocalizedString('common.no_data')} />
-      )}
     </div>
   );
 }

apps/client/src/views/timeline/TimelineSections.tsx

@@ -20,7 +20,7 @@ export default function TimelineSections({ now, next, followedBy, mainSource }:
   const state = useExpectedStartData();
 
   // gather card data
-  const titleNow = now ? (getPropertyValue(now, mainSource ?? 'title') ?? '-') : getLocalizedString('timeline.standby');
+  const titleNow = getPropertyValue(now, mainSource ?? 'title') ?? '-';
   const dueText = getLocalizedString('timeline.due').toUpperCase();
   const nextText = getPropertyValue(next, mainSource ?? 'title') ?? '-';
   const followedByText = getPropertyValue(followedBy, mainSource ?? 'title') ?? '-';

apps/client/src/views/timeline/timeline.utils.ts

@@ -96,77 +96,63 @@ export function useScopedRundown(
 ): ScopedRundownData {
   const { hidePast } = useTimelineOptions();
 
-  const data = useMemo(
+  const data = useMemo(() => {
-    () => computeScopedRundown(rundown, selectedEventId, hidePast),
+    if (rundown.length === 0) {
-    [hidePast, rundown, selectedEventId],
+      return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
-  );
+    }
+
+    const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
+    let selectedIndex = selectedEventId ? Infinity : -1;
+    let firstStart = null;
+    let totalDuration = 0;
+    let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
+
+    for (let i = 0; i < rundown.length; i++) {
+      const currentEntry = rundown[i];
+      // we only deal with playableEvents
+      if (isOntimeEvent(currentEntry) && isPlayableEvent(currentEntry)) {
+        if (currentEntry.id === selectedEventId) {
+          selectedIndex = i;
+        }
+
+        // maybe filter past
+        if (hidePast && i < selectedIndex) {
+          continue;
+        }
+
+        // add to scopedRundown
+        scopedRundown.push(currentEntry);
+
+        /**
+         * Derive timers
+         * This logic is partially from rundownCache.generate
+         * With the addition of deriving the current day offset
+         */
+        if (firstStart === null) {
+          firstStart = currentEntry.timeStart;
+        }
+
+        const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
+
+        if (timeFromPrevious === 0) {
+          totalDuration += currentEntry.duration;
+        } else if (timeFromPrevious > 0) {
+          totalDuration += timeFromPrevious + currentEntry.duration;
+        } else if (timeFromPrevious < 0) {
+          totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
+        }
+        if (isNewLatest(currentEntry, lastEntry)) {
+          lastEntry = currentEntry;
+        }
+      }
+    }
+
+    return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
+  }, [hidePast, rundown, selectedEventId]);
 
   return data;
 }
 
-/**
- * Pure computation behind useScopedRundown: filters to playable events and derives timers
- */
-export function computeScopedRundown(
-  rundown: ExtendedEntry<OntimeEntry>[],
-  selectedEventId: MaybeString,
-  hidePast: boolean,
-): ScopedRundownData {
-  if (rundown.length === 0) {
-    return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
-  }
-
-  const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
-  let selectedIndex = selectedEventId ? Infinity : -1;
-  let firstStart: number | null = null;
-  let totalDuration = 0;
-  let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
-
-  for (let i = 0; i < rundown.length; i++) {
-    // we only deal with playableEvents
-    const currentEntry = rundown[i];
-    if (!isOntimeEvent(currentEntry) || !isPlayableEvent(currentEntry)) {
-      continue;
-    }
-
-    if (currentEntry.id === selectedEventId) {
-      selectedIndex = i;
-    }
-
-    // maybe filter past
-    if (hidePast && i < selectedIndex) {
-      continue;
-    }
-
-    // add to scopedRundown
-    scopedRundown.push(currentEntry);
-
-    /**
-     * Derive timers
-     * This logic is partially from rundownCache.generate
-     * With the addition of deriving the current day offset
-     */
-    if (firstStart === null) {
-      firstStart = currentEntry.timeStart;
-    }
-
-    const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
-
-    if (timeFromPrevious === 0) {
-      totalDuration += currentEntry.duration;
-    } else if (timeFromPrevious > 0) {
-      totalDuration += timeFromPrevious + currentEntry.duration;
-    } else if (timeFromPrevious < 0) {
-      totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
-    }
-    if (isNewLatest(currentEntry, lastEntry)) {
-      lastEntry = currentEntry;
-    }
-  }
-
-  return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
-}
-
 type UpcomingEvents = {
   now: ExtendedEntry<OntimeEvent> | null;
   next: ExtendedEntry<OntimeEvent> | null;

apps/client/vite.config.js

@@ -1,7 +1,6 @@
 import path from 'path';
 
 import { sentryVitePlugin } from '@sentry/vite-plugin';
-import legacy from '@vitejs/plugin-legacy';
 import react from '@vitejs/plugin-react';
 import { defineConfig } from 'vite';
 import { compression } from 'vite-plugin-compression2';
@@ -22,9 +21,6 @@ export default defineConfig({
     'import.meta.env.IS_DOCKER': process.env.NODE_ENV === 'docker',
   },
   plugins: [
-    legacy({
-      targets: ['safari >= 14.1'],
-    }),
     react({
       babel: {
         plugins: [['babel-plugin-react-compiler', ReactCompilerConfig]],
@@ -87,7 +83,7 @@ export default defineConfig({
   },
   test: {
     globals: true,
-    dom: true,
+    environment: 'jsdom',
   },
   build: {
     outDir: './build',

apps/electron/entitlements.plist

@@ -8,5 +8,7 @@
 		<true/>
 		<key>com.apple.security.cs.allow-dyld-environment-variables</key>
 		<true/>
+		<key>com.apple.security.cs.disable-library-validation</key>
+		<true/>
 	</dict>
 </plist>

apps/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-electron",
-  "version": "4.10.0",
+  "version": "4.7.0",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",
@@ -29,7 +29,8 @@
     "appId": "no.lightdev.ontime",
     "asar": true,
     "dmg": {
-      "artifactName": "ontime-macOS-${arch}.dmg"
+      "artifactName": "ontime-macOS-${arch}.dmg",
+      "icon": "icon.icns"
     },
     "mac": {
       "notarize": true,
@@ -45,7 +46,7 @@
         ]
       },
       "category": "public.app-category.productivity",
-      "icon": "ontime.icon"
+      "icon": "icon.icns"
     },
     "win": {
       "target": "nsis"

apps/electron/src/assets/ontime.icon/icon.json

@@ -1,62 +0,0 @@
-{
-  "fill-specializations" : [
-    {
-      "value" : "system-dark"
-    },
-    {
-      "appearance" : "dark",
-      "value" : "system-dark"
-    }
-  ],
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "blend-mode-specializations" : [
-            {
-              "appearance" : "dark",
-              "value" : "normal"
-            }
-          ],
-          "glass-specializations" : [
-            {
-              "value" : false
-            },
-            {
-              "appearance" : "dark",
-              "value" : false
-            },
-            {
-              "appearance" : "tinted",
-              "value" : false
-            }
-          ],
-          "hidden" : false,
-          "image-name" : "ontime-icon.png",
-          "name" : "ontime-icon",
-          "position" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              -0.5,
-              -113
-            ]
-          }
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}

apps/resolver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getontime/resolver",
-  "version": "4.10.0",
+  "version": "4.7.0",
   "type": "module",
   "repository": "https://github.com/cpvalente/ontime",
   "types": "./dist/main.d.ts",