disable requirement that all libraries be signed by same teamId

.codegraph/.gitignore

@@ -1,5 +0,0 @@
-# CodeGraph data files — local to each machine, not for committing.
-# Ignore everything in .codegraph/ except this file itself, so transient
-# files (the database, daemon.pid, sockets, logs) never show up in git.
-*
-!.gitignore

.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.11.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.11.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

@@ -6,7 +6,6 @@ import {
   ProjectRundownsList,
   RenumberCues,
   Rundown,
-  RundownImportPayload,
   TransientEventPayload,
 } from 'ontime-types';
 
@@ -35,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;
 }
 
 /**
@@ -83,15 +84,6 @@ export async function deleteRundown(rundownId: RundownId): Promise<AxiosResponse
   return axios.delete(`${rundownPath}/${rundownId}`);
 }
 
-/**
- * HTTP request to apply an imported rundown using a merge strategy or into a new rundown
- */
-export async function importRundownWithOptions(
-  payload: RundownImportPayload,
-): Promise<AxiosResponse<ProjectRundownsList>> {
-  return axios.post(`${rundownPath}/import`, payload);
-}
-
 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================
 
@@ -205,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/kbd/Kbd.module.scss

@@ -1,14 +0,0 @@
-.kbd {
-  display: inline-block;
-  min-width: 1.5rem;
-  padding: 0.0625rem 0.375rem;
-  border-radius: 2px;
-  background-color: $gray-1100;
-  color: $ui-white;
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.4);
-  font-family: monospace;
-  font-size: calc(1rem - 4px);
-  line-height: 1.5;
-  text-align: center;
-  white-space: nowrap;
-}

apps/client/src/common/components/kbd/Kbd.tsx

@@ -1,7 +0,0 @@
-import { PropsWithChildren } from 'react';
-
-import style from './Kbd.module.scss';
-
-export default function Kbd({ children }: PropsWithChildren) {
-  return <kbd className={style.kbd}>{children}</kbd>;
-}

apps/client/src/common/components/modal/Modal.module.scss

@@ -20,7 +20,7 @@
 .wide {
   top: 4vh;
   min-width: min(1280px, 96vw);
-  max-width: min(1800px, 98vw);
+  max-width: min(1600px, 96vw);
   height: 88vh;
   max-height: 88vh;
   display: flex;

apps/client/src/common/components/multi-part-progress-bar/MultiPartProgressBar.scss

@@ -38,6 +38,8 @@ $progress-bar-br: 3px;
 .multiprogress-bar__indicator-bar {
   background-color: var(--background-color-override, $ui-black);
   opacity: 0.8;
+  transition: 1s linear;
+  transition-property: width;
 
   .multiprogress-bar--ignore-css-override & {
     background-color: $ui-black;

apps/client/src/common/components/multi-part-progress-bar/MultiPartProgressBar.tsx

@@ -1,6 +1,5 @@
 import { MaybeNumber } from 'ontime-types';
 
-import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
 import { getProgress } from '../../utils/getProgress';
 import { cx } from '../../utils/styleUtils';
 
@@ -35,7 +34,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
     className = '',
   } = props;
 
-  const percentRemaining = 100 - useAnimatedProgress(now, complete);
+  const percentRemaining = 100 - getProgress(now, complete);
   const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
   const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
   const isOvertime = now !== null && now < 0;

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/navigation-menu/ViewNavigationMenu.tsx

@@ -1,8 +1,6 @@
 import { useDisclosure, useHotkeys } from '@mantine/hooks';
 import { memo } from 'react';
-import { useSearchParams } from 'react-router';
 
-import { hasCustomParams, useSavedViewParams } from '../../stores/savedViewParams';
 import { useViewParamsEditorStore } from '../view-params-editor/viewParamsEditor.store';
 import FloatingNavigation from './floating-navigation/FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
@@ -19,9 +17,6 @@ export default memo(ViewNavigationMenu);
 function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNavigationMenuProps) {
   const [isMenuOpen, menuHandler] = useDisclosure();
   const { open: showEditFormDrawer } = useViewParamsEditorStore();
-  const [searchParams] = useSearchParams();
-  const savedParams = useSavedViewParams((store) => store.params);
-  const hasSavedChanges = hasCustomParams(searchParams) || Object.keys(savedParams).length > 0;
 
   useHotkeys([
     [
@@ -51,7 +46,6 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
       <FloatingNavigation
         toggleMenu={isNavigationLocked ? undefined : menuHandler.toggle}
         toggleSettings={suppressSettings ? undefined : showEditFormDrawer}
-        hasSavedChanges={hasSavedChanges}
       />
       {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />}
     </>

apps/client/src/common/components/navigation-menu/client-link/ClientLink.module.scss

@@ -1,29 +1,4 @@
-.trailing {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.5rem;
-  margin-left: auto;
-}
-
 .linkIcon {
+  margin-left: auto;
   @include rotate-fourty-five;
 }
-
-.indicator {
-  width: 0.5rem;
-  height: 0.5rem;
-  border-radius: 50%;
-  background-color: $active-indicator;
-  pointer-events: none;
-  flex-shrink: 0;
-}
-
-.clear {
-  opacity: 0.6;
-  transition: opacity $transition-time-action;
-
-  &:hover,
-  &:focus-visible {
-    opacity: 1;
-  }
-}

apps/client/src/common/components/navigation-menu/client-link/ClientLink.tsx

@@ -1,17 +1,9 @@
-import { MouseEvent, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
-import { IoArrowUp, IoCloseOutline } from 'react-icons/io5';
+import { IoArrowUp } from 'react-icons/io5';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
+import { useNavigate } from 'react-router';
 
 import { useElectronEvent } from '../../../hooks/useElectronEvent';
-import {
-  hasCustomParams,
-  reservedParams,
-  stripReservedParams,
-  useSavedViewParams,
-} from '../../../stores/savedViewParams';
 import { handleLinks } from '../../../utils/linkUtils';
-import IconButton from '../../buttons/IconButton';
-import Tooltip from '../../tooltip/Tooltip';
 import NavigationMenuItem from '../navigation-menu-item/NavigationMenuItem';
 
 import style from './ClientLink.module.scss';
@@ -24,104 +16,32 @@ interface ClientLinkProps {
 
 export default function ClientLink({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
   const { isElectron } = useElectronEvent();
+  const navigate = useNavigate();
 
   if (isElectron) {
     return (
-      <ElectronNavigationItem current={current} to={to} postAction={postAction}>
+      <NavigationMenuItem
+        active={current}
+        onClick={() => {
+          handleLinks(to);
+          postAction?.();
+        }}
+      >
         {children}
-      </ElectronNavigationItem>
+        <IoArrowUp className={style.linkIcon} />
+      </NavigationMenuItem>
     );
   }
 
   return (
-    <BrowserNavigationItem current={current} to={to} postAction={postAction}>
+    <NavigationMenuItem
+      active={current}
+      onClick={() => {
+        navigate(`/${to}`);
+        postAction?.();
+      }}
+    >
       {children}
-    </BrowserNavigationItem>
-  );
-}
-
-function ElectronNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
-  const navigateToLink = () => {
-    handleLinks(to);
-    postAction?.();
-  };
-
-  return (
-    <NavigationMenuItem active={current} onClick={navigateToLink}>
-      {children}
-      <span className={style.trailing}>
-        <IoArrowUp className={style.linkIcon} />
-      </span>
-    </NavigationMenuItem>
-  );
-}
-
-function BrowserNavigationItem({ current, to, postAction, children }: PropsWithChildren<ClientLinkProps>) {
-  const navigate = useNavigate();
-  const location = useLocation();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const { params: savedParams, save, clear } = useSavedViewParams();
-
-  /**
-   * Save the params of the view we are leaving and resolve the destination,
-   * restoring any params previously saved for the target view.
-   */
-  const resolveDestination = () => {
-    const currentView = location.pathname.replace(/^\//, '');
-    save(currentView, stripReservedParams(location.search));
-    const restored = savedParams[to];
-    return `${to}${restored ? `?${restored}` : ''}`;
-  };
-
-  const isCustomised = current ? hasCustomParams(searchParams) : Boolean(savedParams[to]);
-
-  const navigateToLink = () => {
-    const destination = resolveDestination();
-    navigate(`/${destination}`);
-    postAction?.();
-  };
-
-  /**
-   * Clear the saved settings for this route without navigating to it.
-   * When it is the current view, also reset the live URL to its defaults.
-   */
-  const clearViewSettings = (event: MouseEvent) => {
-    event.stopPropagation();
-    clear(to);
-
-    // if mounted, clear the URL params
-    if (current) {
-      const preserved = new URLSearchParams();
-      reservedParams.forEach((key) => {
-        const value = searchParams.get(key);
-        if (value !== null) preserved.set(key, value);
-      });
-      setSearchParams(preserved);
-    }
-  };
-
-  return (
-    <NavigationMenuItem active={current} onClick={navigateToLink}>
-      {children}
-      {isCustomised && (
-        <span className={style.trailing}>
-          <span className={style.indicator} aria-hidden data-testid='client-link__saved-indicator' />
-          <Tooltip
-            text='Reset to default'
-            render={
-              <IconButton
-                variant='ghosted-white'
-                size='small'
-                className={style.clear}
-                aria-label='Reset to default'
-                onClick={clearViewSettings}
-              />
-            }
-          >
-            <IoCloseOutline />
-          </Tooltip>
-        </span>
-      )}
     </NavigationMenuItem>
   );
 }

apps/client/src/common/components/navigation-menu/floating-navigation/FloatingNavigation.module.scss

@@ -22,19 +22,3 @@
   top: 0;
   z-index: $zindex-nav;
 }
-
-.buttonWithIndicator {
-  position: relative;
-  display: inline-flex;
-}
-
-.indicator {
-  position: absolute;
-  top: -0.15rem;
-  right: -0.15rem;
-  width: 0.6rem;
-  height: 0.6rem;
-  border-radius: 50%;
-  background-color: $active-indicator;
-  pointer-events: none;
-}

apps/client/src/common/components/navigation-menu/floating-navigation/FloatingNavigation.tsx

@@ -9,10 +9,9 @@ import style from './FloatingNavigation.module.scss';
 interface FloatingNavigationProps {
   toggleMenu?: () => void;
   toggleSettings?: () => void;
-  hasSavedChanges?: boolean;
 }
 
-export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSavedChanges }: FloatingNavigationProps) {
+export default function FloatingNavigation({ toggleMenu, toggleSettings }: FloatingNavigationProps) {
   const isButtonShown = useFadeOutOnInactivity(true);
 
   return (
@@ -21,18 +20,15 @@ export default function FloatingNavigation({ toggleMenu, toggleSettings, hasSave
       className={cx([style.fadeable, style.buttonContainer, !isButtonShown && style.hidden])}
     >
       {toggleMenu && (
-        <div className={style.buttonWithIndicator}>
+        <IconButton
-          <IconButton
+          variant='subtle-white'
-            variant='subtle-white'
+          size='xlarge'
-            size='xlarge'
+          onClick={toggleMenu}
-            onClick={toggleMenu}
+          aria-label='toggle menu'
-            aria-label='toggle menu'
+          data-testid='navigation__toggle-menu'
-            data-testid='navigation__toggle-menu'
+        >
-          >
+          <IoApps />
-            <IoApps />
+        </IconButton>
-          </IconButton>
-          {hasSavedChanges && <span className={style.indicator} data-testid='navigation__saved-indicator' />}
-        </div>
       )}
       {toggleSettings && (
         <IconButton

apps/client/src/common/components/progress-bar/ProgressBar.scss

@@ -14,4 +14,6 @@ $progress-bar-br: 3px;
 .progress-bar__indicator {
   height: $progress-bar-size;
   background-color: var(--timer-progress-override, $accent-color);
+  transition: 1s linear;
+  transition-property: width;
 }

apps/client/src/common/components/progress-bar/ProgressBar.tsx

@@ -1,6 +1,6 @@
 import { MaybeNumber } from 'ontime-types';
 
-import { useAnimatedProgress } from '../../hooks/useAnimatedProgress';
+import { getProgress } from '../../utils/getProgress';
 
 import './ProgressBar.scss';
 
@@ -12,7 +12,7 @@ interface ProgressBarProps {
 
 export default function ProgressBar(props: ProgressBarProps) {
   const { current, duration, className } = props;
-  const progress = useAnimatedProgress(current, duration);
+  const progress = getProgress(current, duration);
 
   return (
     <div className={`progress-bar__bg ${className}`}>

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

@@ -1,43 +1,18 @@
-@use '@/theme/viewerDefs' as *;
-
 .emptyContainer {
   width: 100%;
   text-align: center;
-  color: var(--secondary-color-override, $viewer-secondary-color);
+  color: $white-10;
 
   .empty {
-    display: block;
+    width: 100%;
-    width: min(100%, 14rem);
+    opacity: 0.8;
-    margin: 0 auto -1.5rem;
-    opacity: 0.6;
   }
 
   .text {
     display: block;
     margin-inline: auto;
-    font-weight: 400;
+    font-weight: 600;
-    font-size: clamp(1rem, 1.55vw, 1.5rem);
+    font-size: 2em;
-    line-height: 1.35;
+    max-width: 600px;
-    max-width: min(100%, 40rem);
-  }
-
-  &.error {
-    color: $error-red;
-
-    .empty {
-      opacity: 0.35;
-      filter: grayscale(1);
-    }
-
-    .text {
-      margin-top: 0.5rem;
-    }
-  }
-
-  .errorIcon {
-    display: block;
-    width: 1.5rem;
-    height: 1.5rem;
-    margin: -0.125rem auto 0;
   }
 }

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

@@ -1,5 +1,4 @@
 import { CSSProperties } from 'react';
-import { IoWarningOutline } from 'react-icons/io5';
 
 import EmptyImage from '../../../assets/images/empty.svg?react';
 import { cx } from '../../utils/styleUtils';
@@ -10,18 +9,12 @@ interface EmptyProps {
   text?: string;
   injectedStyles?: CSSProperties;
   className?: string;
-  variant?: 'error';
 }
 
-export default function Empty({ text, className, injectedStyles, variant }: EmptyProps) {
+export default function Empty({ text, className, injectedStyles }: EmptyProps) {
   return (
-    <div
+    <div className={cx([style.emptyContainer, className])} style={injectedStyles}>
-      className={cx([style.emptyContainer, variant === 'error' && style.error, className])}
-      style={injectedStyles}
-      role={variant === 'error' ? 'alert' : undefined}
-    >
       <EmptyImage className={style.empty} />
-      {variant === 'error' && <IoWarningOutline className={style.errorIcon} aria-hidden />}
       {text && <span className={style.text}>{text}</span>}
     </div>
   );

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

@@ -1,11 +0,0 @@
-.fill {
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
-  min-height: 0;
-  flex: 1;
-
-  display: grid;
-  place-items: start center;
-  padding: clamp(4rem, 20dvh, 12rem) 1.5rem 1rem;
-}

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

@@ -1,19 +0,0 @@
-import { cx } from '../../utils/styleUtils';
-import Empty from './Empty';
-
-import style from './EmptyFill.module.scss';
-
-interface EmptyFillProps {
-  text?: string;
-  /** placed on the fill wrapper — e.g. to assign a grid-area in a grid parent */
-  className?: string;
-}
-
-/** Container-filling empty/loading state for panels and grid/flex cells. */
-export default function EmptyFill({ text, className }: EmptyFillProps) {
-  return (
-    <div className={cx([style.fill, className])}>
-      <Empty text={text} />
-    </div>
-  );
-}

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

@@ -6,7 +6,7 @@
   box-sizing: border-box; /* reset */
   overflow: hidden;
   width: 100%; /* restrict the page width to viewport */
-  height: 100dvh;
+  height: 100vh;
 
   font-family: var(--font-family-override, $viewer-font-family);
   background: var(--background-color-override, $viewer-background-color);
@@ -16,6 +16,5 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: center;
+  padding-top: 5rem;
-  padding-block: 5rem;
 }

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

@@ -7,13 +7,12 @@ import style from './EmptyPage.module.scss';
 interface EmptyPageProps {
   text?: string;
   injectedStyles?: CSSProperties;
-  variant?: 'error';
 }
 
-export default function EmptyPage({ text, injectedStyles, variant }: EmptyPageProps) {
+export default function EmptyPage({ text, injectedStyles }: EmptyPageProps) {
   return (
     <div className={style.page}>
-      <Empty text={text} injectedStyles={injectedStyles} variant={variant} />
+      <Empty text={text} injectedStyles={injectedStyles} />
     </div>
   );
 }

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

@@ -8,11 +8,13 @@
     padding-top: 10vh;
   }
 
-  .inline {
+  .empty {
-    display: flex;
+    width: 100%;
-    align-items: center;
+    opacity: 0.8;
-    justify-content: center;
+  }
-    gap: 1rem;
+
-    margin-top: 1em;
+  .text {
+    font-weight: 600;
+    font-size: 2em;
   }
 }

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

@@ -1,32 +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 text={text} injectedStyles={{ marginTop: '5vh' }} />
+          <EmptyImage className={style.empty} />
-          {handleAddNew && (
+          {text && <span className={style.text}>{text}</span>}
-            <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/components/view-params-editor/ViewParamsEditor.tsx

@@ -6,7 +6,6 @@ import { useSearchParams } from 'react-router';
 
 import useViewSettings from '../../hooks-query/useViewSettings';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
-import { useSavedViewParams } from '../../stores/savedViewParams';
 import Button from '../buttons/Button';
 import IconButton from '../buttons/IconButton';
 import Info from '../info/Info';
@@ -28,7 +27,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
   const [searchParams, setSearchParams] = useSearchParams();
   const { data: viewSettings } = useViewSettings();
   const { isOpen, close } = useViewParamsEditorStore();
-  const clearSavedParams = useSavedViewParams((store) => store.clear);
   const isSmallScreen = useIsSmallScreen();
 
   const getPreservedParams = () => getPreservedSearchParams(searchParams, viewOptions);
@@ -38,7 +36,6 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
   };
 
   const resetParams = () => {
-    clearSavedParams(target);
     setSearchParams(getPreservedParams());
   };
 

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

@@ -8,12 +8,12 @@ import { getCustomFields } from '../api/customFields';
 const placeholder: CustomFields = {};
 
 export default function useCustomFields() {
-  const { data, status, isFetching, isError, isLoadingError, refetch } = useQuery({
+  const { data, status, isFetching, isError, refetch } = useQuery({
     queryKey: CUSTOM_FIELDS,
     queryFn: ({ signal }) => getCustomFields({ signal }),
     placeholderData: (previousData, _previousQuery) => previousData,
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  return { data: data ?? placeholder, status, isFetching, isError, isLoadingError, refetch };
+  return { data: data ?? placeholder, status, isFetching, isError, refetch };
 }

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

@@ -6,14 +6,14 @@ import { getProjectData, postProjectData } from '../api/project';
 import { projectDataPlaceholder } from '../models/ProjectData';
 
 export default function useProjectData() {
-  const { data, status, isFetching, isError, isLoadingError, refetch } = useQuery({
+  const { data, status, isFetching, isError, refetch } = useQuery({
     queryKey: PROJECT_DATA,
     queryFn: ({ signal }) => getProjectData({ signal }),
     placeholderData: (previousData, _previousQuery) => previousData,
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  return { data: data ?? projectDataPlaceholder, status, isFetching, isError, isLoadingError, refetch };
+  return { data: data ?? projectDataPlaceholder, status, isFetching, isError, refetch };
 }
 
 export function useUpdateProjectData() {

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();
@@ -32,32 +28,31 @@ export default function useRundown() {
     data: { loaded: loadedRundownId },
   } = useProjectRundowns();
 
-  const { data, status, isError, isLoadingError, refetch, isFetching } = useQuery<Rundown>({
+  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
     queryKey: loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY,
     queryFn: ({ signal }) => fetchCurrentRundown({ signal }),
     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 });
   }, [loadedRundownId, queryClient]);
 
-  return { data: data ?? cachedRundownPlaceholder, status, isError, isLoadingError, refetch, isFetching };
+  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
 }
 
 export function useRundownWithMetadata() {
-  const { data, status, isLoadingError } = useRundown();
+  const { data, status } = useRundown();
   const selectedEventId = useSelectedEventId();
   const rundownMetadata = useMemo(() => getRundownMetadata(data, selectedEventId), [data, selectedEventId]);
-  return { data, status, isLoadingError, rundownMetadata };
+  return { data, status, rundownMetadata };
 }
 
 /**
@@ -65,7 +60,7 @@ export function useRundownWithMetadata() {
  * built from the order and rundown fields
  */
 export function useFlatRundown() {
-  const { data, status, isLoadingError } = useRundown();
+  const { data, status } = useRundown();
 
   const flatRundown = useMemo(() => {
     if (data.revision === -1) {
@@ -74,15 +69,15 @@ export function useFlatRundown() {
     return data.flatOrder.map((id) => data.entries[id]).filter((entry): entry is OntimeEntry => entry !== undefined);
   }, [data]);
 
-  return { data: flatRundown, rundownId: data.id, status, isLoadingError };
+  return { data: flatRundown, rundownId: data.id, status };
 }
 
 export function useFlatRundownWithMetadata() {
-  const { data, status, isLoadingError } = useRundown();
+  const { data, status } = useRundown();
   const selectedEventId = useSelectedEventId();
 
   const rundownWithMetadata = useMemo(() => getFlatRundownMetadata(data, selectedEventId), [data, selectedEventId]);
-  return { data: rundownWithMetadata, status, isLoadingError };
+  return { data: rundownWithMetadata, status };
 }
 
 /**
@@ -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, isLoadingError, 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, isLoadingError, refetch, isFetching };
-}

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

@@ -1,56 +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;
-  isLoadingError: boolean;
-  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, isLoadingError } = useRundownById(rundownId);
-  const flatRundown = useMemo(
-    () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
-    [effectiveSelectedEventId, rundown],
-  );
-
-  return useMemo(
-    () => ({
-      rundownId,
-      rundown,
-      flatRundown,
-      status,
-      isLoadingError,
-      selectedEventId: effectiveSelectedEventId,
-    }),
-    [effectiveSelectedEventId, flatRundown, isLoadingError, rundown, rundownId, status],
-  );
-}

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

@@ -6,7 +6,7 @@ import { getSettings } from '../api/settings';
 import { ontimePlaceholderSettings } from '../models/OntimeSettings';
 
 export default function useSettings() {
-  const { data, status, isFetching, isError, isLoadingError, refetch } = useQuery({
+  const { data, status, isFetching, isError, refetch } = useQuery({
     queryKey: APP_SETTINGS,
     queryFn: ({ signal }) => getSettings({ signal }),
     placeholderData: (previousData, _previousQuery) => previousData,
@@ -22,5 +22,5 @@ export default function useSettings() {
     },
   });
 
-  return { data: data ?? ontimePlaceholderSettings, status, isFetching, isError, isLoadingError, refetch };
+  return { data: data ?? ontimePlaceholderSettings, status, isFetching, isError, refetch };
 }

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

@@ -7,7 +7,7 @@ import { VIEW_SETTINGS } from '../api/constants';
 import { viewsSettingsPlaceholder } from '../models/ViewSettings.type';
 
 export default function useViewSettings() {
-  const { data, status, isLoadingError } = useQuery({
+  const { data, status } = useQuery({
     queryKey: VIEW_SETTINGS,
     queryFn: ({ signal }) => getViewSettings({ signal }),
     placeholderData: (previousData, _previousQuery) => previousData,
@@ -24,5 +24,5 @@ export default function useViewSettings() {
     },
   });
 
-  return { data: data ?? viewsSettingsPlaceholder, status, isLoadingError, mutateAsync };
+  return { data: data ?? viewsSettingsPlaceholder, status, mutateAsync };
 }

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

@@ -1,41 +0,0 @@
-import { MaybeNumber, Playback } from 'ontime-types';
-import { useEffect, useRef, useState } from 'react';
-
-import { getProgress } from '../utils/getProgress';
-import { usePlayback } from './useSocket';
-
-/**
- * Returns the live completion percentage (0–100) of a countdown, interpolated locally.
- */
-export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber): number {
-  const playback = usePlayback();
-  const isRunning = playback === Playback.Play || playback === Playback.Roll;
-
-  const baseline = useRef({ current, at: performance.now() });
-  const [, setTick] = useState(0);
-
-  // there is only something to animate while a running timer is counting down towards 0
-  const shouldAnimate = isRunning && current !== null && current > 0 && duration !== null;
-
-  // re-anchor to the authoritative value whenever the server pushes a new timer update
-  useEffect(() => {
-    baseline.current = { current, at: performance.now() };
-  }, [current, duration, playback]);
-
-  // while counting down, re-render every animation frame so the derived progress stays smooth
-  useEffect(() => {
-    if (!shouldAnimate) {
-      return;
-    }
-    let frame = requestAnimationFrame(function tick() {
-      setTick((value) => value + 1);
-      frame = requestAnimationFrame(tick);
-    });
-    return () => cancelAnimationFrame(frame);
-  }, [shouldAnimate]);
-
-  // derive from the anchor plus elapsed time at render; frozen to the anchor when not running
-  const anchored = baseline.current.current;
-  const value = isRunning && anchored !== null ? anchored - (performance.now() - baseline.current.at) : anchored;
-  return getProgress(value, duration);
-}

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

@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
   EntryId,
+  InsertOptions,
   MaybeString,
   OntimeDelay,
   OntimeEntry,
@@ -15,7 +16,6 @@ import {
   TimeStrategy,
   isOntimeEvent,
   isOntimeGroup,
-  isOntimeMilestone,
 } from 'ontime-types';
 import {
   MILLIS_PER_SECOND,
@@ -59,26 +59,13 @@ export type EventOptions = Partial<{
   before: MaybeString;
   // options of entries of type OntimeEvent
   linkPrevious: boolean;
-  /** the timing reference for the new entry, usually the same as after */
   lastEventId: MaybeString;
 }>;
 
-type ClientInsertOptions = {
-  after?: EntryId;
-  before?: EntryId;
-};
-
 /**
- * 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,
@@ -88,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
@@ -125,7 +111,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
    * @private
    */
   const { mutateAsync: addEntryMutation } = useMutation({
-    mutationFn: ([rundownId, entry]: [string, PatchWithId & ClientInsertOptions]) => postAddEntry(rundownId, entry),
+    mutationFn: ([rundownId, entry]: [string, PatchWithId & InsertOptions]) => postAddEntry(rundownId, entry),
     onMutate: async ([_rundownId, entry]) => {
       const queryKey = resolveCurrentRundownQueryKey();
       await queryClient.cancelQueries({ queryKey });
@@ -154,9 +140,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
         addToRundown(
           newRundown,
           optimisticEntry,
-          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
           afterId,
-          entry.before ?? null,
+          parent ? (newRundown.entries[parent.id] as OntimeGroup) : null,
         );
 
         queryClient.setQueryData<Rundown>(queryKey, newRundown);
@@ -199,7 +184,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
         throw new Error('Rundown not initialised');
       }
 
-      const newEntry: PatchWithId & ClientInsertOptions = { ...entry, id: generateId() };
+      const newEntry: PatchWithId & InsertOptions = { ...entry, id: generateId() };
 
       // handle adding options that concern all event types
       if (options?.after) {
@@ -211,8 +196,8 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
 
       // ************* CHECK OPTIONS specific to events
       if (isOntimeEvent(newEntry)) {
-        // last event id is the timing reference of the previous OntimeEvent in rundown
         if (options?.lastEventId) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
           const previousEvent = rundownData.entries[options?.lastEventId];
           if (isOntimeEvent(previousEvent)) {
             newEntry.timeStart = previousEvent.timeEnd;
@@ -247,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) {
@@ -270,7 +247,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
       defaultTimerType,
       defaultEndAction,
       defaultTimeStrategy,
-      inheritGroupColour,
       addEntryMutation,
     ],
   );
@@ -290,7 +266,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
    * Clone an entry
    */
   const clone = useCallback(
-    async (entryId: EntryId, options?: ClientInsertOptions) => {
+    async (entryId: EntryId, options?: InsertOptions) => {
       try {
         const rundownId = getCurrentRundownData()?.id;
         if (!rundownId) {
@@ -1028,7 +1004,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
       updateTimer,
     ],
   );
-}
+};
 
 /**
  * Utility to optimistically delete entries from client cache
@@ -1063,7 +1039,7 @@ function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
 /**
  * Utility to create an optimistic entry for immediate cache insertion
  */
-function createOptimisticEntry(payload: PatchWithId & ClientInsertOptions): OntimeEntry {
+function createOptimisticEntry(payload: PatchWithId & InsertOptions): OntimeEntry {
   const { after: _after, before: _before, ...entryData } = payload;
   const id = entryData.id;
   let parent: EntryId | null = null;

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

@@ -139,17 +139,6 @@ export const setEventPlayback = {
   pause: () => sendSocket('pause', undefined),
 };
 
-export const useTimerProgress = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  phase: state.timer.phase,
-  addedTime: state.timer.addedTime,
-  secondaryTimer: state.timer.secondaryTimer,
-  current: state.timer.current,
-  expectedFinish: state.timer.expectedFinish,
-  startedAt: state.timer.startedAt,
-  isCountToEnd: state.eventNow?.countToEnd ?? false,
-}));
-
 export const useTimer = createSelector((state: RuntimeStore) => ({
   ...state.timer,
 }));

apps/client/src/common/stores/__tests__/savedViewParams.test.ts

@@ -1,87 +0,0 @@
-import { hasCustomParams, stripReservedParams, useSavedViewParams } from '../savedViewParams';
-
-describe('savedViewParams store', () => {
-  beforeEach(() => {
-    useSavedViewParams.getState().clearAll();
-  });
-
-  it('saves and restores params per view', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-
-    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=true');
-    expect(useSavedViewParams.getState().params.backstage).toBe('showProgress=false');
-  });
-
-  it('overwrites the saved params for a view on subsequent saves', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('timer', 'hideSeconds=false');
-
-    expect(useSavedViewParams.getState().params.timer).toBe('hideSeconds=false');
-  });
-
-  it('does not store an entry for an empty search string', () => {
-    useSavedViewParams.getState().save('timer', '');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('removes a previously saved entry when saved with an empty search string', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('timer', '');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('ignores empty view keys', () => {
-    useSavedViewParams.getState().save('', 'hideSeconds=true');
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-
-  it('clears the saved params for a single view without touching others', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-    useSavedViewParams.getState().clear('timer');
-
-    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
-  });
-
-  it('is a no-op when clearing a view without saved params', () => {
-    useSavedViewParams.getState().save('backstage', 'showProgress=false');
-    useSavedViewParams.getState().clear('timer');
-
-    expect(useSavedViewParams.getState().params).toEqual({ backstage: 'showProgress=false' });
-  });
-
-  it('clears all saved params', () => {
-    useSavedViewParams.getState().save('timer', 'hideSeconds=true');
-    useSavedViewParams.getState().clearAll();
-
-    expect(useSavedViewParams.getState().params).toEqual({});
-  });
-});
-
-describe('stripReservedParams', () => {
-  it('removes reserved auth/preset params while keeping view customisation', () => {
-    expect(stripReservedParams('hideSeconds=true&token=abc&n=1&alias=my')).toBe('hideSeconds=true');
-  });
-
-  it('returns an empty string when only reserved params are present', () => {
-    expect(stripReservedParams('token=abc&n=1&alias=my')).toBe('');
-  });
-});
-
-describe('hasCustomParams', () => {
-  it('is true when a non-reserved param is present', () => {
-    expect(hasCustomParams(new URLSearchParams('hideSeconds=true&token=abc'))).toBe(true);
-  });
-
-  it('is false when only reserved params are present', () => {
-    expect(hasCustomParams(new URLSearchParams('token=abc&n=1&alias=my'))).toBe(false);
-  });
-
-  it('is false when there are no params', () => {
-    expect(hasCustomParams(new URLSearchParams(''))).toBe(false);
-  });
-});

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/stores/savedViewParams.ts

@@ -1,62 +0,0 @@
-import { create } from 'zustand';
-
-// params that are auth/preset markers, not user view customisation (see common/utils/urlPresets.ts)
-export const reservedParams = new Set(['token', 'n', 'alias']);
-
-interface SavedViewParamsStore {
-  params: Record<string, string>; // view key (e.g. "timer") -> search string without leading "?"
-  save: (view: string, search: string) => void;
-  clear: (view: string) => void;
-  clearAll: () => void;
-}
-
-/**
- * Remembers the last view parameters used for each view so they can be
- * restored when the user navigates back to that view through the menu.
- * In-memory only: persists across SPA navigation, resets on a full page reload.
- */
-export const useSavedViewParams = create<SavedViewParamsStore>((set) => ({
-  params: {},
-  save: (view, search) =>
-    set((state) => {
-      // ignore empty view keys and do not store empty entries, so the
-      // "saved changes" indicator only reflects genuine customisation
-      if (!view) return state;
-      const params = { ...state.params };
-      if (search) {
-        params[view] = search;
-      } else {
-        delete params[view];
-      }
-      return { params };
-    }),
-  clear: (view) =>
-    set((state) => {
-      if (!state.params[view]) return state;
-      const params = { ...state.params };
-      delete params[view];
-      return { params };
-    }),
-  clearAll: () => set({ params: {} }),
-}));
-
-/**
- * Removes reserved (auth/preset) params from a search string, keeping only
- * genuine view customisation.
- */
-export function stripReservedParams(search: string): string {
-  const sp = new URLSearchParams(search);
-  reservedParams.forEach((key) => sp.delete(key));
-  return sp.toString();
-}
-
-/**
- * Whether the search params contain any genuine view customisation,
- * ignoring reserved params.
- */
-export function hasCustomParams(searchParams: URLSearchParams): boolean {
-  for (const key of searchParams.keys()) {
-    if (!reservedParams.has(key)) return true;
-  }
-  return false;
-}

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

@@ -1,4 +1,4 @@
-import { hostToBaseUrl, linkToOtherHost } from '../linkUtils';
+import { linkToOtherHost } from '../linkUtils';
 
 describe('linkToOTherHost', () => {
   it('should handle electron links', () => {
@@ -22,18 +22,3 @@ describe('linkToOTherHost', () => {
     expect(destination).toBe('https://app.getontime.no/user-hash/path');
   });
 });
-
-describe('hostToBaseUrl', () => {
-  it('uses http when the page is plain http', () => {
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'http://localhost:4001')).toBe('http://192.168.10.166:4001');
-  });
-
-  it('keeps https when the page reaches the server over TLS on the same port', () => {
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://localhost:4001')).toBe('https://192.168.10.166:4001');
-  });
-
-  it('falls back to http when the page is https on a different port (TLS proxy)', () => {
-    // the raw server port does not speak TLS, an https link to it would fail
-    expect(hostToBaseUrl('192.168.10.166', 4001, 'https://ontime.example.com')).toBe('http://192.168.10.166:4001');
-  });
-});

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

@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { removeFileExtension } from '../uploadUtils';
-
-describe('removeFileExtension()', () => {
-  it('removes a trailing extension', () => {
-    expect(removeFileExtension('show.xlsx')).toBe('show');
-  });
-
-  it('only removes the last extension', () => {
-    expect(removeFileExtension('my.show.xlsx')).toBe('my.show');
-  });
-
-  it('returns the name unchanged when there is no extension', () => {
-    expect(removeFileExtension('rundown')).toBe('rundown');
-  });
-
-  it('does not treat a leading dot as an extension', () => {
-    expect(removeFileExtension('.gitignore')).toBe('.gitignore');
-  });
-
-  it('handles an empty string', () => {
-    expect(removeFileExtension('')).toBe('');
-  });
-});

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/linkUtils.ts

@@ -37,12 +37,7 @@ export function handleLinks(
   event?.preventDefault();
 
   const destination = new URL(externalServerUrl);
-  // split off any query string so it is not encoded into the pathname
+  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
-  const [pathname, search] = location.split('?');
-  destination.pathname = externalBaseURI ? `${externalBaseURI}/${pathname}` : pathname;
-  if (search) {
-    destination.search = search;
-  }
   openLink(destination.toString());
 }
 
@@ -59,17 +54,3 @@ export function linkToOtherHost(
   }
   return destination.toString();
 }
-
-/**
- * Builds a base URL for reaching the Ontime server on a given network interface.
- * The Ontime server itself only speaks HTTP, so we only keep https when the page
- * already reaches the server over TLS on that same port (eg. a proxy in front of it);
- * any other explicit server port gets http.
- * externalServerUrl is used for testing
- */
-export function hostToBaseUrl(host: string, port: number, externalServerUrl: string = serverURL): string {
-  const page = new URL(externalServerUrl);
-  const pagePort = page.port === '' ? (page.protocol === 'https:' ? 443 : 80) : Number(page.port);
-  const scheme = page.protocol === 'https:' && pagePort === port ? 'https' : 'http';
-  return `${scheme}://${host}:${port}`;
-}

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/time.ts

@@ -3,9 +3,7 @@ import {
   MILLIS_PER_HOUR,
   MILLIS_PER_MINUTE,
   MILLIS_PER_SECOND,
-  dayInMs,
   formatFromMillis,
-  getExpectedEnd,
   getExpectedStart,
 } from 'ontime-utils';
 
@@ -31,11 +29,6 @@ export function nowInMillis(): number {
   return elapsed;
 }
 
-export function normaliseWallClock(time: number): number {
-  const timeOfDay = time % dayInMs;
-  return timeOfDay < 0 ? timeOfDay + dayInMs : timeOfDay;
-}
-
 /**
  * @description Resolves format from url and store
  * @return {string|null} A format string like "hh:mm:ss a" or null
@@ -187,13 +180,15 @@ export function getExpectedTimesFromExtendedEvent(
       ...state,
     },
   );
-  const expectedEnd = getExpectedEnd(event, expectedStart, state.currentDay);
+
   const plannedEnd = event.timeStart + event.duration + event.delay;
 
   return {
     expectedStart,
     timeToStart: expectedStart - state.clock,
-    expectedEnd,
+    expectedEnd: event.countToEnd
+      ? Math.max(expectedStart + event.duration, plannedEnd)
+      : expectedStart + event.duration,
     plannedEnd,
   };
 }

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

@@ -38,18 +38,6 @@ export function validateProjectFile(file: File) {
   }
 }
 
-/**
- * Removes a trailing file extension from a file name (e.g. "show.xlsx" -> "show")
- * A leading dot (dotfiles like ".gitignore") is not treated as an extension
- */
-export function removeFileExtension(fileName: string): string {
-  const lastDot = fileName.lastIndexOf('.');
-  if (lastDot <= 0) {
-    return fileName;
-  }
-  return fileName.slice(0, lastDot);
-}
-
 export function isExcelFile(file: File | null) {
   return file?.name.endsWith('.xlsx');
 }

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-utils/PanelUtils.module.scss

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

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/AutomationForm.tsx

@@ -293,9 +293,8 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
         <h3>Outputs</h3>
         <Info>
           Automation outputs can be used to send data from Ontime to external software <br />
-          or to change properties of Ontime itself. <br /> <br />
+          or to change properties of Ontime itself.
-          Use Ontime runtime data in these fields with template strings. Type {'{{'} to see autocomplete, or{' '}
+          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
-          <ExternalLink href={integrationsDocsUrl}>read the docs</ExternalLink>
         </Info>
 
         {fieldOutputs.map((output, index) => {
@@ -342,17 +341,12 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                   </label>
                   <label>
                     Address
-                    <TemplateInput
+                    <Input {...register(`outputs.${index}.address`)} fluid placeholder='/cue/start' />
-                      {...register(`outputs.${index}.address`)}
-                      value={output.address}
-                      fluid
-                      placeholder='/cue/start'
-                    />
                     <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
                   </label>
                   <label>
                     Arguments
-                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} fluid placeholder='1' />
+                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} placeholder='1' />
                     <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                   </label>
                   <div>
@@ -382,7 +376,7 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                 <div className={style.httpSection}>
                   <label>
                     Target URL
-                    <TemplateInput
+                    <Input
                       {...register(`outputs.${index}.url`, {
                         required: { value: true, message: 'Required field' },
                         pattern: {
@@ -390,7 +384,6 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                           message: 'HTTP messages should target http:// or https://',
                         },
                       })}
-                      value={output.url}
                       fluid
                       placeholder='http://127.0.0.1/start/1'
                     />

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/automations-panel/OntimeActionForm.tsx

@@ -5,7 +5,6 @@ import { UseFormRegister, UseFormSetValue, UseFormWatch } from 'react-hook-form'
 import Input from '../../../../common/components/input/input/Input';
 import Select from '../../../../common/components/select/Select';
 import * as Panel from '../../panel-utils/PanelUtils';
-import TemplateInput from './template-input/TemplateInput';
 
 import style from './AutomationForm.module.scss';
 
@@ -72,8 +71,8 @@ export default function OntimeActionForm({
             { value: 'playback-pause', label: 'Playback: pause' },
             { value: 'playback-roll', label: 'Playback: roll' },
 
-            { value: 'message-set', label: 'Primary Message' },
+            { value: 'message-set', label: 'Primary Message: set' },
-            { value: 'message-secondary', label: 'Secondary Message' },
+            { value: 'message-secondary', label: 'Secondary Message: source' },
           ]}
         />
         <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
@@ -97,12 +96,7 @@ export default function OntimeActionForm({
         <>
           <label>
             Text (leave empty for no change)
-            <TemplateInput
+            <Input {...register(`outputs.${index}.text`)} fluid placeholder='eg: Timer is finished' />
-              {...register(`outputs.${index}.text`)}
-              value={watch(`outputs.${index}.text`) ?? ''}
-              fluid
-              placeholder='eg: Timer is finished'
-            />
             <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
           </label>
           <label>
@@ -126,48 +120,31 @@ export default function OntimeActionForm({
       )}
 
       {selectedAction === 'message-secondary' && (
-        <>
+        <label>
-          <label>
+          Timer secondary source
-            Text (leave empty for no change)
+          <Select<SecondarySource | 'null' | null>
-            <TemplateInput
+            onValueChange={(value) => {
-              {...register(`outputs.${index}.text`)}
+              // null -> no selection
-              value={watch(`outputs.${index}.text`) ?? ''}
+              if (value === null) return;
-              fluid
+              // 'null' -> clear the secondary source
-              placeholder='eg: Next up: keynote'
+              if (value === 'null') {
-            />
+                setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
-            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
+                return;
-          </label>
+              }
-          <label>
+              setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
-            Timer secondary source
+            }}
-            <Select<SecondarySource | 'no-change' | 'null' | null>
+            value={watch(`outputs.${index}.secondarySource`)}
-              onValueChange={(value) => {
+            options={[
-                // null -> no selection
+              { value: null, label: 'Select secondary source' },
-                if (value === null) return;
+              { value: 'aux1', label: 'Auxiliary timer 1' },
-                // no-change -> leave the current secondary source untouched
+              { value: 'aux2', label: 'Auxiliary timer 2' },
-                if (value === 'no-change') {
+              { value: 'aux3', label: 'Auxiliary timer 3' },
-                  setValue(`outputs.${index}.secondarySource`, undefined, { shouldDirty: true });
+              { value: 'secondary', label: 'Secondary' },
-                  return;
+              { value: 'null', label: 'None' }, // allow the user to clear the secondary source
-                }
+            ]}
-                // 'null' -> clear the secondary source
+          />
-                if (value === 'null') {
+          <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
-                  setValue(`outputs.${index}.secondarySource`, null, { shouldDirty: true });
+        </label>
-                  return;
-                }
-                setValue(`outputs.${index}.secondarySource`, value, { shouldDirty: true });
-              }}
-              value={watch(`outputs.${index}.secondarySource`) ?? 'no-change'}
-              options={[
-                { value: 'no-change', label: 'No change' },
-                { value: 'aux1', label: 'Auxiliary timer 1' },
-                { value: 'aux2', label: 'Auxiliary timer 2' },
-                { value: 'aux3', label: 'Auxiliary timer 3' },
-                { value: 'secondary', label: 'Secondary' },
-                { value: 'null', label: 'None' }, // allow the user to clear the secondary source
-              ]}
-            />
-            <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
-          </label>
-        </>
       )}
 
       <div className={style.test}>{children}</div>

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

@@ -79,7 +79,7 @@ export default function TriggersList(props: TriggersListProps) {
           <tbody>
             {!showForm && triggers.length === 0 && (
               <Panel.TableEmpty
-                label='Create a trigger to run an automation'
+                label='Create an automation to attach triggers to'
                 handleClick={canAdd ? () => setShowForm(true) : undefined}
               />
             )}

apps/client/src/features/app-settings/panel/automations-panel/template-input/TemplateInput.module.scss

@@ -1,67 +1,29 @@
-.inputShell {
+.wrapper {
   position: relative;
 }
 
-.fluid {
+.suggestions {
-  width: 100%;
-}
-
-.input {
-  padding-right: 2rem;
-}
-
-.expandButton {
-  position: absolute;
-  top: 50%;
-  right: 0.25rem;
-  transform: translateY(-50%);
-}
-
-.positioner {
-  outline: 0;
-}
-
-.popup {
-  box-sizing: border-box;
-  min-width: var(--anchor-width);
-  max-width: var(--available-width);
-  border: 1px solid $gray-1000;
-  border-radius: $component-border-radius-md;
   background: $gray-1250;
-  color: $label-gray;
+  color: $ui-white;
-}
 
-.list {
+  position: absolute;
-  box-sizing: border-box;
+  top: 100%;
-  max-height: min(20rem, var(--available-height));
+  left: 0;
-  overflow-y: auto;
+  width: 100%;
-  overscroll-behavior: contain;
+  margin: 0;
+  z-index: $zindex-floating;
   padding-block: 0.25rem;
-  outline: 0;
-}
 
-.item {
+  max-height: 200px;
-  box-sizing: border-box;
+  overflow-y: auto;
-  padding: 0.25rem 0.5rem;
+  color: $label-gray;
-  outline: 0;
-  cursor: default;
-  user-select: none;
-  overflow-wrap: anywhere;
 
-  &[data-highlighted] {
+  li {
+    padding: 0.25rem;
+  }
+
+  li:hover {
     color: $ui-white;
     background: $blue-700;
   }
 }
-
-.expandedEditor {
-  min-height: min(18rem, 45vh);
-  font-family: monospace;
-  line-height: 1.4;
-}
-
-.footerHint {
-  margin-right: auto;
-  color: $label-gray;
-  font-size: calc(1rem - 2px);
-}

apps/client/src/features/app-settings/panel/automations-panel/template-input/TemplateInput.tsx

@@ -1,258 +1,69 @@
-import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
+import { mergeRefs, useClickOutside } from '@mantine/hooks';
-import type { ChangeEvent, ReactNode, Ref } from 'react';
+import { forwardRef, useMemo, useState } from 'react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { IoExpandOutline } from 'react-icons/io5';
 
-import Button from '../../../../../common/components/buttons/Button';
+import Input, { type InputProps } from '../../../../../common/components/input/input/Input';
-import IconButton from '../../../../../common/components/buttons/IconButton';
-import { type InputProps } from '../../../../../common/components/input/input/Input';
-import Textarea from '../../../../../common/components/input/textarea/Textarea';
-import Modal from '../../../../../common/components/modal/Modal';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import { cx } from '../../../../../common/utils/styleUtils';
+import { makeAutoCompleteList, matchRemaining, selectFromLastTemplate } from './templateInput.utils';
-import { makeAutoCompleteList } from './templateInput.utils';
-import { useTemplateAutocomplete } from './useTemplateAutocomplete';
 
-import inputStyle from '../../../../../common/components/input/input/Input.module.scss';
 import style from './TemplateInput.module.scss';
 
-interface TemplateInputProps extends Omit<InputProps, 'value'> {
+interface TemplateInputProps extends InputProps {}
-  ref?: Ref<HTMLInputElement>;
-  value?: string;
-}
 
-interface TemplateEditorModalProps {
+const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
-  autocompleteList: string[];
+  const { value, onChange, ...rest } = props;
-  isOpen: boolean;
-  onClose: () => void;
-  onSave: (value: string) => void;
-  value: string;
-}
-
-type TemplateAutocompleteState = ReturnType<typeof useTemplateAutocomplete<HTMLInputElement>>;
-
-interface TemplateAutocompleteRootProps {
-  autocomplete: TemplateAutocompleteState;
-  children: ReactNode;
-  value: string;
-}
-
-function assignRef<T>(ref: Ref<T> | undefined, value: T | null) {
-  if (typeof ref === 'function') {
-    ref(value);
-  } else if (ref) {
-    ref.current = value;
-  }
-}
-
-function emitInputChange(name: string | undefined, value: string, onChange: InputProps['onChange']) {
-  onChange?.({
-    target: { name, value },
-    currentTarget: { name, value },
-  } as ChangeEvent<HTMLInputElement>);
-}
-
-export default function TemplateInput({
-  className,
-  disabled,
-  fluid,
-  height = 'medium',
-  onChange,
-  readOnly,
-  ref,
-  value,
-  variant = 'subtle',
-  ...rest
-}: TemplateInputProps) {
   const { data } = useCustomFields();
-  const inputRef = useRef<HTMLInputElement | null>(null);
+  const localRef = useClickOutside(() => setShowSuggestions(false));
-  const [inputValue, setInputValue] = useState(value || '');
-  const [isExpanded, setIsExpanded] = useState(false);
 
   const autocompleteList = useMemo(() => {
     return makeAutoCompleteList(data);
   }, [data]);
 
-  const updateInputValue = useCallback(
+  const [inputValue, setInputValue] = useState(value || '');
-    (nextValue: string) => {
+  const [suggestions, setSuggestions] = useState<string[]>([]);
-      setInputValue(nextValue);
+  const [showSuggestions, setShowSuggestions] = useState(false);
-      emitInputChange(rest.name, nextValue, onChange);
-    },
-    [onChange, rest.name],
-  );
 
-  const autocomplete = useTemplateAutocomplete(inputValue, autocompleteList, inputRef, updateInputValue);
+  const updateSuggestions = (value: string) => {
-  const { setCursorForValue } = autocomplete;
+    const template = selectFromLastTemplate(value);
-
+    return autocompleteList.filter((suggestion) => suggestion.startsWith(template));
-  // Keep the local autocomplete input in sync when react-hook-form resets or swaps field-array values.
-  useEffect(() => {
-    const nextValue = value || '';
-    setInputValue(nextValue);
-    setCursorForValue(nextValue, nextValue.length);
-  }, [setCursorForValue, value]);
-
-  const setInputRef = useCallback(
-    (element: HTMLInputElement | null) => {
-      inputRef.current = element;
-      assignRef(ref, element);
-    },
-    [ref],
-  );
-
-  const openExpandedEditor = () => {
-    autocomplete.setShowSuggestions(false);
-    setIsExpanded(true);
   };
 
-  const closeExpandedEditor = () => {
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setIsExpanded(false);
+    setInputValue(event.target.value);
-  };
 
-  const saveExpandedEditor = (nextValue: string) => {
+    if (event.target.value.endsWith('{')) {
-    updateInputValue(nextValue);
+      setShowSuggestions(true);
-    autocomplete.setCursorForValue(nextValue, nextValue.length);
+      setSuggestions(updateSuggestions(event.target.value));
-    setIsExpanded(false);
+    } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
-  };
+      setShowSuggestions(false);
-
+    } else if (showSuggestions) {
-  return (
+      setSuggestions(updateSuggestions(event.target.value));
-    <>
-      <TemplateAutocompleteRoot autocomplete={autocomplete} value={inputValue}>
-        <div className={cx([style.inputShell, fluid && style.fluid])}>
-          <BaseAutocomplete.Input
-            ref={setInputRef}
-            className={cx([
-              inputStyle.input,
-              inputStyle[variant],
-              inputStyle[height],
-              fluid && inputStyle.fluid,
-              style.input,
-              className,
-            ])}
-            {...rest}
-            disabled={disabled}
-            onClick={autocomplete.updateCursor}
-            onFocus={autocomplete.updateCursor}
-            onKeyUp={autocomplete.updateCursor}
-            onSelect={autocomplete.updateCursor}
-            readOnly={readOnly}
-          />
-          <IconButton
-            aria-label='Expand template editor'
-            className={style.expandButton}
-            disabled={disabled || readOnly}
-            onClick={openExpandedEditor}
-            size='small'
-            title='Expand template editor'
-            variant='ghosted-white'
-          >
-            <IoExpandOutline />
-          </IconButton>
-        </div>
-      </TemplateAutocompleteRoot>
-      <TemplateEditorModal
-        autocompleteList={autocompleteList}
-        isOpen={isExpanded}
-        onClose={closeExpandedEditor}
-        onSave={saveExpandedEditor}
-        value={inputValue}
-      />
-    </>
-  );
-}
-
-function TemplateAutocompleteRoot({ autocomplete, children, value }: TemplateAutocompleteRootProps) {
-  return (
-    <BaseAutocomplete.Root
-      items={autocomplete.suggestions}
-      autoHighlight
-      highlightItemOnHover
-      mode='none'
-      open={autocomplete.open}
-      value={value}
-      onOpenChange={autocomplete.setShowSuggestions}
-      onValueChange={autocomplete.handleValueChange}
-    >
-      {children}
-      <TemplateSuggestionPopup />
-    </BaseAutocomplete.Root>
-  );
-}
-
-function TemplateEditorModal({ autocompleteList, isOpen, onClose, onSave, value }: TemplateEditorModalProps) {
-  const expandedInputRef = useRef<HTMLTextAreaElement | null>(null);
-  const [draftValue, setDraftValue] = useState(value);
-  const autocomplete = useTemplateAutocomplete(draftValue, autocompleteList, expandedInputRef, setDraftValue);
-  const { setShowSuggestions } = autocomplete;
-
-  // Reset the draft whenever the modal opens so cancel never leaks unsaved changes.
-  useEffect(() => {
-    if (!isOpen) {
-      return;
     }
 
-    setDraftValue(value);
+    onChange?.(event);
-    setShowSuggestions(false);
-  }, [isOpen, setShowSuggestions, value]);
-
-  const handleClose = () => {
-    setShowSuggestions(false);
-    onClose();
   };
 
-  const handleSave = () => {
+  const handleSuggestion = (value: string) => {
+    setInputValue((prev) => {
+      const remaining = matchRemaining(prev as string, value);
+      return prev + remaining;
+    });
     setShowSuggestions(false);
-    onSave(draftValue);
   };
 
   return (
-    <Modal
+    <div className={style.wrapper} ref={mergeRefs(localRef, ref)}>
-      isOpen={isOpen}
+      <Input value={inputValue} {...rest} onChange={handleInputChange} fluid />
-      onClose={handleClose}
+      {showSuggestions && suggestions.length > 0 && (
-      showBackdrop
+        <ul className={style.suggestions}>
-      showCloseButton
+          {suggestions.map((suggestion) => (
-      title='Edit template'
+            <li key={suggestion} onClick={() => handleSuggestion(suggestion)}>
-      bodyElements={
+              {suggestion}
-        <TemplateAutocompleteRoot autocomplete={autocomplete} value={draftValue}>
+            </li>
-          <BaseAutocomplete.Input
+          ))}
-            autoFocus
+        </ul>
-            className={style.expandedEditor}
+      )}
-            onClick={autocomplete.updateCursor}
+    </div>
-            onFocus={autocomplete.updateCursor}
-            onKeyUp={autocomplete.updateCursor}
-            onSelect={autocomplete.updateCursor}
-            render={<Textarea ref={expandedInputRef} fluid resize='none' rows={8} />}
-          />
-        </TemplateAutocompleteRoot>
-      }
-      footerElements={
-        <>
-          <span className={style.footerHint}>Start a template with {'{{'} to see autocomplete.</span>
-          <Button onClick={handleClose}>Cancel</Button>
-          <Button onClick={handleSave} variant='primary'>
-            Save
-          </Button>
-        </>
-      }
-    />
   );
-}
+});
 
-function TemplateSuggestionPopup() {
+export default TemplateInput;
-  return (
-    <BaseAutocomplete.Portal>
-      <BaseAutocomplete.Positioner side='bottom' align='start' className={style.positioner}>
-        <BaseAutocomplete.Popup className={style.popup}>
-          <BaseAutocomplete.List className={style.list}>
-            <BaseAutocomplete.Collection>
-              {(suggestion: string) => (
-                <BaseAutocomplete.Item key={suggestion} value={suggestion} className={style.item}>
-                  {suggestion}
-                </BaseAutocomplete.Item>
-              )}
-            </BaseAutocomplete.Collection>
-          </BaseAutocomplete.List>
-        </BaseAutocomplete.Popup>
-      </BaseAutocomplete.Positioner>
-    </BaseAutocomplete.Portal>
-  );
-}

apps/client/src/features/app-settings/panel/automations-panel/template-input/__tests__/templateInput.utils.test.ts

@@ -1,4 +1,4 @@
-import { completeTemplateAtCursor, matchRemaining, selectActiveTemplate } from '../templateInput.utils';
+import { matchRemaining } from '../templateInput.utils';
 
 describe('matchRemaining()', () => {
   it('should return a partial string needed for autocomplete', () => {
@@ -15,54 +15,3 @@ describe('matchRemaining()', () => {
     expect(matchRemaining('test', 'test')).toBe('');
   });
 });
-
-describe('selectActiveTemplate()', () => {
-  it('returns the last unclosed template fragment', () => {
-    expect(selectActiveTemplate('send {{event')).toBe('{{event');
-    expect(selectActiveTemplate('send {{eventNow.title}} and {{event')).toBe('{{event');
-  });
-
-  it('ignores single braces and closed templates', () => {
-    expect(selectActiveTemplate('send {')).toBe('');
-    expect(selectActiveTemplate('send {{eventNow.title}}')).toBe('');
-  });
-
-  it('only considers templates before the cursor', () => {
-    expect(selectActiveTemplate('send {{event}} then {{timer', 14)).toBe('');
-    expect(selectActiveTemplate('send {{event}} then {{timer', 27)).toBe('{{timer');
-  });
-
-  it('selects a partial template when the cursor is inside a completed template', () => {
-    expect(selectActiveTemplate('send {{timer.current}} after', 12)).toBe('{{timer');
-  });
-});
-
-describe('completeTemplateAtCursor()', () => {
-  it('completes the active template before the cursor', () => {
-    expect(completeTemplateAtCursor('send {{timer after', '{{timer.current}}', 12)).toEqual({
-      value: 'send {{timer.current}} after',
-      cursorIndex: 22,
-    });
-  });
-
-  it('preserves text before and after the cursor', () => {
-    expect(completeTemplateAtCursor('before {{event after', '{{eventNow.title}}', 14)).toEqual({
-      value: 'before {{eventNow.title}} after',
-      cursorIndex: 25,
-    });
-  });
-
-  it('preserves a following template when completing between templates', () => {
-    expect(completeTemplateAtCursor('{{clock}} and {{timer then {{eventNow.title}}', '{{timer.current}}', 21)).toEqual({
-      value: '{{clock}} and {{timer.current}} then {{eventNow.title}}',
-      cursorIndex: 31,
-    });
-  });
-
-  it('replaces the whole template when the cursor is inside a completed template', () => {
-    expect(completeTemplateAtCursor('before {{timer.current}} after', '{{timer.duration}}', 15)).toEqual({
-      value: 'before {{timer.duration}} after',
-      cursorIndex: 25,
-    });
-  });
-});

apps/client/src/features/app-settings/panel/automations-panel/template-input/templateInput.utils.ts

@@ -54,16 +54,6 @@ const eventStaticPropertiesNext = [
   '{{eventNext.delay}}',
 ];
 
-const groupStaticPropertiesNow = [
-  '{{groupNow.id}}',
-  '{{groupNow.title}}',
-  '{{groupNow.note}}',
-  '{{groupNow.colour}}',
-  '{{groupNow.timeStart}}',
-  '{{groupNow.timeEnd}}',
-  '{{groupNow.duration}}',
-];
-
 const staticAuxProperties = (index: 1 | 2 | 3) => [
   `{{auxtimer${index}.current}}`,
   `{{auxtimer${index}.duration}}`,
@@ -85,19 +75,12 @@ export function makeAutoCompleteList(customFields: CustomFields): string[] {
     ...Object.entries(customFields).map(([key]) => `{{eventNow.custom.${key}}}`),
     ...eventStaticPropertiesNext,
     ...Object.entries(customFields).map(([key]) => `{{eventNext.custom.${key}}}`),
-    ...groupStaticPropertiesNow,
-    ...Object.entries(customFields).map(([key]) => `{{groupNow.custom.${key}}}`),
     ...staticAuxProperties(1),
     ...staticAuxProperties(2),
     ...staticAuxProperties(3),
   ];
 }
 
-interface TemplateCompletion {
-  cursorIndex: number;
-  value: string;
-}
-
 /**
  * Returns the partial string b needed to autocomplete string a
  * @example matchRemaining('te', 'test') -> 'st'
@@ -128,54 +111,13 @@ export function matchRemaining(a: string, b: string) {
   return '';
 }
 
-function getActiveTemplateRange(text: string, cursorIndex = text.length) {
-  const textBeforeCursor = text.slice(0, cursorIndex);
-  const start = textBeforeCursor.lastIndexOf('{{');
-  if (start === -1) {
-    return null;
-  }
-
-  const closeBeforeCursor = textBeforeCursor.lastIndexOf('}}');
-  if (closeBeforeCursor > start) {
-    return null;
-  }
-
-  const closeAfterStart = text.indexOf('}}', start);
-  const nextStartAfterCursor = text.indexOf('{{', cursorIndex);
-  const closesBeforeNextTemplate = nextStartAfterCursor === -1 || closeAfterStart < nextStartAfterCursor;
-  const end = closeAfterStart !== -1 && closesBeforeNextTemplate ? closeAfterStart + 2 : cursorIndex;
-
-  return {
-    end,
-    start,
-    template: text.slice(start, cursorIndex),
-  };
-}
-
 /**
- * Selects the last unclosed starting template before the cursor.
+ * Selects the last starting template in a string
  */
-export function selectActiveTemplate(text: string, cursorIndex = text.length) {
+export function selectFromLastTemplate(text: string) {
-  return getActiveTemplateRange(text, cursorIndex)?.template ?? '';
+  const lastBraceIndex = text.lastIndexOf('{{');
-}
+  if (lastBraceIndex !== -1) {
-
+    return text.slice(lastBraceIndex);
-/**
- * Replaces the active template fragment before the cursor with the selected suggestion.
- */
-export function completeTemplateAtCursor(
-  text: string,
-  suggestion: string,
-  cursorIndex = text.length,
-): TemplateCompletion {
-  const activeTemplateRange = getActiveTemplateRange(text, cursorIndex);
-  if (!activeTemplateRange) {
-    const value = text + matchRemaining(text, suggestion);
-    return { value, cursorIndex: value.length };
   }
-
+  return '';
-  const value = `${text.slice(0, activeTemplateRange.start)}${suggestion}${text.slice(activeTemplateRange.end)}`;
-  return {
-    value,
-    cursorIndex: activeTemplateRange.start + suggestion.length,
-  };
 }

apps/client/src/features/app-settings/panel/automations-panel/template-input/useTemplateAutocomplete.ts

@@ -1,72 +0,0 @@
-import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete';
-import { useCallback, useMemo, useState, type RefObject } from 'react';
-
-import { completeTemplateAtCursor, selectActiveTemplate } from './templateInput.utils';
-
-type TemplateElement = HTMLInputElement | HTMLTextAreaElement;
-
-function getCursorIndex(element: TemplateElement | null, fallback: string) {
-  return element?.selectionStart ?? fallback.length;
-}
-
-function focusCursor(element: TemplateElement | null, cursorIndex: number) {
-  requestAnimationFrame(() => {
-    element?.focus();
-    element?.setSelectionRange(cursorIndex, cursorIndex);
-  });
-}
-
-export function useTemplateAutocomplete<T extends TemplateElement>(
-  value: string,
-  autocompleteList: string[],
-  elementRef: RefObject<T | null>,
-  onValueChange: (value: string) => void,
-) {
-  const [showSuggestions, setShowSuggestions] = useState(false);
-  const [cursor, setCursor] = useState(value.length);
-
-  const activeTemplate = selectActiveTemplate(value, cursor);
-  const suggestions = useMemo(() => {
-    if (!activeTemplate) {
-      return [];
-    }
-    return autocompleteList.filter((suggestion) => suggestion.startsWith(activeTemplate));
-  }, [activeTemplate, autocompleteList]);
-
-  const setCursorForValue = useCallback((nextValue: string, cursorIndex: number) => {
-    setCursor(cursorIndex);
-    setShowSuggestions(Boolean(selectActiveTemplate(nextValue, cursorIndex)));
-  }, []);
-
-  const updateCursor = useCallback(() => {
-    const cursorIndex = getCursorIndex(elementRef.current, value);
-    setCursorForValue(value, cursorIndex);
-  }, [elementRef, setCursorForValue, value]);
-
-  const handleValueChange = useCallback(
-    (nextValue: string, eventDetails: BaseAutocomplete.Root.ChangeEventDetails) => {
-      if (eventDetails.reason === 'item-press') {
-        eventDetails.cancel();
-        const completed = completeTemplateAtCursor(value, nextValue, cursor);
-        setCursorForValue(completed.value, completed.cursorIndex);
-        onValueChange(completed.value);
-        focusCursor(elementRef.current, completed.cursorIndex);
-        return;
-      }
-
-      const cursorIndex = getCursorIndex(elementRef.current, nextValue);
-      setCursorForValue(nextValue, cursorIndex);
-      onValueChange(nextValue);
-    },
-    [cursor, elementRef, onValueChange, setCursorForValue, value],
-  );
-
-  return {
-    handleValueChange,
-    open: showSuggestions && suggestions.length > 0,
-    setCursorForValue,
-    setShowSuggestions,
-    suggestions,
-    updateCursor,
-  };
-}

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/manage-panel/sources-panel/SourcesPanel.module.scss

@@ -25,13 +25,6 @@
   margin-top: 1rem;
 }
 
-.finishActions {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  gap: 0.5rem;
-}
-
 .sourceGrid {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));

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

@@ -1,6 +1,4 @@
 import type {
-  ImportedFields,
-  RundownImportMode,
   SpreadsheetPreviewResponse,
   SpreadsheetWorksheetMetadata,
   SpreadsheetWorksheetOptions,
@@ -8,7 +6,6 @@ import type {
 import { getErrorMessage, ImportMap } from 'ontime-utils';
 import { ChangeEvent, useCallback, useRef, useState } from 'react';
 import { IoCloudOutline, IoDownloadOutline } from 'react-icons/io5';
-import { useNavigate } from 'react-router';
 
 import {
   getWorksheetMetadata as getExcelWorksheetMetadata,
@@ -25,7 +22,7 @@ import Info from '../../../../../common/components/info/Info';
 import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink';
 import Modal from '../../../../../common/components/modal/Modal';
 import useRundown from '../../../../../common/hooks-query/useRundown';
-import { removeFileExtension, validateExcelImport } from '../../../../../common/utils/uploadUtils';
+import { validateExcelImport } from '../../../../../common/utils/uploadUtils';
 import * as Panel from '../../../panel-utils/PanelUtils';
 import GSheetSetup from './GSheetSetup';
 import SheetImportEditor from './sheet-import/SheetImportEditor';
@@ -38,7 +35,6 @@ const googleSheetDocsUrl = 'https://docs.getontime.no/features/import-spreadshee
 type ActiveSource =
   | {
       kind: 'excel';
-      fileName: string;
       worksheetNames: string[];
       initialWorksheetMetadata: SpreadsheetWorksheetMetadata | null;
       closedByUser: boolean;
@@ -57,11 +53,9 @@ export default function SourcesPanel() {
   const [error, setError] = useState('');
   const [hasFile, setHasFile] = useState<'none' | 'loading' | 'done'>('none');
   const [activeSource, setActiveSource] = useState<ActiveSource | null>(null);
-  const [completedRundownTitle, setCompletedRundownTitle] = useState('');
 
   const { data: currentRundown } = useRundown();
-  const { applyImport } = useSpreadsheetImport();
+  const { importRundown } = useSpreadsheetImport();
-  const navigate = useNavigate();
 
   const fileInputRef = useRef<HTMLInputElement>(null);
 
@@ -80,7 +74,6 @@ export default function SourcesPanel() {
       const worksheetOptions = await uploadExcel(fileToUpload);
       setActiveSource({
         kind: 'excel',
-        fileName: fileToUpload.name,
         worksheetNames: worksheetOptions.worksheets,
         initialWorksheetMetadata: worksheetOptions.metadata,
         closedByUser: false,
@@ -104,7 +97,6 @@ export default function SourcesPanel() {
     setHasFile('none');
     setActiveSource(null);
     setError('');
-    setCompletedRundownTitle('');
   };
 
   const openGSheetFlow = () => {
@@ -127,41 +119,29 @@ export default function SourcesPanel() {
     }
   };
 
-  const handleFinished = (rundownTitle: string) => {
+  const handleFinished = () => {
     setImportFlow('finished');
     setHasFile('none');
     setActiveSource(null);
     setError('');
-    setCompletedRundownTitle(rundownTitle);
   };
 
-  const handleApplyImport = async (
+  const handleApplyImport = async (preview: SpreadsheetPreviewResponse) => {
-    preview: SpreadsheetPreviewResponse,
-    mode: RundownImportMode,
-    newRundownTitle: string,
-    providedFields: ImportedFields,
-  ) => {
-    if (mode === 'new') {
-      const title = newRundownTitle.trim() || preview.rundown.title;
-      await applyImport({ mode: 'new', rundown: { ...preview.rundown, title }, customFields: preview.customFields });
-      handleFinished(title);
-      return;
-    }
-
     if (!currentRundown) {
       throw new Error('No current rundown loaded');
     }
 
-    // override or merge into the current rundown; merge uses providedFields to know which columns
+    await importRundown(
-    // the sheet supplied so matched events keep the rest (e.g. automations)
+      {
-    await applyImport({
+        [currentRundown.id]: {
-      mode,
+          ...preview.rundown,
-      targetRundownId: currentRundown.id,
+          id: currentRundown.id,
-      rundown: preview.rundown,
+          title: currentRundown.title,
-      customFields: preview.customFields,
+        },
-      providedFields,
+      },
-    });
+      preview.customFields,
-    handleFinished(currentRundown.title);
+    );
+    handleFinished();
   };
 
   const loadWorksheetMetadata = useCallback(
@@ -228,13 +208,6 @@ export default function SourcesPanel() {
     if (activeSource.kind === 'excel') return 'excel';
     return `gsheet:${activeSource.sheetId}`;
   })();
-  // suggested name when importing into a new rundown: the spreadsheet file name (without extension)
-  // for Excel, or the document title for Google Sheets
-  const spreadsheetName = (() => {
-    if (!activeSource) return '';
-    if (activeSource.kind === 'excel') return removeFileExtension(activeSource.fileName);
-    return activeSource.title;
-  })();
 
   return (
     <Panel.Section>
@@ -294,20 +267,11 @@ export default function SourcesPanel() {
         {showCompleted && (
           <div className={style.finishSection}>
             <span className={style.finishBadge}>Import complete</span>
-            <div className={style.finishTitle}>
+            <div className={style.finishTitle}>Spreadsheet data applied.</div>
-              Spreadsheet data applied to {completedRundownTitle || 'your rundown'}.
+            <div className={style.finishDescription}>You can close this flow or start another import.</div>
-            </div>
+            <Button variant='subtle-white' onClick={resetFlow}>
-            <div className={style.finishDescription}>
+              Reset flow
-              Review the imported rundown in the editor or start another import.
+            </Button>
-            </div>
-            <div className={style.finishActions}>
-              <Button variant='primary' onClick={() => navigate('/editor')}>
-                Open editor
-              </Button>
-              <Button variant='subtle-white' onClick={resetFlow}>
-                Import another
-              </Button>
-            </div>
           </div>
         )}
         {isGSheetFlow && (
@@ -323,7 +287,6 @@ export default function SourcesPanel() {
           bodyElements={
             <SheetImportEditor
               sourceKey={sourceKey ?? 'spreadsheet'}
-              defaultRundownName={spreadsheetName}
               worksheetNames={activeSource?.worksheetNames ?? []}
               initialMetadata={activeSource?.initialWorksheetMetadata ?? null}
               loadMetadata={loadWorksheetMetadata}

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/ApplyImportButton.tsx

@@ -1,55 +0,0 @@
-import type { RundownImportMode, SpreadsheetPreviewResponse } from 'ontime-types';
-import { isOntimeEvent, isPlayableEvent, Playback } from 'ontime-types';
-import { useEffect, useState } from 'react';
-
-import Button from '../../../../../../common/components/buttons/Button';
-import { usePlayback, useSelectedEventId } from '../../../../../../common/hooks/useSocket';
-
-interface ApplyImportButtonProps {
-  preview: SpreadsheetPreviewResponse | null;
-  mode: RundownImportMode;
-  disabled: boolean;
-  loading: boolean;
-  onApply: () => void;
-}
-
-/**
- * Apply action for the spreadsheet import.
- * Subscribes to playback state on its own so playback updates do not re-render the whole editor.
- * Requires a second click to confirm when applying would stop a running playback.
- */
-export default function ApplyImportButton({ preview, mode, disabled, loading, onApply }: ApplyImportButtonProps) {
-  const playback = usePlayback();
-  const loadedEventId = useSelectedEventId();
-
-  // the loaded (playing) event loses its playback unless it still exists as a playable event after the import
-  const loadedEntry = loadedEventId ? preview?.rundown.entries[loadedEventId] : undefined;
-  const willLoadedEventBeOverriden = !(
-    loadedEntry !== undefined &&
-    isOntimeEvent(loadedEntry) &&
-    isPlayableEvent(loadedEntry)
-  );
-
-  // applying stops playback when creating a new rundown, or when the playing event does not survive
-  const willStopPlayback = playback !== Playback.Stop && (mode === 'new' || willLoadedEventBeOverriden);
-
-  // two-step confirmation before applying an import that stops playback
-  const [confirmStop, setConfirmStop] = useState(false);
-  useEffect(() => {
-    setConfirmStop(false);
-  }, [mode, preview]);
-
-  const handleClick = () => {
-    if (willStopPlayback && !confirmStop) {
-      setConfirmStop(true);
-      return;
-    }
-    onApply();
-  };
-
-  return (
-    <Button variant='primary' onClick={handleClick} disabled={disabled} loading={loading}>
-      {willStopPlayback && confirmStop ? 'Confirm — stop playback & apply import' : 'Apply import'}
-    </Button>
-  );
-}

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/SheetImportEditor.module.scss

@@ -33,11 +33,6 @@
   white-space: nowrap;
 }
 
-.importModeTrigger {
-  min-width: 12rem;
-  justify-content: space-between;
-}
-
 .addColumnTrigger {
   justify-content: center;
   white-space: nowrap;
@@ -92,10 +87,6 @@
   font-weight: 600;
 }
 
-.toolbarWarning {
-  color: $orange-400;
-}
-
 .mappingPaneTitle {
   align-self: center;
 }

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/SheetImportEditor.tsx

@@ -1,20 +1,10 @@
-import type {
+import type { SpreadsheetPreviewResponse, SpreadsheetWorksheetMetadata } from 'ontime-types';
-  ImportedFields,
-  RundownImportMode,
-  SpreadsheetPreviewResponse,
-  SpreadsheetWorksheetMetadata,
-} from 'ontime-types';
 import type { ImportMap } from 'ontime-utils';
-import { useMemo } from 'react';
+import { IoArrowUpOutline, IoEye } from 'react-icons/io5';
-import { IoArrowUpOutline, IoCheckmark, IoChevronDown, IoEye, IoWarningOutline } from 'react-icons/io5';
 
 import Button from '../../../../../../common/components/buttons/Button';
-import { DropdownMenu, DropdownMenuOption } from '../../../../../../common/components/dropdown-menu/DropdownMenu';
-import Input from '../../../../../../common/components/input/input/Input';
 import Select from '../../../../../../common/components/select/Select';
 import * as Panel from '../../../../panel-utils/PanelUtils';
-import ApplyImportButton from './ApplyImportButton';
-import { isIdColumnMapped } from './importMapUtils';
 import PreviewTable from './preview/PreviewTable';
 import SheetImportMappingPane from './SheetImportMappingPane';
 import { useSheetImportForm } from './useSheetImportForm';
@@ -23,46 +13,17 @@ import style from './SheetImportEditor.module.scss';
 
 interface SheetImportEditorProps {
   sourceKey: string;
-  defaultRundownName: string;
   worksheetNames: string[];
   initialMetadata: SpreadsheetWorksheetMetadata | null;
   loadMetadata: (worksheet: string) => Promise<SpreadsheetWorksheetMetadata>;
   previewImport: (importMap: ImportMap) => Promise<SpreadsheetPreviewResponse>;
-  onApply: (
+  onApply: (preview: SpreadsheetPreviewResponse) => Promise<void>;
-    preview: SpreadsheetPreviewResponse,
-    mode: RundownImportMode,
-    newRundownTitle: string,
-    providedFields: ImportedFields,
-  ) => Promise<void>;
   onCancel: () => void;
   onExport?: (importMap: ImportMap) => Promise<void>;
 }
 
-const importModeOptions: Array<{
-  value: RundownImportMode;
-  label: string;
-  description: string;
-}> = [
-  {
-    value: 'override',
-    label: 'Replace current rundown',
-    description: 'Spreadsheet data completely replaces current rundown',
-  },
-  {
-    value: 'merge',
-    label: 'Merge with current rundown',
-    description: 'Merge entries referencing their IDs, entries not present in spreadsheet rundown are deleted',
-  },
-  {
-    value: 'new',
-    label: 'New rundown',
-    description: 'Create a new rundown to import the data into. Loads the new rundown',
-  },
-];
-
 export default function SheetImportEditor({
   sourceKey,
-  defaultRundownName,
   worksheetNames,
   initialMetadata,
   loadMetadata,
@@ -88,16 +49,11 @@ export default function SheetImportEditor({
     isBusy,
     canPreview,
     displayError,
-    importMode,
-    setImportMode,
-    newRundownTitle,
-    setNewRundownTitle,
     handlePreviewSubmit,
     handleExportSubmit,
     handleApply,
   } = useSheetImportForm({
     sourceKey,
-    defaultRundownName,
     worksheetNames,
     initialMetadata,
     loadMetadata,
@@ -106,19 +62,6 @@ export default function SheetImportEditor({
     onExport,
   });
 
-  const selectedImportMode = importModeOptions.find((option) => option.value === importMode) ?? importModeOptions[0];
-  const importModeItems = useMemo<DropdownMenuOption[]>(
-    () =>
-      importModeOptions.map((option) => ({
-        type: 'item',
-        label: option.label,
-        description: option.description,
-        icon: importMode === option.value ? IoCheckmark : undefined,
-        onClick: () => setImportMode(option.value),
-      })),
-    [importMode, setImportMode],
-  );
-
   return (
     <Panel.Section as='form' id='spreadsheet-import-workspace' className={style.editor} onSubmit={handlePreviewSubmit}>
       <Panel.InlineElements align='apart' wrap='wrap' className={style.editorToolbar}>
@@ -132,16 +75,7 @@ export default function SheetImportEditor({
             }
           />
         </label>
-        {toolbarStatus && (
+        {toolbarStatus && <Panel.Description>{toolbarStatus}</Panel.Description>}
-          <Panel.Description>
-            {toolbarStatus.entries === '–'
-              ? 'No import preview yet'
-              : `${toolbarStatus.entries} entries · ${toolbarStatus.groups} groups · ${toolbarStatus.milestones} milestones · ${toolbarStatus.start}–${toolbarStatus.end} · ${toolbarStatus.duration}`}
-            {toolbarStatus.warnings > 0 && (
-              <span className={style.toolbarWarning}> · {toolbarStatus.warnings} warnings</span>
-            )}
-          </Panel.Description>
-        )}
       </Panel.InlineElements>
 
       <div className={style.editorBody}>
@@ -159,19 +93,13 @@ export default function SheetImportEditor({
 
         <section className={style.previewPane}>
           <div className={style.previewPaneHeader}>
-            <div className={style.previewPaneHeading}>
+            <span className={style.previewPaneTitle}>Import preview</span>
-              <span className={style.previewPaneTitle}>Import preview</span>
-            </div>
           </div>
           <div className={style.tableShell}>
             <PreviewTable
               preview={state.preview}
               columnLabels={columnLabels}
-              canRefresh={canPreview}
               isLoadingMetadata={isLoadingMetadata}
-              isRefreshing={state.loading === 'preview'}
-              needsPreviewRefresh={state.needsPreviewRefresh}
-              onRefresh={handlePreviewSubmit}
               worksheetHeaders={worksheetHeaders}
             />
           </div>
@@ -179,63 +107,33 @@ export default function SheetImportEditor({
       </div>
 
       {displayError && <Panel.Error>{displayError}</Panel.Error>}
-      {importMode === 'merge' && !isIdColumnMapped(values) && (
+      <Panel.InlineElements align='end' wrap='wrap' className={style.editorFooter}>
-        <Panel.Description tone='warning'>
+        <Button onClick={onCancel} disabled={isBusy}>
-          <IoWarningOutline /> No ID column mapped — merge matches entries by ID, so it will behave like Replace. Export
+          Cancel
-          your rundown to a spreadsheet first to keep its IDs.
+        </Button>
-        </Panel.Description>
+        {onExport && (
-      )}
+          <Button onClick={handleExportSubmit} disabled={!canPreview} loading={state.loading === 'export'}>
-      <Panel.InlineElements align='apart' wrap='wrap' className={style.editorFooter}>
+            <IoArrowUpOutline />
-        <Panel.InlineElements wrap='wrap'>
+            Export
-          <label className={style.worksheetControl}>
-            <span className={style.worksheetLabel}>Import mode</span>
-            <DropdownMenu
-              render={<Button className={style.importModeTrigger} variant='subtle-white' />}
-              items={importModeItems}
-            >
-              {selectedImportMode.label}
-              <IoChevronDown />
-            </DropdownMenu>
-          </label>
-          {importMode === 'new' && (
-            <label className={style.worksheetControl}>
-              <span className={style.worksheetLabel}>New rundown name</span>
-              <Input
-                value={newRundownTitle}
-                onChange={(event) => setNewRundownTitle(event.target.value)}
-                placeholder={state.preview?.rundown.title || 'Imported rundown'}
-                aria-label='New rundown name'
-              />
-            </label>
-          )}
-        </Panel.InlineElements>
-        <Panel.InlineElements wrap='wrap'>
-          <Button onClick={onCancel} disabled={isBusy}>
-            Cancel
           </Button>
-          {onExport && (
+        )}
-            <Button onClick={handleExportSubmit} disabled={!canPreview} loading={state.loading === 'export'}>
+        <Button
-              <IoArrowUpOutline />
+          variant={state.preview ? undefined : 'primary'}
-              Export
+          onClick={handlePreviewSubmit}
-            </Button>
+          disabled={!canPreview}
-          )}
+          loading={state.loading === 'preview'}
-          <Button
+        >
-            variant={state.preview ? undefined : 'primary'}
+          <IoEye />
-            onClick={handlePreviewSubmit}
+          Preview import
-            disabled={!canPreview}
+        </Button>
-            loading={state.loading === 'preview'}
+        <Button
-          >
+          variant='primary'
-            <IoEye />
+          onClick={handleApply}
-            Preview import
+          disabled={!state.preview || isBusy}
-          </Button>
+          loading={state.loading === 'apply'}
-          <ApplyImportButton
+        >
-            preview={state.preview}
+          Apply import
-            mode={importMode}
+        </Button>
-            disabled={!state.preview || isBusy}
-            loading={state.loading === 'apply'}
-            onApply={handleApply}
-          />
-        </Panel.InlineElements>
       </Panel.InlineElements>
     </Panel.Section>
   );

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/__tests__/importMapUtils.test.ts

@@ -1,21 +1,15 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 import {
   builtInFieldDefs,
   convertToImportMap,
   createDefaultFormValues,
-  defaultImportMode,
   getImportWarnings,
-  getPersistedImportMode,
-  getProvidedImportFields,
   getResolvedCustomFields,
-  isIdColumnMapped,
-  persistImportMode,
 } from '../importMapUtils';
 
 const cueIndex = builtInFieldDefs.findIndex((field) => field.label === 'Cue');
 const titleIndex = builtInFieldDefs.findIndex((field) => field.label === 'Title');
-const idIndex = builtInFieldDefs.findIndex((field) => field.importKey === 'id');
 
 describe('getImportWarnings()', () => {
   it('warns when two mappings target the same spreadsheet column', () => {
@@ -134,64 +128,3 @@ describe('convertToImportMap()', () => {
     });
   });
 });
-
-describe('getProvidedImportFields()', () => {
-  it('reports the mapped built-in and custom fields the sheet supplies', () => {
-    const values = createDefaultFormValues();
-    values.builtIn[titleIndex] = { header: 'title', enabled: true };
-    values.builtIn[cueIndex] = { header: '', enabled: false };
-    values.custom = [{ ontimeName: 'ignored', importName: 'FOH/Monitor' }];
-
-    const provided = getProvidedImportFields(convertToImportMap(values));
-
-    // enabled built-in mappings are reported as event fields, disabled ones are not
-    expect(provided.event).toContain('title');
-    expect(provided.event).not.toContain('cue');
-    // the id column is only used for matching, never overwritten
-    expect(provided.event).not.toContain('id');
-    // custom fields are reported symmetrically by their resolved Ontime name
-    expect(provided.custom).toStrictEqual(['FOH Monitor']);
-  });
-});
-
-describe('isIdColumnMapped()', () => {
-  it('is true when the ID field is enabled with a header', () => {
-    // the default form maps the ID column
-    expect(isIdColumnMapped(createDefaultFormValues())).toBe(true);
-  });
-
-  it('is false when the ID field is disabled', () => {
-    const values = createDefaultFormValues();
-    values.builtIn[idIndex] = { header: 'id', enabled: false };
-    expect(isIdColumnMapped(values)).toBe(false);
-  });
-
-  it('is false when the ID field header is blank', () => {
-    const values = createDefaultFormValues();
-    values.builtIn[idIndex] = { header: '   ', enabled: true };
-    expect(isIdColumnMapped(values)).toBe(false);
-  });
-});
-
-describe('import mode persistence', () => {
-  const sourceKey = 'excel-test';
-
-  beforeEach(() => {
-    localStorage.clear();
-  });
-
-  it('defaults to override when nothing is persisted', () => {
-    expect(getPersistedImportMode(sourceKey)).toBe('override');
-    expect(defaultImportMode).toBe('override');
-  });
-
-  it('round-trips a persisted value', () => {
-    persistImportMode(sourceKey, 'merge');
-    expect(getPersistedImportMode(sourceKey)).toBe('merge');
-  });
-
-  it('falls back to the default when the persisted value is invalid', () => {
-    persistImportMode(sourceKey, 'nonsense' as never);
-    expect(getPersistedImportMode(sourceKey)).toBe('override');
-  });
-});

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/importMapUtils.ts

@@ -1,4 +1,3 @@
-import type { ImportedFields, RundownImportMode } from 'ontime-types';
 import type { ImportMap } from 'ontime-utils';
 
 import { makeStageKey } from '../../../../../../common/utils/localStorage';
@@ -50,16 +49,6 @@ export function createDefaultFormValues(): ImportFormValues {
   };
 }
 
-/**
- * Whether the mapping supplies an ID column. Merge matches entries by ID, so without one every
- * imported entry gets a fresh id and nothing can reconcile with the current rundown.
- */
-export function isIdColumnMapped(values: ImportFormValues): boolean {
-  const idIndex = builtInFieldDefs.findIndex((def) => def.importKey === 'id');
-  const field = values.builtIn[idIndex];
-  return Boolean(field?.enabled && field.header.trim());
-}
-
 function sanitiseOntimeCustomFieldLabel(importName: string): string {
   // Replace punctuation with spaces, then collapse repeated whitespace into single spaces.
   const sanitised = importName
@@ -92,24 +81,6 @@ export function getResolvedCustomFields(customFields: ImportFormValues['custom']
   });
 }
 
-/**
- * Returns the fields the import map supplies — the complete description of what the incoming data
- * provides, for both built-in and custom fields. A merge uses this to patch exactly these fields
- * onto a matched event and keep everything else (e.g. automations) untouched.
- * Import-map keys are OntimeEvent field names; `worksheet`/`custom` are meta and `id` is only used
- * for matching, not overwritten.
- */
-export function getProvidedImportFields(importMap: ImportMap): ImportedFields {
-  const event: string[] = [];
-  for (const [key, value] of Object.entries(importMap)) {
-    if (key === 'worksheet' || key === 'custom' || key === 'id') continue;
-    if (typeof value === 'string' && value.trim() !== '') {
-      event.push(key);
-    }
-  }
-  return { event, custom: Object.keys(importMap.custom) };
-}
-
 export function convertToImportMap(values: ImportFormValues): ImportMap {
   const custom = getResolvedCustomFields(values.custom).reduce<Record<string, string>>(
     (accumulator, { ontimeName, importName }) => {
@@ -159,12 +130,12 @@ function isPersistedFormValues(obj: unknown): obj is ImportFormValues {
 export function getPersistedImportState(sourceKey: string): { values: ImportFormValues; isPersisted: boolean } {
   const storageKey = getImportMapKey(sourceKey);
   try {
-    const persistedData = localStorage.getItem(storageKey);
+    const raw = localStorage.getItem(storageKey);
-    if (!persistedData) {
+    if (!raw) {
       return { values: createDefaultFormValues(), isPersisted: false };
     }
 
-    const parsed: unknown = JSON.parse(persistedData);
+    const parsed: unknown = JSON.parse(raw);
     if (isPersistedFormValues(parsed)) {
       return { values: parsed, isPersisted: true };
     }
@@ -179,32 +150,6 @@ export function getPersistedImportState(sourceKey: string): { values: ImportForm
   }
 }
 
-/**
- * The import mode (new / merge / override) is persisted separately from the field mapping
- * so the mapping schema guard stays untouched.
- */
-
-/** Default import mode: replace matched elements in the current rundown */
-export const defaultImportMode: RundownImportMode = 'override';
-
-function getImportModeKey(sourceKey: string) {
-  return makeStageKey(`import-mode:${sourceKey}`);
-}
-
-/** Persists the import mode for a given source */
-export function persistImportMode(sourceKey: string, mode: RundownImportMode) {
-  localStorage.setItem(getImportModeKey(sourceKey), mode);
-}
-
-/** Reads the persisted import mode for a source, falling back to the default when absent or invalid */
-export function getPersistedImportMode(sourceKey: string): RundownImportMode {
-  const persisted = localStorage.getItem(getImportModeKey(sourceKey));
-  if (persisted === 'new' || persisted === 'merge' || persisted === 'override') {
-    return persisted;
-  }
-  return defaultImportMode;
-}
-
 /**
  * Validates import mappings and generates warnings for duplicate or missing spreadsheet columns.
  */

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/preview/PreviewTable.module.scss

@@ -1,35 +1,27 @@
 .emptyState {
-  padding: 3rem 1.5rem;
+  height: 100%;
+  min-height: 16rem;
+  display: grid;
+  place-content: center;
+  gap: 0.35rem;
+  padding: 1.5rem;
   text-align: center;
 }
 
-.emptyMessage {
-  width: min(30rem, 100%);
-  margin-inline: auto;
-}
-
 .emptyTitle {
-  margin-bottom: 0.25rem;
+  color: $ui-white;
-  color: rgba($gray-200, 0.72);
+  font-size: 1rem;
-  font-size: calc(1rem + 2px);
+  font-weight: 600;
-  font-weight: 400;
 }
 
 .emptyBody {
-  color: rgba($gray-200, 0.55);
+  color: $gray-400;
-  font-size: calc(1rem - 3px);
+  font-size: 0.95rem;
-  line-height: 1.5;
-}
-
-.emptyAction {
-  margin: 1rem auto 0;
 }
 
 .table {
   width: 100%;
-  border-collapse: separate;
+  border-collapse: collapse;
-  border-spacing: 0;
-  color: $ui-white;
   font-size: calc(1rem - 2px);
   text-align: left;
   table-layout: auto;
@@ -42,101 +34,31 @@
   }
 
   th {
-    color: $gray-300;
+    font-weight: 400;
-    font-size: 0.8rem;
+    color: $gray-400;
-    font-weight: 600;
+    text-transform: capitalize;
-    letter-spacing: 0.02em;
+    vertical-align: top;
-    text-transform: uppercase;
-    vertical-align: bottom;
     white-space: normal;
   }
 
   th,
   td {
-    box-sizing: border-box;
+    padding: 0.5rem;
     min-width: 8rem;
-    max-width: 20rem;
+    vertical-align: top;
-    padding: 0.55rem 0.65rem;
-    border-bottom: 1px solid $white-10;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: middle;
-    white-space: nowrap;
   }
 
-  tbody tr {
+  tr:nth-child(even) {
-    --entry-colour: transparent;
+    background-color: $white-1;
-    background-color: color-mix(in srgb, $gray-1300 96%, var(--entry-colour) 4%);
-    box-shadow: inset 3px 0 var(--entry-colour);
   }
-
-  td[data-empty='true'] {
-    color: $gray-600;
-  }
-}
-
-.rowNumber,
-.rowType {
-  position: sticky;
-  z-index: 1;
-  background-color: inherit;
 }
 
 .rowNumber {
-  left: 0;
+  width: 4.5rem;
-  width: 3.25rem;
+  min-width: 4.5rem;
-  min-width: 3.25rem !important;
-  color: $gray-400;
-  text-align: right;
 }
 
 .rowType {
-  left: 3.25rem;
+  width: 7rem;
-  width: 6.25rem;
+  min-width: 7rem;
-  min-width: 6.25rem !important;
-  color: $gray-400;
-  font-size: 0.8rem;
-  box-shadow: 1px 0 $white-10;
-}
-
-thead .rowNumber,
-thead .rowType {
-  z-index: 2;
-  background-color: $gray-1350;
-}
-
-.numericCell {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-}
-
-.multilineCell {
-  max-width: 30rem !important;
-  overflow-wrap: anywhere;
-  text-overflow: clip !important;
-  white-space: pre-wrap !important;
-}
-
-.eventRow {
-  .rowNumber {
-    font-variant-numeric: tabular-nums;
-  }
-}
-
-.groupRow {
-  background-color: color-mix(in srgb, $gray-1300 88%, var(--entry-colour) 12%) !important;
-  box-shadow: inset 4px 0 var(--entry-colour) !important;
-  font-weight: 600;
-
-  td {
-    min-height: 3.25rem;
-    border-top: 0.75rem solid $gray-1350;
-  }
-}
-
-.milestoneRow {
-  background-color: color-mix(in srgb, $gray-1300 93%, var(--entry-colour) 7%) !important;
-  box-shadow: inset 3px 0 var(--entry-colour) !important;
-  color: $gray-300;
-  font-style: italic;
 }

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/preview/PreviewTable.tsx

@@ -1,11 +1,7 @@
 import type { CustomField, CustomFieldKey, SpreadsheetPreviewResponse } from 'ontime-types';
-import { isOntimeDelay, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
-import type { CSSProperties } from 'react';
 import { useMemo } from 'react';
 
-import Button from '../../../../../../../common/components/buttons/Button';
-import Tag from '../../../../../../../common/components/tag/Tag';
-import { getRundownMetadata } from '../../../../../../../common/utils/rundownMetadata';
 import { getCellValue } from './previewTableUtils';
 
 import style from './PreviewTable.module.scss';
@@ -13,85 +9,14 @@ import style from './PreviewTable.module.scss';
 interface PreviewTableProps {
   preview: SpreadsheetPreviewResponse | null;
   columnLabels: string[];
-  canRefresh: boolean;
   isLoadingMetadata: boolean;
-  isRefreshing: boolean;
-  needsPreviewRefresh: boolean;
-  onRefresh: () => void;
   worksheetHeaders: string[];
 }
 
-const priorityColumns = ['Title', 'Cue', 'Start', 'End', 'Duration'];
-const numericColumns = new Set(['Start', 'End', 'Duration', 'Time warning', 'Time danger']);
-const transparentColour = 'transparent';
-
-type PreviewEntry = SpreadsheetPreviewResponse['rundown']['entries'][string];
-
-function getEntryDisplay(entry: PreviewEntry, groupColour?: string) {
-  if (isOntimeGroup(entry)) {
-    return {
-      rowClassName: style.groupRow,
-      entryColour: entry.colour,
-      entryType: 'Group',
-    };
-  }
-
-  const entryColour = groupColour ?? transparentColour;
-
-  if (isOntimeMilestone(entry)) {
-    return {
-      rowClassName: style.milestoneRow,
-      entryColour,
-      entryType: 'Milestone',
-    };
-  }
-
-  if (isOntimeDelay(entry)) {
-    return {
-      rowClassName: style.eventRow,
-      entryColour,
-      entryType: 'Delay',
-    };
-  }
-
-  return {
-    rowClassName: style.eventRow,
-    entryColour,
-    entryType: 'Event',
-  };
-}
-
-function getCellClassName(label: string, value: string) {
-  if (value.includes('\n')) {
-    return style.multilineCell;
-  }
-
-  if (numericColumns.has(label)) {
-    return style.numericCell;
-  }
-
-  return undefined;
-}
-
-function getDisplayColumns(columnLabels: string[]) {
-  return [...columnLabels].sort((left, right) => {
-    const leftPriority = priorityColumns.indexOf(left);
-    const rightPriority = priorityColumns.indexOf(right);
-    return (
-      (leftPriority === -1 ? priorityColumns.length : leftPriority) -
-      (rightPriority === -1 ? priorityColumns.length : rightPriority)
-    );
-  });
-}
-
 export default function PreviewTable({
   preview,
   columnLabels,
-  canRefresh,
   isLoadingMetadata,
-  isRefreshing,
-  needsPreviewRefresh,
-  onRefresh,
   worksheetHeaders,
 }: PreviewTableProps) {
   const customFieldKeyByLabel = useMemo(() => {
@@ -99,57 +24,33 @@ export default function PreviewTable({
     return new Map(Object.entries(preview.customFields).map(([fieldId, field]) => [field.label, fieldId]));
   }, [preview]);
 
-  const displayColumns = useMemo(() => getDisplayColumns(columnLabels), [columnLabels]);
-
-  const previewMetadata = useMemo(() => {
-    if (!preview) return null;
-    return getRundownMetadata(preview.rundown, null);
-  }, [preview]);
-
   if (!preview) {
-    let emptyTitle = 'Preview not generated';
     let emptyContent = 'Select the fields you want to import, then click Preview import.';
 
     if (isLoadingMetadata) {
-      emptyTitle = 'Loading worksheet';
       emptyContent = 'Loading worksheet metadata...';
     } else if (worksheetHeaders.length === 0) {
-      emptyTitle = 'No headers found';
       emptyContent =
         'No column headers detected in this worksheet. Try a different worksheet or ensure the first row contains column headers.';
-    } else if (needsPreviewRefresh) {
-      emptyTitle = 'Preview needs updating';
-      emptyContent = 'Your column mapping changed. Preview the import again to update this table.';
     }
 
     return (
       <div className={style.emptyState}>
-        <div className={style.emptyMessage}>
+        <div className={style.emptyTitle}>Preview not generated</div>
-          <div className={style.emptyTitle}>{emptyTitle}</div>
+        <div className={style.emptyBody}>{emptyContent}</div>
-          <div className={style.emptyBody}>{emptyContent}</div>
-          {needsPreviewRefresh && (
-            <Button
-              className={style.emptyAction}
-              variant='primary'
-              onClick={onRefresh}
-              disabled={!canRefresh}
-              loading={isRefreshing}
-            >
-              Refresh preview
-            </Button>
-          )}
-        </div>
       </div>
     );
   }
 
+  let eventIndex = 0;
+
   return (
     <table className={style.table}>
       <thead>
         <tr>
           <th className={style.rowNumber}>#</th>
           <th className={style.rowType}>Type</th>
-          {displayColumns.map((label, index) => (
+          {columnLabels.map((label, index) => (
             <th key={`${label}-${index}`}>{label}</th>
           ))}
         </tr>
@@ -158,29 +59,16 @@ export default function PreviewTable({
         {preview.rundown.flatOrder.map((entryId) => {
           const entry = preview.rundown.entries[entryId];
           const isEvent = isOntimeEvent(entry);
-          const entryMetadata = previewMetadata?.[entryId];
+          if (isEvent) eventIndex++;
-          const { rowClassName, entryColour, entryType } = getEntryDisplay(entry, entryMetadata?.groupColour);
+          const hasType = isEvent || isOntimeGroup(entry) || isOntimeMilestone(entry);
 
           return (
-            <tr key={entryId} className={rowClassName} style={{ '--entry-colour': entryColour } as CSSProperties}>
+            <tr key={entryId}>
-              <td className={style.rowNumber}>{isEvent ? entryMetadata?.eventIndex : ''}</td>
+              <td className={style.rowNumber}>{isEvent ? eventIndex : ''}</td>
-              <td className={style.rowType}>
+              <td className={style.rowType}>{hasType ? entry.type : ''}</td>
-                <Tag>{entryType}</Tag>
+              {columnLabels.map((label, colIndex) => (
-              </td>
+                <td key={`${entryId}-${colIndex}`}>{getCellValue(label, entry, customFieldKeyByLabel)}</td>
-              {displayColumns.map((label, colIndex) => {
+              ))}
-                const value = getCellValue(label, entry, customFieldKeyByLabel);
-                const cellClassName = getCellClassName(label, value);
-                return (
-                  <td
-                    key={`${entryId}-${colIndex}`}
-                    className={cellClassName}
-                    data-empty={value === ''}
-                    title={value || undefined}
-                  >
-                    {value}
-                  </td>
-                );
-              })}
             </tr>
           );
         })}

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/sheet-import/useSheetImportForm.ts

@@ -1,13 +1,7 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import type {
+import type { SpreadsheetPreviewResponse, SpreadsheetWorksheetMetadata } from 'ontime-types';
-  ImportedFields,
+import { millisToString } from 'ontime-utils';
-  RundownImportMode,
+import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
-  SpreadsheetPreviewResponse,
-  SpreadsheetWorksheetMetadata,
-} from 'ontime-types';
-import { isOntimeGroup, isOntimeMilestone } from 'ontime-types';
-import { millisToString, removeTrailingZero } from 'ontime-utils';
-import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 
 import { maybeAxiosError } from '../../../../../../common/api/utils';
@@ -17,11 +11,8 @@ import {
   builtInFieldDefs,
   convertToImportMap,
   getImportWarnings,
-  getPersistedImportMode,
   getPersistedImportState,
-  getProvidedImportFields,
   getResolvedCustomFields,
-  persistImportMode,
   persistImportState,
 } from './importMapUtils';
 import { deriveHeaderOptionsState } from './spreadsheetImportUtils';
@@ -33,7 +24,7 @@ type ImportAction =
   | { type: 'previewSuccess'; preview: SpreadsheetPreviewResponse }
   | { type: 'applySuccess' }
   | { type: 'exportSuccess' }
-  | { type: 'clearPreview'; error?: string; needsRefresh?: boolean }
+  | { type: 'clearPreview'; error?: string }
   | { type: 'failure'; error: string }
   | { type: 'reset' };
 
@@ -41,14 +32,12 @@ type ImportState = {
   loading: '' | 'preview' | 'apply' | 'export';
   error: string;
   preview: SpreadsheetPreviewResponse | null;
-  needsPreviewRefresh: boolean;
 };
 
 const initialImportState: ImportState = {
   loading: '',
   error: '',
   preview: null,
-  needsPreviewRefresh: false,
 };
 
 function importReducer(state: ImportState, action: ImportAction): ImportState {
@@ -60,15 +49,15 @@ function importReducer(state: ImportState, action: ImportAction): ImportState {
     case 'startExport':
       return { ...state, loading: 'export', error: '' };
     case 'previewSuccess':
-      return { loading: '', error: '', preview: action.preview, needsPreviewRefresh: false };
+      return { loading: '', error: '', preview: action.preview };
     case 'applySuccess':
     case 'exportSuccess':
       return { ...state, loading: '' };
     case 'clearPreview':
-      return { ...state, error: action.error ?? '', preview: null, needsPreviewRefresh: action.needsRefresh ?? false };
+      return { ...state, error: action.error ?? '', preview: null };
     case 'failure': {
       if (state.loading === 'preview') {
-        return { loading: '', error: action.error, preview: null, needsPreviewRefresh: false };
+        return { loading: '', error: action.error, preview: null };
       }
       return { ...state, loading: '', error: action.error };
     }
@@ -111,23 +100,16 @@ function buildColumnLabels(values: ImportFormValues): string[] {
 
 interface UseSheetImportFormProps {
   sourceKey: string;
-  defaultRundownName: string;
   worksheetNames: string[];
   initialMetadata: SpreadsheetWorksheetMetadata | null;
   loadMetadata: (worksheet: string) => Promise<SpreadsheetWorksheetMetadata>;
   previewImport: (importMap: ReturnType<typeof convertToImportMap>) => Promise<SpreadsheetPreviewResponse>;
-  onApply: (
+  onApply: (preview: SpreadsheetPreviewResponse) => Promise<void>;
-    preview: SpreadsheetPreviewResponse,
-    mode: RundownImportMode,
-    newRundownTitle: string,
-    providedFields: ImportedFields,
-  ) => Promise<void>;
   onExport?: (importMap: ReturnType<typeof convertToImportMap>) => Promise<void>;
 }
 
 export function useSheetImportForm({
   sourceKey,
-  defaultRundownName,
   worksheetNames,
   initialMetadata,
   loadMetadata,
@@ -188,8 +170,6 @@ export function useSheetImportForm({
   const columnLabels = buildColumnLabels(values);
 
   const [state, dispatch] = useReducer(importReducer, initialImportState);
-  const [importMode, setImportMode] = useState<RundownImportMode>(() => getPersistedImportMode(sourceKey));
-  const [newRundownTitle, setNewRundownTitle] = useState(defaultRundownName);
   const warnings = getImportWarnings(values, headers);
   const warningCount = Object.values(warnings).filter(Boolean).length;
   const previewRef = useRef<SpreadsheetPreviewResponse | null>(null);
@@ -202,12 +182,6 @@ export function useSheetImportForm({
     dispatch({ type: 'reset' });
   }, [initialFormValues, reset]);
 
-  // Update import mode and rundown name if the source changes
-  useEffect(() => {
-    setImportMode(getPersistedImportMode(sourceKey));
-    setNewRundownTitle(defaultRundownName);
-  }, [sourceKey, defaultRundownName]);
-
   // Keep the worksheet selection valid if the available worksheets change underneath the form.
   useEffect(() => {
     if (worksheetNames.length === 0) return;
@@ -224,7 +198,7 @@ export function useSheetImportForm({
     const sub = watch(() => {
       if (!previewRef.current) return;
       previewRef.current = null;
-      dispatch({ type: 'clearPreview', needsRefresh: true });
+      dispatch({ type: 'clearPreview' });
     });
     return () => sub.unsubscribe();
   }, [watch]);
@@ -267,15 +241,13 @@ export function useSheetImportForm({
 
     try {
       dispatch({ type: 'startApply' });
-      const providedFields = getProvidedImportFields(convertToImportMap(getValues()));
+      await onApply(state.preview);
-      await onApply(state.preview, importMode, newRundownTitle, providedFields);
       persistImportState(sourceKey, getValues());
-      persistImportMode(sourceKey, importMode);
       dispatch({ type: 'applySuccess' });
     } catch (error) {
       dispatch({ type: 'failure', error: maybeAxiosError(error) });
     }
-  }, [getValues, importMode, newRundownTitle, onApply, sourceKey, state.preview]);
+  }, [getValues, onApply, sourceKey, state.preview]);
 
   const handleExport = useCallback(
     async (formValues: ImportFormValues) => {
@@ -300,37 +272,15 @@ export function useSheetImportForm({
   }, [append]);
 
   const toolbarStatus = (() => {
+    const warningText = warningCount > 0 ? ` | warnings: ${warningCount}` : '';
+
     if (!state.preview) {
-      return {
+      return `entries: – | start: – | end: – | duration: –${warningText}`;
-        entries: '–',
-        groups: '–',
-        milestones: '–',
-        start: '–',
-        end: '–',
-        duration: '–',
-        warnings: warningCount,
-      };
     }
 
-    const { entries, flatOrder } = state.preview.rundown;
+    const { flatOrder } = state.preview.rundown;
     const { start, end, duration } = state.preview.summary;
-    let groups = 0;
+    return `entries: ${flatOrder.length} | start: ${millisToString(start)} | end: ${millisToString(end)} | duration: ${formatDuration(duration)}${warningText}`;
-    let milestones = 0;
-    for (const entryId of flatOrder) {
-      const entry = entries[entryId];
-      if (isOntimeGroup(entry)) groups++;
-      else if (isOntimeMilestone(entry)) milestones++;
-    }
-
-    return {
-      entries: flatOrder.length,
-      groups,
-      milestones,
-      start: removeTrailingZero(millisToString(start)),
-      end: removeTrailingZero(millisToString(end)),
-      duration: formatDuration(duration),
-      warnings: warningCount,
-    };
   })();
 
   return {
@@ -350,10 +300,6 @@ export function useSheetImportForm({
     isBusy,
     canPreview,
     displayError,
-    importMode,
-    setImportMode,
-    newRundownTitle,
-    setNewRundownTitle,
     handlePreviewSubmit: handleSubmit(handlePreview),
     handleExportSubmit: handleSubmit(handleExport),
     handleApply,

apps/client/src/features/app-settings/panel/manage-panel/sources-panel/useSpreadsheetImport.ts

@@ -1,17 +1,30 @@
-import { RundownImportPayload } from 'ontime-types';
+import { useQueryClient } from '@tanstack/react-query';
+import { CustomFields, ProjectRundowns } from 'ontime-types';
 import { useCallback } from 'react';
 
-import { importRundownWithOptions } from '../../../../../common/api/rundown';
+import { CUSTOM_FIELDS, RUNDOWN } from '../../../../../common/api/constants';
+import { patchData } from '../../../../../common/api/db';
 
 export default function useSpreadsheetImport() {
-  /** applies a spreadsheet import: override or merge into the current rundown, or create a new one */
+  const queryClient = useQueryClient();
-  const applyImport = useCallback(async (payload: RundownImportPayload) => {
+
-    // the backend broadcasts a refetch once the rundown is parsed and applied, so the caches update
+  /** applies rundown and customFields to current project */
-    // through that single path rather than racing it with an optimistic write from here
+  const importRundown = useCallback(
-    await importRundownWithOptions(payload);
+    async (rundowns: ProjectRundowns, customFields: CustomFields) => {
-  }, []);
+      await patchData({ rundowns, customFields });
+      // we are unable to optimistically set the rundown since we need
+      // it to be normalised
+      await queryClient.invalidateQueries({
+        queryKey: RUNDOWN,
+      });
+      await queryClient.invalidateQueries({
+        queryKey: CUSTOM_FIELDS,
+      });
+    },
+    [queryClient],
+  );
 
   return {
-    applyImport,
+    importRundown,
   };
 }

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

@@ -1,49 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { generateUrl } from '../../../../common/api/session';
-import CopyTag from '../../../../common/components/copy-tag/CopyTag';
-import { serverURL } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-export default function McpSection() {
-  const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
-
-  // generate url
-  useEffect(() => {
-    // the page origin is reachable wherever the user is browsing from,
-    // and follows the deployment (cloud, reverse proxy, port mappings)
-    // we are reusing the endpoint, so locking config and nav have no effect
-    generateUrl({ baseUrl: serverURL, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
-      .then(setMcpEndpointUrl)
-      .catch(() => {
-        setMcpEndpointUrl('');
-      });
-  }, []);
-
-  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.ListGroup>
-          <Panel.ListItem>
-            <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
-            {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
-          </Panel.ListItem>
-          <Panel.ListItem>
-            <Panel.Field
-              title='Client configuration snippet'
-              description='Paste this into your AI agent settings under "mcpServers"'
-            />
-            {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
-          </Panel.ListItem>
-        </Panel.ListGroup>
-      </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/control/playback/playback-timer/PlaybackTimer.module.scss

@@ -73,10 +73,6 @@
   margin-right: 0.25rem;
 }
 
-.tagOvertime {
-  color: $playback-over;
-}
-
 .time {
   color: $section-white;
   font-size: $text-body-size;

apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx

@@ -1,13 +1,12 @@
 import { MaybeNumber, Playback, TimerPhase } from 'ontime-types';
-import { millisToString } from 'ontime-utils';
+import { dayInMs, millisToString } from 'ontime-utils';
 import { PropsWithChildren } from 'react';
 
 import AppLink from '../../../../common/components/link/app-link/AppLink';
 import Tooltip from '../../../../common/components/tooltip/Tooltip';
 import useReport from '../../../../common/hooks-query/useReport';
-import { useTimerProgress } from '../../../../common/hooks/useSocket';
+import { useTimer } from '../../../../common/hooks/useSocket';
-import { cx } from '../../../../common/utils/styleUtils';
+import { formatDuration } from '../../../../common/utils/time';
-import { formatDuration, normaliseWallClock } from '../../../../common/utils/time';
 import TimerDisplay from '../timer-display/TimerDisplay';
 
 import style from './PlaybackTimer.module.scss';
@@ -25,14 +24,15 @@ function resolveAddedTimeLabel(addedTime: number) {
 }
 
 export default function PlaybackTimer({ children }: PropsWithChildren) {
-  'use memo';
+  const timer = useTimer();
-  const timer = useTimerProgress();
 
   const isRolling = timer.playback === Playback.Roll;
   const isWaiting = timer.phase === TimerPhase.Pending;
   const isOvertime = timer.phase === TimerPhase.Overtime;
   const hasAddedTime = Boolean(timer.addedTime);
+
   const rollLabel = isRolling ? 'Roll mode active' : '';
+
   const addedTimeLabel = resolveAddedTimeLabel(timer.addedTime);
 
   return (
@@ -51,13 +51,7 @@ export default function PlaybackTimer({ children }: PropsWithChildren) {
         {isWaiting ? (
           <span className={style.rolltag}>Roll: Countdown to start</span>
         ) : (
-          <RunningStatus
+          <RunningStatus startedAt={timer.startedAt} expectedFinish={timer.expectedFinish} playback={timer.playback} />
-            startedAt={timer.startedAt}
-            expectedFinish={timer.expectedFinish}
-            isStopped={timer.playback === Playback.Stop}
-            isCountToEnd={timer.isCountToEnd}
-            isOvertime={isOvertime}
-          />
         )}
       </div>
       {children}
@@ -68,18 +62,16 @@ export default function PlaybackTimer({ children }: PropsWithChildren) {
 interface RunningStatusProps {
   startedAt: MaybeNumber;
   expectedFinish: MaybeNumber;
-  isStopped: boolean;
+  playback: Playback;
-  isCountToEnd: boolean;
-  isOvertime: boolean;
 }
-
+function RunningStatus({ startedAt, expectedFinish, playback }: RunningStatusProps) {
-function RunningStatus({ startedAt, expectedFinish, isStopped, isCountToEnd, isOvertime }: RunningStatusProps) {
+  if (playback === Playback.Stop) {
-  if (isStopped) {
     return <StoppedStatus />;
   }
 
   const started = millisToString(startedAt);
-  const finish = millisToString(expectedFinish === null ? null : normaliseWallClock(expectedFinish));
+  const finishedMs = expectedFinish !== null ? expectedFinish % dayInMs : null;
+  const finish = millisToString(finishedMs);
 
   return (
     <>
@@ -88,9 +80,7 @@ function RunningStatus({ startedAt, expectedFinish, isStopped, isCountToEnd, isO
         <span className={style.time}>{started}</span>
       </span>
       <span className={style.finish}>
-        <span className={cx([style.tag, isOvertime && style.tagOvertime])}>
+        <span className={style.tag}>Expect end</span>
-          {isCountToEnd ? 'Scheduled end' : 'Expected end'}
-        </span>
         <span className={style.time}>{finish}</span>
       </span>
     </>

apps/client/src/features/operator/Operator.tsx

@@ -1,7 +1,6 @@
 import { OntimeView, isOntimeEvent, isOntimeGroup } from 'ontime-types';
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import EmptyFill from '../../common/components/state/EmptyFill';
 import EmptyPage from '../../common/components/state/EmptyPage';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
@@ -11,7 +10,6 @@ import { cx } from '../../common/utils/styleUtils';
 import { throttle } from '../../common/utils/throttle';
 import { getDefaultFormat } from '../../common/utils/time';
 import { isTouchDevice } from '../../externals';
-import { useTranslation } from '../../translation/TranslationProvider';
 import Loader from '../../views/common/loader/Loader';
 import CustomFieldEditModal from './custom-field-edit-modal/CustomFieldEditModal';
 import FollowButton from './follow-button/FollowButton';
@@ -37,7 +35,7 @@ export default function OperatorLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <Operator {...data} />;
@@ -45,7 +43,6 @@ export default function OperatorLoader() {
 
 function Operator({ rundown, rundownMetadata, customFields, settings }: OperatorData) {
   const selectedEventId = useSelectedEventId();
-  const { getLocalizedString } = useTranslation();
   const { subscribe, mainSource, secondarySource, shouldEdit, hidePast, showStart } = useOperatorOptions();
 
   const [showEditPrompt, setShowEditPrompt] = useState(false);
@@ -116,7 +113,6 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
   const operatorOptions = useMemo(() => getOperatorOptions(customFields, defaultFormat), [customFields, defaultFormat]);
 
   const canEdit = shouldEdit && subscribe.length;
-  const hasEvents = rundown.order.length > 0;
 
   return (
     <div className={style.operatorContainer} data-testid='operator-view'>
@@ -131,121 +127,110 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
         </div>
       )}
 
-      {!hasEvents ? (
+      <div className={style.operatorEvents} onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
-        <EmptyFill text={getLocalizedString('common.no_data')} />
+        {rundown.order.map((entryId) => {
-      ) : (
+          const entry = rundown.entries[entryId];
-        <div className={style.operatorEvents} onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
+          if (isOntimeEvent(entry)) {
-          {rundown.order.map((entryId) => {
+            const { isPast, isLinkedToLoaded, isLoaded, totalGap } = rundownMetadata[entryId];
-            const entry = rundown.entries[entryId];
+            // hide past events (if setting) and skipped events
-            if (isOntimeEvent(entry)) {
+            if ((hidePast && isPast) || entry.skip) {
-              const { isPast, isLinkedToLoaded, isLoaded, totalGap } = rundownMetadata[entryId];
+              return null;
-              // hide past events (if setting) and skipped events
-              if ((hidePast && isPast) || entry.skip) {
-                return null;
-              }
-
-              const { mainField, secondaryField, subscribedData } = getEventData(
-                entry,
-                mainSource,
-                secondarySource,
-                subscribe,
-                customFields,
-              );
-
-              return (
-                <OperatorEvent
-                  key={entry.id}
-                  id={entry.id}
-                  colour={entry.colour}
-                  cue={entry.cue}
-                  main={mainField}
-                  secondary={secondaryField}
-                  timeStart={entry.timeStart}
-                  duration={entry.duration}
-                  delay={entry.delay}
-                  dayOffset={entry.dayOffset}
-                  isLinkedToLoaded={isLinkedToLoaded}
-                  isSelected={isLoaded}
-                  isPast={isPast}
-                  selectedRef={isLoaded ? selectedRef : undefined}
-                  showStart={showStart}
-                  subscribed={subscribedData}
-                  totalGap={totalGap}
-                  onLongPress={canEdit ? handleEdit : () => undefined}
-                />
-              );
             }
 
-            if (isOntimeGroup(entry)) {
+            const { mainField, secondaryField, subscribedData } = getEventData(
-              const { isPast } = rundownMetadata[entry.id];
+              entry,
+              mainSource,
+              secondarySource,
+              subscribe,
+              customFields,
+            );
 
-              const isCurrentParent = selectedEventId ? rundownMetadata[selectedEventId]?.groupId === entry.id : false;
+            return (
+              <OperatorEvent
+                key={entry.id}
+                id={entry.id}
+                colour={entry.colour}
+                cue={entry.cue}
+                main={mainField}
+                secondary={secondaryField}
+                timeStart={entry.timeStart}
+                duration={entry.duration}
+                delay={entry.delay}
+                dayOffset={entry.dayOffset}
+                isLinkedToLoaded={isLinkedToLoaded}
+                isSelected={isLoaded}
+                isPast={isPast}
+                selectedRef={isLoaded ? selectedRef : undefined}
+                showStart={showStart}
+                subscribed={subscribedData}
+                totalGap={totalGap}
+                onLongPress={canEdit ? handleEdit : () => undefined}
+              />
+            );
+          }
 
-              if (hidePast && isPast && !isCurrentParent) {
+          if (isOntimeGroup(entry)) {
-                return null;
+            const { isPast } = rundownMetadata[entry.id];
-              }
 
-              return (
+            const isCurrentParent = selectedEventId ? rundownMetadata[selectedEventId]?.groupId === entry.id : false;
-                <Fragment key={entry.id}>
-                  <OperatorGroup
-                    key={entry.id}
-                    title={entry.title}
-                    colour={entry.colour}
-                    count={entry.entries.length}
-                    duration={entry.duration}
-                  />
-                  {entry.entries.map((nestedEntryId) => {
-                    const nestedEntry = rundown.entries[nestedEntryId];
-                    if (!isOntimeEvent(nestedEntry)) {
-                      return null;
-                    }
 
-                    const { isPast, isLoaded, isLinkedToLoaded, totalGap } = rundownMetadata[nestedEntryId];
+            if (hidePast && isPast && !isCurrentParent) {
-
+              return null;
-                    // hide past events (if setting) and skipped events
-                    if ((hidePast && isPast) || nestedEntry.skip) {
-                      return null;
-                    }
-
-                    const { mainField, secondaryField, subscribedData } = getEventData(
-                      nestedEntry,
-                      mainSource,
-                      secondarySource,
-                      subscribe,
-                      customFields,
-                    );
-
-                    return (
-                      <OperatorEvent
-                        key={nestedEntry.id}
-                        id={nestedEntry.id}
-                        colour={nestedEntry.colour}
-                        cue={nestedEntry.cue}
-                        main={mainField}
-                        secondary={secondaryField}
-                        timeStart={nestedEntry.timeStart}
-                        duration={nestedEntry.duration}
-                        delay={nestedEntry.delay}
-                        dayOffset={nestedEntry.dayOffset}
-                        isLinkedToLoaded={isLinkedToLoaded}
-                        isSelected={isLoaded}
-                        isPast={isPast}
-                        groupColour={entry.colour}
-                        selectedRef={isLoaded ? selectedRef : undefined}
-                        showStart={showStart}
-                        subscribed={subscribedData}
-                        totalGap={totalGap}
-                        onLongPress={canEdit ? handleEdit : () => undefined}
-                      />
-                    );
-                  })}
-                </Fragment>
-              );
             }
-            return null;
+
-          })}
+            return (
-        </div>
+              <Fragment key={entry.id}>
-      )}
+                <OperatorGroup key={entry.id} title={entry.title} />
+                {entry.entries.map((nestedEntryId) => {
+                  const nestedEntry = rundown.entries[nestedEntryId];
+                  if (!isOntimeEvent(nestedEntry)) {
+                    return null;
+                  }
+
+                  const { isPast, isLoaded, isLinkedToLoaded, totalGap } = rundownMetadata[nestedEntryId];
+
+                  // hide past events (if setting) and skipped events
+                  if ((hidePast && isPast) || nestedEntry.skip) {
+                    return null;
+                  }
+
+                  const { mainField, secondaryField, subscribedData } = getEventData(
+                    nestedEntry,
+                    mainSource,
+                    secondarySource,
+                    subscribe,
+                    customFields,
+                  );
+
+                  return (
+                    <OperatorEvent
+                      key={nestedEntry.id}
+                      id={nestedEntry.id}
+                      colour={nestedEntry.colour}
+                      cue={nestedEntry.cue}
+                      main={mainField}
+                      secondary={secondaryField}
+                      timeStart={nestedEntry.timeStart}
+                      duration={nestedEntry.duration}
+                      delay={nestedEntry.delay}
+                      dayOffset={nestedEntry.dayOffset}
+                      isLinkedToLoaded={isLinkedToLoaded}
+                      isSelected={isLoaded}
+                      isPast={isPast}
+                      selectedRef={isLoaded ? selectedRef : undefined}
+                      showStart={showStart}
+                      subscribed={subscribedData}
+                      totalGap={totalGap}
+                      onLongPress={canEdit ? handleEdit : () => undefined}
+                    />
+                  );
+                })}
+              </Fragment>
+            );
+          }
+          return null;
+        })}
+      </div>
       <FollowButton isVisible={lockAutoScroll} onClickHandler={handleOffset} />
     </div>
   );

apps/client/src/features/operator/operator-event/OperatorEvent.module.scss

@@ -22,39 +22,17 @@
     background-color: $gray-1250;
   }
 
-  &.grouped {
-    position: relative;
-    padding-left: 0.35rem;
-    background:
-      linear-gradient(90deg, color-mix(in srgb, transparent 88%, var(--group-colour, $gray-500) 12%), transparent 8rem),
-      $viewer-card-bg-color;
-  }
-
   &.running {
     border-top: 1px solid $gray-1300;
     background-color: var(--operator-running-bg-override, $active-green);
   }
 
-  &.grouped.running {
-    background:
-      linear-gradient(90deg, color-mix(in srgb, transparent 82%, var(--group-colour, $gray-500) 18%), transparent 8rem),
-      var(--operator-running-bg-override, $active-green);
-  }
-
   &.past {
     border-top: 1px solid transparent;
     opacity: 0.2;
   }
 }
 
-.groupRail {
-  position: absolute;
-  inset-block: 0;
-  left: 0;
-  width: 0.35rem;
-  background-color: var(--group-colour, $gray-500);
-}
-
 .binder {
   grid-area: binder;
   color: $section-white;
@@ -96,9 +74,6 @@
 .plannedStart,
 .timeUntil,
 .runningTime {
-  display: flex;
-  align-items: center;
-  gap: 0.25rem;
   border-radius: $component-border-radius-md;
   padding: 0.25rem 0.5rem;
   line-height: 1;
@@ -120,21 +95,6 @@
   letter-spacing: 1px;
 }
 
-.live {
-  color: $ui-black;
-  background-color: $ui-white;
-}
-
-.due {
-  color: $ui-black;
-  background-color: $orange-500;
-}
-
-.done {
-  color: $white-60;
-  background-color: $white-7;
-}
-
 .runningTime {
   grid-area: running;
   font-size: 1.25rem;