refactor: allow secondary rundowns (#2086)

* refactor: allow secondary rundowns

* ui: move dropdown

* feat: follow loaded

* ui: background edit warning

ui: fix disable radio button

* feat(ui): add loaded sufix in the rundown list

* feat(ui): add direct link to background edit from rundown manager

* fix: better fallback

* fix: default to is isCurrentRundown for nav bar colour

* chore: rename navigate to cuesheet

---------

Co-authored-by: alex-arc <ac@omnivox.dk>

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

@@ -34,19 +34,17 @@ export async function fetchCurrentRundown(options?: RequestOptions): Promise<Run
     throw new Error('Invalid rundown payload');
   }
   return res.data;
+}
 
-  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'
-    );
+/**
+ * HTTP request to fetch all entries in the given rundown
+ */
+export async function fetchRundown(rundownId: RundownId, options?: RequestOptions): Promise<Rundown> {
+  const res = await axios.get(`${rundownPath}/${rundownId}`, { signal: options?.signal });
+  if (!isValidRundown(res.data)) {
+    throw new Error('Invalid rundown payload');
   }
+  return res.data;
 }
 
 /**
@@ -197,3 +195,16 @@ 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/hooks-query/useProjectRundowns.ts

@@ -12,6 +12,7 @@ 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 } from '../api/rundown';
+import { fetchCurrentRundown, fetchRundown } from '../api/rundown';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
 import { useProjectRundowns } from './useProjectRundowns';
@@ -20,7 +20,11 @@ const cachedRundownPlaceholder: Rundown = {
 };
 
 /**
- * Normalised rundown data
+ * Normalised rundown data for the currently loaded rundown.
+ *
+ * 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();
@@ -34,7 +38,7 @@ export default function useRundown() {
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  // Seed the ID-based cache when fetching via the 'current' alias (bootstrap)
+  // Seed the id-keyed cache when fetching via the bootstrap alias
   useEffect(() => {
     if (!data || loadedRundownId) return;
     queryClient.setQueryData(getRundownQueryKey(data.id), data);
@@ -115,3 +119,21 @@ export function useRundownAuxData() {
   }, [data]);
   return { data: filteredData, status };
 }
+
+/**
+ * Provides access to a specific rundown by ID.
+ * When rundownId is null/undefined the query is disabled and returns the placeholder.
+ */
+export function useRundownById(rundownId: string | null | undefined) {
+  const enabled = Boolean(rundownId);
+
+  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
+    queryKey: getRundownQueryKey(rundownId ?? ''),
+    queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
+    enabled,
+    placeholderData: (previousData, _previousQuery) => previousData,
+    refetchInterval: queryRefetchIntervalSlow,
+  });
+
+  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
+}

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

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

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

@@ -63,9 +63,16 @@ export type EventOptions = Partial<{
 }>;
 
 /**
- * Gather utilities for actions on entries
+ * Gather utilities for actions on entries in the loaded rundown.
  */
-export const useEntryActions = () => {
+export const useEntryActions = () => useEntryActionsForRundown(undefined);
+
+/**
+ * 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,
@@ -78,12 +85,12 @@ export const useEntryActions = () => {
   } = useEditorSettings();
 
   const resolveCurrentRundownQueryKey = useCallback(() => {
-    const loadedRundownId = queryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-    if (loadedRundownId) {
-      return getRundownQueryKey(loadedRundownId);
+    if (scopedRundownId !== undefined) {
+      return getRundownQueryKey(scopedRundownId);
     }
-    return CURRENT_RUNDOWN_QUERY_KEY;
-  }, [queryClient]);
+    const loadedRundownId = queryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
+    return loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
+  }, [queryClient, scopedRundownId]);
 
   /**
    * Returns the currently loaded rundown
@@ -1004,7 +1011,7 @@ export const useEntryActions = () => {
       updateTimer,
     ],
   );
-};
+}
 
 /**
  * Utility to optimistically delete entries from client cache

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

@@ -14,8 +14,8 @@ import {
   APP_SETTINGS,
   CLIENT_LIST,
   CSS_OVERRIDE,
-  CUSTOM_FIELDS,
   CURRENT_RUNDOWN_QUERY_KEY,
+  CUSTOM_FIELDS,
   PROJECT_DATA,
   REPORT,
   RUNDOWN,
@@ -213,6 +213,9 @@ 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;
@@ -242,7 +245,9 @@ export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: s
   // skip if we dont recognise the ID the revision is lower
   const queryKey = getRundownQueryKey(rundownId);
   const cachedRundown = ontimeQueryClient.getQueryData<{ revision: number }>(queryKey);
-  if (revision !== null && revision === cachedRundown?.revision) {
+
+  if (revision === cachedRundown?.revision) {
+    // we already have the latest change
     return;
   }
 

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

@@ -9,6 +9,7 @@ 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';
@@ -19,6 +20,7 @@ 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';
@@ -97,6 +99,8 @@ export default function ManageRundowns() {
     await downloadAsExcel(rundownId, title);
   };
 
+  const navigateToCuesheet = useDirectLinkToBackgroundEdit();
+
   return (
     <>
       <Panel.Section>
@@ -180,6 +184,12 @@ 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/rundown/RundownExport.tsx

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/server/src/api-data/rundown/__mocks__/rundown.mocks.ts

@@ -1,11 +1,13 @@
 import {
   CustomField,
+  EntryId,
   OntimeDelay,
   OntimeEvent,
   OntimeGroup,
   OntimeMilestone,
   Rundown,
   SupportedEntry,
+  isOntimeGroup,
 } from 'ontime-types';
 
 import { makeNewRundown } from '../../../models/dataModel.js';
@@ -59,13 +61,24 @@ export function makeOntimeMilestone(patch: Partial<OntimeMilestone>): OntimeMile
 }
 
 /**
- * Utility to create a rundown object
+ * Utility to create a rundown object.
+ * Derives flatOrder from order/entries when the patch does not provide one,
+ * so test fixtures match the shape of a processed rundown.
  */
 export function makeRundown(patch: Partial<Rundown>): Rundown {
-  return {
-    ...makeNewRundown(),
-    ...patch,
-  };
+  const rundown = { ...makeNewRundown(), ...patch };
+  if (!patch.flatOrder) {
+    const flatOrder: EntryId[] = [];
+    for (const id of rundown.order) {
+      flatOrder.push(id);
+      const entry = rundown.entries[id];
+      if (isOntimeGroup(entry)) {
+        flatOrder.push(...entry.entries);
+      }
+    }
+    rundown.flatOrder = flatOrder;
+  }
+  return rundown;
 }
 
 export function makeCustomField(patch: Partial<CustomField>): CustomField {

apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts

@@ -63,7 +63,7 @@ describe('createTransaction', () => {
     expect(typeof commit).toBe('function');
   });
 
-  it('should return the updated data after commit is called and writes are scheduled', () => {
+  it('should return the updated data after commit is called and writes are scheduled', async () => {
     const { rundown, customFields, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: true });
     rundown.title = 'Another Title';
     customFields['newField'] = {
@@ -72,8 +72,7 @@ describe('createTransaction', () => {
       colour: 'blue',
     };
 
-    const updated = commit();
-    vi.runAllTimers();
+    const updated = await commit();
 
     expect(updated.rundown.title).toBe('Another Title');
     expect(updated.customFields).toHaveProperty('newField');
@@ -132,6 +131,23 @@ describe('processRundown()', () => {
     expect(initResult.entries['3'].type).toBe(SupportedEntry.Delay);
   });
 
+  it('produces order, flatOrder and applies delays to following events', () => {
+    const rundown = makeRundown({
+      order: ['1', 'delay', '2'],
+      entries: {
+        '1': makeOntimeEvent({ id: '1', timeStart: 0, timeEnd: 1000, duration: 1000 }),
+        delay: makeOntimeDelay({ id: 'delay', duration: 250 }),
+        '2': makeOntimeEvent({ id: '2', timeStart: 1000, timeEnd: 2000, duration: 1000 }),
+      },
+    });
+
+    const processed = processRundown(rundown, {});
+
+    expect(processed.order).toEqual(['1', 'delay', '2']);
+    expect(processed.flatEntryOrder).toEqual(['1', 'delay', '2']);
+    expect((processed.entries['2'] as OntimeEvent).delay).toBe(250);
+  });
+
   it('calculates delays versions of a given rundown', () => {
     const rundown = makeRundown({
       order: ['1', '2'],
@@ -1622,6 +1638,34 @@ describe('rundownMutation.applyDelay()', () => {
       },
     });
   });
+
+  it('uses the passed rundown own order, not the loaded rundown metadata', () => {
+    // The loaded rundown has completely different events
+    const loadedRundown = makeRundown({
+      order: ['loaded-delay', 'loaded-ev'],
+      entries: {
+        'loaded-delay': makeOntimeDelay({ id: 'loaded-delay', duration: 9999 }),
+        'loaded-ev': makeOntimeEvent({ id: 'loaded-ev', timeStart: 0, timeEnd: 100, duration: 100 }),
+      },
+    });
+    rundownCache.init(loadedRundown, {});
+
+    // Background rundown is independent of the loaded one
+    const bgRundown = makeRundown({
+      order: ['bg-delay', 'bg-ev'],
+      entries: {
+        'bg-delay': makeOntimeDelay({ id: 'bg-delay', duration: 500 }),
+        'bg-ev': makeOntimeEvent({ id: 'bg-ev', timeStart: 0, timeEnd: 200, duration: 200 }),
+      },
+    });
+
+    rundownMutation.applyDelay(bgRundown, bgRundown.entries['bg-delay'] as OntimeDelay);
+
+    // bg-ev must be shifted by its own delay (500), not influenced by the loaded rundown
+    expect((bgRundown.entries['bg-ev'] as OntimeEvent).timeStart).toBe(500);
+    // loaded-ev must be untouched
+    expect((loadedRundown.entries['loaded-ev'] as OntimeEvent).timeStart).toBe(0);
+  });
 });
 
 describe('rundownMutation.swap()', () => {

apps/server/src/api-data/rundown/rundown.dao.ts

@@ -82,56 +82,85 @@ export const getEntryWithId = (entryId: EntryId): OntimeEntry | undefined => cac
 type Transaction = {
   customFields: CustomFields;
   rundown: Rundown;
-  rundownMetadata: Readonly<RundownMetadata>;
 
-  commit: (shouldProcess?: boolean) => {
+  commit: (shouldProcess?: boolean) => Promise<{
     rundown: Readonly<Rundown>;
-    rundownMetadata: Readonly<RundownMetadata>;
+    rundownMetadata: Readonly<RundownMetadata> | null;
     customFields: Readonly<CustomFields>;
     revision: Readonly<number>;
-  };
+  }>;
 };
 
 type TransactionOptions = {
   mutableRundown?: boolean;
   mutableCustomFields?: boolean;
+  /**
+   * Target rundown ID. Defaults to the loaded rundown.
+   * When targeting a non-loaded ("background") rundown, the cache and runtime
+   * metadata are bypassed — the rundown is read from disk and persisted directly.
+   */
+  rundownId?: string;
 };
 
 export function createTransaction(options: TransactionOptions): Transaction {
-  const rundown = options.mutableRundown ? structuredClone(cachedRundown) : cachedRundown;
+  const targetId = options.rundownId ?? cachedRundown.id;
+  const isLoaded = targetId === cachedRundown.id;
+  const sourceRundown: Rundown = isLoaded ? cachedRundown : (getDataProvider().getRundown(targetId) as Rundown);
+  const rundown = options.mutableRundown ? structuredClone(sourceRundown) : sourceRundown;
   const customFields = options.mutableCustomFields ? structuredClone(projectCustomFields) : projectCustomFields;
 
   /**
-   * Applies a mutated rundown to the cache
+   * Applies a mutated rundown to its persistence target
    * @param shouldProcess - whether the rundown should be processed after the commit
    *                        Some edit mutations, and custom field changes do not require processing
    */
-  function commit(shouldProcess: boolean = true) {
+  async function commit(shouldProcess: boolean = true) {
+    let committedRundown: Readonly<Rundown> = isLoaded ? cachedRundown : rundown;
+    let committedMetadata: RundownMetadata | null = isLoaded ? rundownMetadata : null;
+    let committedRevision: number = sourceRundown.revision;
+
     // if the rundown is mutable we persist the changes
     if (options.mutableRundown) {
-      // update fields which are agnostic of whether the rundown is processed
-      cachedRundown.revision = cachedRundown.revision + 1;
-      cachedRundown.title = rundown.title;
+      if (isLoaded) {
+        // update fields which are agnostic of whether the rundown is processed
+        cachedRundown.revision = cachedRundown.revision + 1;
+        cachedRundown.title = rundown.title;
 
-      if (!shouldProcess) {
-        // if we dont need to process, we just reassign the commit data to the cache
-        cachedRundown.entries = rundown.entries;
-        cachedRundown.order = rundown.order;
-        cachedRundown.flatOrder = rundown.flatOrder;
+        if (!shouldProcess) {
+          // if we dont need to process, we just reassign the commit data to the cache
+          cachedRundown.entries = rundown.entries;
+          cachedRundown.order = rundown.order;
+          cachedRundown.flatOrder = rundown.flatOrder;
+        } else {
+          const processedData = processRundown(rundown, projectCustomFields, { mutate: true });
+          // update the cache values
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
+          const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
+
+          cachedRundown.entries = entries;
+          cachedRundown.order = order;
+          cachedRundown.flatOrder = metadata.flatEntryOrder;
+          rundownMetadata = metadata;
+        }
+
+        // persist after all mutations are applied
+        await getDataProvider().setRundown(cachedRundown.id, cachedRundown);
+        committedRundown = cachedRundown;
+        committedMetadata = rundownMetadata;
+        committedRevision = cachedRundown.revision;
       } else {
-        const processedData = processRundown(rundown, projectCustomFields);
-        // update the cache values
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
-        const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
-
-        cachedRundown.entries = entries;
-        cachedRundown.order = order;
-        cachedRundown.flatOrder = metadata.flatEntryOrder;
-        rundownMetadata = metadata;
+        // background rundown: process if requested, persist directly, no runtime metadata
+        rundown.revision = rundown.revision + 1;
+        if (shouldProcess) {
+          const processedData = processRundown(rundown, projectCustomFields, { mutate: true });
+          rundown.entries = processedData.entries;
+          rundown.order = processedData.order;
+          rundown.flatOrder = processedData.flatEntryOrder;
+        }
+        await getDataProvider().setRundown(targetId, rundown);
+        committedRundown = rundown;
+        committedRevision = rundown.revision;
       }
-
-      // persist after all mutations are applied
-      getDataProvider().setRundown(cachedRundown.id, cachedRundown);
     }
 
     // if the customFields are mutable we persist the changes
@@ -139,21 +168,20 @@ export function createTransaction(options: TransactionOptions): Transaction {
       projectCustomFields = customFields;
 
       // persist after reassignment
-      getDataProvider().setCustomFields(projectCustomFields);
+      await getDataProvider().setCustomFields(projectCustomFields);
     }
 
     return {
-      rundown: cachedRundown,
-      rundownMetadata,
+      rundown: committedRundown,
+      rundownMetadata: committedMetadata,
       customFields: projectCustomFields,
-      revision: cachedRundown.revision,
+      revision: committedRevision,
     };
   }
 
   return {
     customFields,
     rundown,
-    rundownMetadata,
     commit,
   };
 }
@@ -288,11 +316,11 @@ function reorder(rundown: Rundown, eventFrom: OntimeEntry, eventTo: OntimeEntry,
  * Mutates the given rundown
  */
 function applyDelay(rundown: Rundown, delay: OntimeDelay) {
-  const delayIndex = rundownMetadata.flatEntryOrder.indexOf(delay.id);
+  const delayIndex = rundown.flatOrder.indexOf(delay.id);
 
   // if the delay is empty, or the last element
   // there is nothing do apply
-  if (delay.duration === 0 || delayIndex === rundownMetadata.flatEntryOrder.length - 1) {
+  if (delay.duration === 0 || delayIndex === rundown.flatOrder.length - 1) {
     return;
   }
 
@@ -305,8 +333,8 @@ function applyDelay(rundown: Rundown, delay: OntimeDelay) {
   let lastEntry: OntimeEvent | null = null;
   let isFirstEvent = true;
 
-  for (let i = delayIndex + 1; i < rundownMetadata.flatEntryOrder.length; i++) {
-    const currentId = rundownMetadata.flatEntryOrder[i];
+  for (let i = delayIndex + 1; i < rundown.flatOrder.length; i++) {
+    const currentId = rundown.flatOrder[i];
     const currentEntry = rundown.entries[currentId];
 
     // we don't do operation on other event types
@@ -588,6 +616,23 @@ export async function updateBackgroundRundown(rundownId: string, rundown: Rundow
   await getDataProvider().setRundown(rundownId, rundown);
 }
 
+/**
+ * Reads a rundown from disk and returns it in the processed shape used by clients.
+ * Used for non-loaded rundowns — the loaded rundown is served directly from cache.
+ */
+export function getProcessedRundown(rundownId: string): Rundown {
+  const stored = getDataProvider().getRundown(rundownId);
+  const processed = processRundown(stored, getDataProvider().getCustomFields());
+  return {
+    id: stored.id,
+    title: stored.title,
+    entries: processed.entries,
+    order: processed.order,
+    flatOrder: processed.flatEntryOrder,
+    revision: stored.revision,
+  };
+}
+
 /**
  * Adds a new custom field to the object and returns it
  */
@@ -666,7 +711,7 @@ export const customFieldMutation = {
 export function init(initialRundown: Readonly<Rundown>, initialCustomFields: Readonly<CustomFields>) {
   const rundown = structuredClone(initialRundown);
   const customFields = structuredClone(initialCustomFields);
-  const processedData = processRundown(rundown, customFields);
+  const processedData = processRundown(rundown, customFields, { mutate: true });
 
   // update the cache values
   cachedRundown.id = rundown.id;
@@ -699,72 +744,57 @@ export const rundownCache = {
 };
 
 /**
- * Utility updates cache after a mutation
- * Handles calculating the rundown metadata
+ * Computes derived rundown metadata (delays, gaps, group times, ordered lists).
+ * By default the input rundown is not mutated — entries are cloned as they are processed.
+ * Callers that own a writable rundown can pass `{ mutate: true }` to skip the per-entry clone.
  * @private should not be called outside of `rundown.dao.ts`, exported for testing
  */
 export function processRundown(
   initialRundown: Readonly<Rundown>,
   customFields: Readonly<CustomFields>,
+  options?: { mutate?: boolean },
 ): ProcessedRundownMetadata {
-  const { process, getMetadata } = makeRundownMetadata(customFields);
+  const { process, getMetadata } = makeRundownMetadata(customFields, options);
 
   for (let i = 0; i < initialRundown.order.length; i++) {
-    // we assign a reference to the current entry, this will be mutated in place
-    const currentEntryId = initialRundown.order[i];
-    const currentEntry = initialRundown.entries[currentEntryId];
-    if (!currentEntry) {
-      continue;
-    }
-    const { processedEntry } = process(currentEntry, null);
+    const currentEntry = initialRundown.entries[initialRundown.order[i]];
+    if (!currentEntry) continue;
 
-    // if the event is a group, we process the nested entries
-    // the code here is a copy of the processing of top level events
-    if (isOntimeGroup(processedEntry)) {
-      let groupStartTime = null;
-      let groupEndTime = null;
-      let isFirstLinked = false;
-      const groupEvents: EntryId[] = [];
-      processedEntry.duration = 0;
+    const processedEntry = process(currentEntry, null);
+    if (!isOntimeGroup(processedEntry)) continue;
 
-      // check if the group contains nested entries
-      for (let j = 0; j < processedEntry.entries.length; j++) {
-        const nestedEntryId = processedEntry.entries[j];
-        const nestedEntry = initialRundown.entries[nestedEntryId];
+    // process nested entries and recompute aggregate group fields
+    let groupStartTime: number | null = null;
+    let groupEndTime: number | null = null;
+    let isFirstLinked = false;
+    const groupEvents: EntryId[] = [];
+    processedEntry.duration = 0;
 
-        if (!nestedEntry) {
-          continue;
-        }
+    for (let j = 0; j < processedEntry.entries.length; j++) {
+      const nestedEntry = initialRundown.entries[processedEntry.entries[j]];
+      if (!nestedEntry) continue;
 
-        groupEvents.push(nestedEntry.id);
-        const { processedEntry: processedNestedEntry } = process(nestedEntry, processedEntry.id);
+      groupEvents.push(nestedEntry.id);
+      const processedNestedEntry = process(nestedEntry, processedEntry.id);
 
-        // we dont extract metadata of skipped events,
-        // if this is not a playable event there is nothing else to do
-        if (!isOntimeEvent(processedNestedEntry) || !isPlayableEvent(processedNestedEntry)) {
-          continue;
-        }
+      // skip metadata aggregation for non-playable nested entries
+      if (!isOntimeEvent(processedNestedEntry) || !isPlayableEvent(processedNestedEntry)) continue;
 
-        // first start is always the first event
-        if (groupStartTime === null) {
-          groupStartTime = processedNestedEntry.timeStart;
-          isFirstLinked = Boolean(processedNestedEntry.linkStart);
-        }
-
-        // lastEntry is the event with the latest end time
-        groupEndTime = processedNestedEntry.timeEnd;
-        if (j > 0) {
-          processedEntry.duration += processedNestedEntry.gap;
-        }
-        processedEntry.duration = processedEntry.duration + processedNestedEntry.duration;
+      if (groupStartTime === null) {
+        groupStartTime = processedNestedEntry.timeStart;
+        isFirstLinked = Boolean(processedNestedEntry.linkStart);
       }
-
-      // update group metadata
-      processedEntry.timeStart = groupStartTime;
-      processedEntry.timeEnd = groupEndTime;
-      processedEntry.isFirstLinked = isFirstLinked;
-      processedEntry.entries = groupEvents;
+      groupEndTime = processedNestedEntry.timeEnd;
+      if (j > 0) {
+        processedEntry.duration += processedNestedEntry.gap;
+      }
+      processedEntry.duration += processedNestedEntry.duration;
     }
+
+    processedEntry.timeStart = groupStartTime;
+    processedEntry.timeEnd = groupEndTime;
+    processedEntry.isFirstLinked = isFirstLinked;
+    processedEntry.entries = groupEvents;
   }
 
   return getMetadata();

apps/server/src/api-data/rundown/rundown.parser.ts

@@ -205,10 +205,15 @@ export type ProcessedRundownMetadata = RundownMetadata & {
 
 /**
  * Factory function to create a rundown metadata processor
- * @returns {process, getMetadata} process() - processes entries in order | getMetadata() -> returns the current metadata
+ *
+ * @param customFields project custom fields used to sanitise entries
+ * @param options.mutate when true, entries are mutated in place rather than cloned.
+ *                      Callers must own (or have already cloned) the input rundown.
+ * @returns process() - processes entries in order | getMetadata() returns the accumulated metadata
  */
-export function makeRundownMetadata(customFields: CustomFields) {
-  let rundownMeta: ProcessedRundownMetadata = {
+export function makeRundownMetadata(customFields: CustomFields, options?: { mutate?: boolean }) {
+  const mutate = options?.mutate ?? false;
+  const rundownMeta: ProcessedRundownMetadata = {
     totalDelay: 0,
     totalDuration: 0,
     totalDays: 0,
@@ -228,13 +233,8 @@ export function makeRundownMetadata(customFields: CustomFields) {
     previousEntry: null,
   };
 
-  function process<T extends OntimeEntry>(
-    entry: T,
-    childOfGroup: EntryId | null,
-  ): { processedData: ProcessedRundownMetadata; processedEntry: T } {
-    const data = processEntry(rundownMeta, customFields, entry, childOfGroup);
-    rundownMeta = data.processedData;
-    return data;
+  function process<T extends OntimeEntry>(entry: T, childOfGroup: EntryId | null): T {
+    return processEntry(rundownMeta, customFields, mutate ? entry : structuredClone(entry), childOfGroup);
   }
 
   function getMetadata(): ProcessedRundownMetadata {
@@ -245,20 +245,19 @@ export function makeRundownMetadata(customFields: CustomFields) {
 }
 
 /**
- * Processes a single entry and updates the rundown metadata
+ * Processes a single entry, mutating both `entry` and `rundownMetadata` in place.
+ * Returns the same `entry` reference for caller convenience.
  */
 function processEntry<T extends OntimeEntry>(
   rundownMetadata: ProcessedRundownMetadata,
   customFields: CustomFields,
   entry: T,
   childOfGroup: EntryId | null,
-): { processedData: ProcessedRundownMetadata; processedEntry: T } {
-  const processedData = { ...rundownMetadata };
-  const currentEntry = structuredClone(entry);
-  processedData.flatEntryOrder.push(currentEntry.id);
+): T {
+  rundownMetadata.flatEntryOrder.push(entry.id);
 
-  if (isOntimeEvent(currentEntry)) {
-    processedData.timedEventOrder.push(currentEntry.id);
+  if (isOntimeEvent(entry)) {
+    rundownMetadata.timedEventOrder.push(entry.id);
 
     /**
      * 1.Checks that link can be established (ie, events exist and are valid)
@@ -266,91 +265,91 @@ function processEntry<T extends OntimeEntry>(
      * The linked event is always the previous playable event
      * If no previous event exists, the link is removed
      */
-    if (currentEntry.linkStart) {
-      if (processedData.previousEvent) {
-        const timePatch = getLinkedTimes(currentEntry, processedData.previousEvent);
-        currentEntry.timeStart = timePatch.timeStart;
-        currentEntry.timeEnd = timePatch.timeEnd;
-        currentEntry.duration = timePatch.duration;
+    if (entry.linkStart) {
+      if (rundownMetadata.previousEvent) {
+        const timePatch = getLinkedTimes(entry, rundownMetadata.previousEvent);
+        entry.timeStart = timePatch.timeStart;
+        entry.timeEnd = timePatch.timeEnd;
+        entry.duration = timePatch.duration;
       } else {
-        currentEntry.linkStart = false;
+        entry.linkStart = false;
       }
     }
 
-    // 2. handle custom fields - mutates currentEntry
-    sanitiseCustomFields(customFields, currentEntry);
+    // 2. handle custom fields - mutates entry
+    sanitiseCustomFields(customFields, entry);
 
-    processedData.totalDays += calculateDayOffset(currentEntry, processedData.previousEvent);
-    currentEntry.dayOffset = processedData.totalDays as Day;
-    currentEntry.delay = 0; // this means we dont calculate delays or gaps for skipped events
-    currentEntry.gap = 0; // this means we dont calculate delays or gaps for skipped events
-    currentEntry.parent = childOfGroup;
+    rundownMetadata.totalDays += calculateDayOffset(entry, rundownMetadata.previousEvent);
+    entry.dayOffset = rundownMetadata.totalDays as Day;
+    entry.delay = 0; // this means we dont calculate delays or gaps for skipped events
+    entry.gap = 0; // this means we dont calculate delays or gaps for skipped events
+    entry.parent = childOfGroup;
 
     // update rundown metadata, it only concerns playable events
-    if (isPlayableEvent(currentEntry)) {
-      processedData.playableEventOrder.push(currentEntry.id);
+    if (isPlayableEvent(entry)) {
+      rundownMetadata.playableEventOrder.push(entry.id);
 
       // first start is always the first event
-      if (processedData.firstStart === null) {
-        processedData.firstStart = currentEntry.timeStart;
+      if (rundownMetadata.firstStart === null) {
+        rundownMetadata.firstStart = entry.timeStart;
       }
 
       // check if event is flagged
-      if (currentEntry.flag) {
-        processedData.flags.push(currentEntry.id);
+      if (entry.flag) {
+        rundownMetadata.flags.push(entry.id);
       }
 
-      currentEntry.gap = getTimeFrom(currentEntry, processedData.latestEvent);
+      entry.gap = getTimeFrom(entry, rundownMetadata.latestEvent);
 
-      if (currentEntry.gap === 0) {
+      if (entry.gap === 0) {
         // event starts on previous finish, we add its duration
-        processedData.totalDuration += currentEntry.duration;
-      } else if (currentEntry.gap > 0) {
+        rundownMetadata.totalDuration += entry.duration;
+      } else if (entry.gap > 0) {
         // event has a gap, we add the gap and the duration
-        processedData.totalDuration += currentEntry.gap + currentEntry.duration;
-      } else if (currentEntry.gap < 0) {
+        rundownMetadata.totalDuration += entry.gap + entry.duration;
+      } else {
         // there is an overlap, we remove the overlap from the duration
         // ensuring that the sum is not negative (ie: fully overlapped events)
         // NOTE: we add the gap since it is a negative number
-        processedData.totalDuration += Math.max(currentEntry.duration + currentEntry.gap, 0);
+        rundownMetadata.totalDuration += Math.max(entry.duration + entry.gap, 0);
       }
 
       // remove eventual gaps from the accumulated delay
       // we only affect positive delays (time forwards)
-      if (processedData.totalDelay > 0 && currentEntry.gap > 0) {
+      if (rundownMetadata.totalDelay > 0 && entry.gap > 0) {
         let correctedDelay = 0;
         // we need to separate the delay that is accumulated from one that may exist after the gap
-        if (isOntimeDelay(processedData.previousEntry)) {
-          correctedDelay = processedData.previousEntry.duration;
-          processedData.totalDelay -= correctedDelay;
+        if (isOntimeDelay(rundownMetadata.previousEntry)) {
+          correctedDelay = rundownMetadata.previousEntry.duration;
+          rundownMetadata.totalDelay -= correctedDelay;
         }
-        processedData.totalDelay = Math.max(processedData.totalDelay - currentEntry.gap, 0);
-        processedData.totalDelay += correctedDelay;
+        rundownMetadata.totalDelay = Math.max(rundownMetadata.totalDelay - entry.gap, 0);
+        rundownMetadata.totalDelay += correctedDelay;
       }
 
       // current event delay is the current accumulated delay
-      currentEntry.delay = processedData.totalDelay;
+      entry.delay = rundownMetadata.totalDelay;
 
       // assign data for next iteration
-      processedData.previousEvent = currentEntry;
+      rundownMetadata.previousEvent = entry;
 
       // lastEntry is the event with the latest end time
-      if (isNewLatest(currentEntry, processedData.latestEvent)) {
-        processedData.latestEvent = currentEntry;
-        processedData.lastEnd = currentEntry.timeEnd;
+      if (isNewLatest(entry, rundownMetadata.latestEvent)) {
+        rundownMetadata.latestEvent = entry;
+        rundownMetadata.lastEnd = entry.timeEnd;
       }
     }
-  } else if (isOntimeDelay(currentEntry)) {
+  } else if (isOntimeDelay(entry)) {
     // !!! this must happen after handling the links
-    processedData.totalDelay += currentEntry.duration;
-    currentEntry.parent = childOfGroup;
+    rundownMetadata.totalDelay += entry.duration;
+    entry.parent = childOfGroup;
   }
 
   if (!childOfGroup) {
-    processedData.order.push(currentEntry.id);
+    rundownMetadata.order.push(entry.id);
   }
-  processedData.entries[currentEntry.id] = currentEntry;
-  processedData.previousEntry = currentEntry;
+  rundownMetadata.entries[entry.id] = entry;
+  rundownMetadata.previousEntry = entry;
 
-  return { processedData, processedEntry: currentEntry };
+  return entry;
 }

apps/server/src/api-data/rundown/rundown.router.ts

@@ -5,14 +5,14 @@ import { ErrorResponse, OntimeEntry, ProjectRundownsList, RenumberCues, Rundown
 import { getErrorMessage } from 'ontime-utils';
 
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
-import { makeNewRundown } from '../../models/dataModel.js';
 import { paramsWithId } from '../validation-utils/validationFunction.js';
-import { getCurrentRundown } from './rundown.dao.js';
+import { getCurrentRundown, getProcessedRundown } from './rundown.dao.js';
 import {
   addEntry,
   applyDelay,
   batchEditEntries,
   cloneEntry,
+  createNewRundown,
   deleteAllEntries,
   deleteEntries,
   editEntry,
@@ -35,7 +35,6 @@ import {
   entrySwapValidator,
   rundownArrayOfIds,
   rundownPostValidator,
-  validateRundownMutation,
 } from './rundown.validation.js';
 
 export const router: Router = express.Router();
@@ -58,6 +57,19 @@ router.get('/current', async (_req: Request, res: Response<Rundown>) => {
   res.json(rundown);
 });
 
+/**
+ * Returns a given rundown in its normalised client shape
+ */
+router.get('/:id', paramsWithId, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  try {
+    const rundown = getProcessedRundown(req.params.id);
+    res.json(rundown);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(404).send({ message });
+  }
+});
+
 /**
  * Loads a given rundown
  */
@@ -76,11 +88,7 @@ router.post('/:id/load', paramsWithId, async (req: Request, res: Response<Projec
  */
 router.post('/', rundownPostValidator, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
   try {
-    const emptyRundown = makeNewRundown();
-    emptyRundown.title = req.body.title;
-    await getDataProvider().setRundown(emptyRundown.id, emptyRundown);
-
-    const projectRundowns = getDataProvider().getProjectRundowns();
+    const projectRundowns = await createNewRundown(req.body.title);
     res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
   } catch (error) {
     const message = getErrorMessage(error);
@@ -180,10 +188,9 @@ router.delete('/:id', paramsWithId, async (req: Request, res: Response<ProjectRu
 router.post(
   '/:rundownId/entry',
   entryPostValidator,
-  validateRundownMutation,
   async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
     try {
-      const newEvent = await addEntry(req.body);
+      const newEvent = await addEntry(req.params.rundownId, req.body);
       res.status(201).send(newEvent);
     } catch (error) {
       const message = getErrorMessage(error);
@@ -195,20 +202,15 @@ router.post(
 /**
  * Edits an entry in a given rundown
  */
-router.put(
-  '/:rundownId/entry',
-  entryPutValidator,
-  validateRundownMutation,
-  async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
-    try {
-      const event = await editEntry(req.body);
-      res.status(200).send(event);
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
-    }
-  },
-);
+router.put('/:rundownId/entry', entryPutValidator, async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
+  try {
+    const event = await editEntry(req.params.rundownId, req.body);
+    res.status(200).send(event);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
 /**
  * Edits an entry in a given rundown
@@ -216,10 +218,9 @@ router.put(
 router.put(
   '/:rundownId/batch',
   entryBatchPutValidator,
-  validateRundownMutation,
   async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
-      const rundown = await batchEditEntries(req.body.ids, req.body.data);
+      const rundown = await batchEditEntries(req.params.rundownId, req.body.ids, req.body.data);
       res.status(200).send(rundown);
     } catch (error) {
       const message = getErrorMessage(error);
@@ -234,11 +235,10 @@ router.put(
 router.patch(
   '/:rundownId/reorder',
   entryReorderValidator,
-  validateRundownMutation,
   async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
       const { entryId, destinationId, order } = req.body;
-      const rundown = await reorderEntry(entryId, destinationId, order);
+      const rundown = await reorderEntry(req.params.rundownId, entryId, destinationId, order);
       res.status(200).send(rundown);
     } catch (error) {
       const message = getErrorMessage(error);
@@ -253,10 +253,9 @@ router.patch(
 router.patch(
   '/:rundownId/applydelay/:id',
   paramsWithId,
-  validateRundownMutation,
   async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
-      const rundown = await applyDelay(req.params.id);
+      const rundown = await applyDelay(req.params.rundownId, req.params.id);
       res.status(200).send(rundown);
     } catch (error) {
       const message = getErrorMessage(error);
@@ -268,20 +267,15 @@ router.patch(
 /**
  * Swaps data between two Ontime events
  */
-router.patch(
-  '/:rundownId/swap',
-  entrySwapValidator,
-  validateRundownMutation,
-  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-    try {
-      const rundown = await swapEvents(req.body.from, req.body.to);
-      res.status(200).send(rundown);
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
-    }
-  },
-);
+router.patch('/:rundownId/swap', entrySwapValidator, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  try {
+    const rundown = await swapEvents(req.params.rundownId, req.body.from, req.body.to);
+    res.status(200).send(rundown);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
 /**
  * Clones the contents of an entry into a new one
@@ -290,10 +284,9 @@ router.post(
   '/:rundownId/clone/:id',
   paramsWithId,
   clonePostValidator,
-  validateRundownMutation,
   async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
-      const rundown = await cloneEntry(req.params.id, {
+      const rundown = await cloneEntry(req.params.rundownId, req.params.id, {
         before: req.body?.before,
         after: req.body?.after,
       });
@@ -308,38 +301,28 @@ router.post(
 /**
  * Creates a group out of a list of entries
  */
-router.post(
-  '/:rundownId/group',
-  rundownArrayOfIds,
-  validateRundownMutation,
-  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-    try {
-      const rundown = await groupEntries(req.body.ids);
-      res.status(200).send(rundown);
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
-    }
-  },
-);
+router.post('/:rundownId/group', rundownArrayOfIds, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  try {
+    const rundown = await groupEntries(req.params.rundownId, req.body.ids);
+    res.status(200).send(rundown);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
 /**
  * Dissolves a group by moving its children to the main rundown
  */
-router.post(
-  '/:rundownId/ungroup/:id',
-  paramsWithId,
-  validateRundownMutation,
-  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-    try {
-      const rundown = await ungroupEntries(req.params.id);
-      res.status(200).send(rundown);
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
-    }
-  },
-);
+router.post('/:rundownId/ungroup/:id', paramsWithId, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  try {
+    const rundown = await ungroupEntries(req.params.rundownId, req.params.id);
+    res.status(200).send(rundown);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
 /**
  * Deletes a list of entries by their ID
@@ -347,10 +330,9 @@ router.post(
 router.delete(
   '/:rundownId/entries',
   rundownArrayOfIds,
-  validateRundownMutation,
   async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
-      const rundown = await deleteEntries(req.body.ids);
+      const rundown = await deleteEntries(req.params.rundownId, req.body.ids);
       res.status(200).send(rundown);
     } catch (error) {
       const message = getErrorMessage(error);
@@ -362,19 +344,15 @@ router.delete(
 /**
  * Deletes all entries in a given rundown
  */
-router.delete(
-  '/:rundownId/all',
-  validateRundownMutation,
-  async (_req: Request, res: Response<Rundown | ErrorResponse>) => {
-    try {
-      const rundown = await deleteAllEntries();
-      res.status(200).send(rundown);
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
-    }
-  },
-);
+router.delete('/:rundownId/all', async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  try {
+    const rundown = await deleteAllEntries(req.params.rundownId);
+    res.status(200).send(rundown);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
 /**
  * Reorders two entries in a rundown
@@ -382,11 +360,10 @@ router.delete(
 router.patch(
   '/:rundownId/renumber',
   entryRenumberValidator,
-  validateRundownMutation,
-  (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
     try {
       const { ids, prefix, start, increment } = matchedData<RenumberCues>(req);
-      const rundown = renumberEntries(ids, prefix, start, increment);
+      const rundown = await renumberEntries(req.params.rundownId, ids, prefix, start, increment);
       res.status(200).send(rundown);
     } catch (error) {
       const message = getErrorMessage(error);

apps/server/src/api-data/rundown/rundown.service.ts

@@ -21,6 +21,7 @@ import { customFieldLabelToKey, getInsertAfterId, resolveInsertParent } from 'on
 import { sendRefetch } from '../../adapters/WebsocketAdapter.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 import { logger } from '../../classes/Logger.js';
+import { makeNewRundown } from '../../models/dataModel.js';
 import { setLastLoadedRundown } from '../../services/app-state-service/AppStateService.js';
 import { runtimeService } from '../../services/runtime-service/runtime.service.js';
 import { updateRundownData } from '../../stores/runtimeState.js';
@@ -38,8 +39,8 @@ import { generateEvent, getIntegerAndFraction, hasChanges } from './rundown.util
 /**
  * creates a new entry with given data
  */
-export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function addEntry(rundownId: string, eventData: EventPostPayload): Promise<OntimeEntry> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   // we allow the user to provide an ID, but make sure it is unique
   if (eventData?.id && Object.hasOwn(rundown.entries, eventData.id)) {
@@ -66,7 +67,7 @@ export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry
   // make mutations to rundown
   rundownMutation.add(rundown, newEntry, afterId, parent);
 
-  const { rundownMetadata, revision } = commit();
+  const { rundown: responseRundown, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -77,14 +78,14 @@ export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry
     notifyChanges(rundown.id, rundownMetadata, revision, { timer: [newEntry.id], external: true });
   });
 
-  return newEntry;
+  return responseRundown.entries[newEntry.id] ?? newEntry;
 }
 
 /**
  * Applies a patch to an entry in the rundown
  */
-export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function editEntry(rundownId: string, patch: PatchWithId): Promise<OntimeEntry> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
   const currentEntry = rundown.entries[patch.id];
 
   /**
@@ -110,7 +111,7 @@ export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
   }
 
   const { entry, didInvalidate } = rundownMutation.edit(rundown, patch);
-  const { rundownMetadata, revision } = commit(didInvalidate);
+  const { rundown: responseRundown, rundownMetadata, revision } = await commit(didInvalidate);
 
   // schedule the side effects
   setImmediate(() => {
@@ -124,14 +125,18 @@ export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
     });
   });
 
-  return entry;
+  return responseRundown.entries[entry.id] ?? entry;
 }
 
 /**
  * Applies a patch to several entries in the rundown
  */
-export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntry>): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function batchEditEntries(
+  rundownId: string,
+  ids: EntryId[],
+  patch: Partial<OntimeEntry>,
+): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   /**
    * We can do some validation globally, but mostly we will validate each entry individually
@@ -176,7 +181,7 @@ export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntr
       batchDidInvalidate = true;
     }
   }
-  const { rundown: rundownResult, rundownMetadata, revision } = commit(batchDidInvalidate);
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit(batchDidInvalidate);
 
   // schedule the side effects
   setImmediate(() => {
@@ -196,8 +201,8 @@ export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntr
 /**
  * Deletes a known entry from the current rundown
  */
-export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function deleteEntries(rundownId: string, entryIds: EntryId[]): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   for (let i = 0; i < entryIds.length; i++) {
     const entry = rundown.entries[entryIds[i]];
@@ -207,7 +212,7 @@ export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
     rundownMutation.remove(rundown, entry);
   }
 
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -224,12 +229,12 @@ export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
 /**
  * Deletes all entries from the current rundown
  */
-export async function deleteAllEntries(): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function deleteAllEntries(rundownId: string): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   rundownMutation.removeAll(rundown);
 
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -248,8 +253,13 @@ export async function deleteAllEntries(): Promise<Rundown> {
  * Handles moving across root orders (a group order and top level order)
  * @throws if entryId or destinationId not found
  */
-export async function reorderEntry(entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function reorderEntry(
+  rundownId: string,
+  entryId: EntryId,
+  destinationId: EntryId,
+  order: 'before' | 'after' | 'insert',
+) {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   // check that both entries exist
   const eventFrom = rundown.entries[entryId];
@@ -261,7 +271,7 @@ export async function reorderEntry(entryId: EntryId, destinationId: EntryId, ord
 
   rundownMutation.reorder(rundown, eventFrom, eventTo, order);
 
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -278,18 +288,24 @@ export async function reorderEntry(entryId: EntryId, destinationId: EntryId, ord
 /**
  * @throws if an id is missing or not an Ontime event
  */
-export function renumberEntries(ids: EntryId[], prefix: string, start: string, increment: string): Rundown {
+export async function renumberEntries(
+  rundownId: string,
+  ids: EntryId[],
+  prefix: string,
+  start: string,
+  increment: string,
+): Promise<Rundown> {
   const startNumber = getIntegerAndFraction(start);
   const incrementNumber = getIntegerAndFraction(increment);
 
   // if the prefix doesn't already include a separator or is empty, then insert a separator
   if (prefix !== '' && !prefix.endsWith('-') && !prefix.endsWith(' ')) prefix += ' ';
 
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true, mutableCustomFields: false });
 
   rundownMutation.renumber(rundown, ids, prefix, startNumber, incrementNumber);
 
-  const { rundown: rundownResult, rundownMetadata, revision } = commit(false);
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit(false);
 
   setImmediate(() => {
     updateRuntimeOnChange(rundownMetadata);
@@ -303,8 +319,8 @@ export function renumberEntries(ids: EntryId[], prefix: string, start: string, i
  * Applies a delay into the rundown effectively changing the schedule
  * The applied delay is deleted
  */
-export async function applyDelay(delayId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function applyDelay(rundownId: string, delayId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   // check that delay exists
   const delay = rundown.entries[delayId];
@@ -316,7 +332,7 @@ export async function applyDelay(delayId: EntryId): Promise<Rundown> {
   rundownMutation.applyDelay(rundown, delay);
   rundownMutation.remove(rundown, delay);
 
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -333,8 +349,8 @@ export async function applyDelay(delayId: EntryId): Promise<Rundown> {
 /**
  * Swaps the data between two events in the rundown
  */
-export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function swapEvents(rundownId: string, fromId: EntryId, toId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
   const eventFrom = rundown.entries[fromId];
   const eventTo = rundown.entries[toId];
 
@@ -349,7 +365,7 @@ export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundow
   }
 
   rundownMutation.swap(rundown, eventFrom, eventTo);
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -368,8 +384,8 @@ export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundow
  * Handles cloning children if the entry is a group
  * @throws if the entry to clone does not exist
  */
-export async function cloneEntry(entryId: EntryId, options: InsertOptions): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function cloneEntry(rundownId: string, entryId: EntryId, options: InsertOptions): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
   const originalEntry = rundown.entries[entryId];
 
   if (!originalEntry) {
@@ -377,7 +393,7 @@ export async function cloneEntry(entryId: EntryId, options: InsertOptions): Prom
   }
 
   const newEntry = rundownMutation.clone(rundown, originalEntry, options);
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -400,11 +416,11 @@ export async function cloneEntry(entryId: EntryId, options: InsertOptions): Prom
 /**
  * Groups a list of entries into a new group
  */
-export async function groupEntries(entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function groupEntries(rundownId: string, entryIds: EntryId[]): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   rundownMutation.group(rundown, entryIds);
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -421,8 +437,8 @@ export async function groupEntries(entryIds: EntryId[]): Promise<Rundown> {
 /**
  * Deletes a group and moves all its children to the top level
  */
-export async function ungroupEntries(groupId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
+export async function ungroupEntries(rundownId: string, groupId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
 
   const group = rundown.entries[groupId];
   if (!group || !isOntimeGroup(group)) {
@@ -430,7 +446,7 @@ export async function ungroupEntries(groupId: EntryId): Promise<Rundown> {
   }
 
   rundownMutation.ungroup(rundown, group);
-  const { rundown: rundownResult, rundownMetadata, revision } = commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
 
   // schedule the side effects
   setImmediate(() => {
@@ -465,7 +481,7 @@ export async function createCustomField(customField: CustomField): Promise<Custo
   customFieldMutation.add(customFields, key, customField);
 
   // Adding a custom field has no immediate implications on the rundown
-  const { customFields: resultCustomFields } = commit(false);
+  const { customFields: resultCustomFields } = await commit(false);
 
   setImmediate(() => {
     sendRefetch(RefetchKey.CustomFields);
@@ -523,7 +539,7 @@ export async function editCustomField(
   }
 
   // the custom fields have been removed and there is no processing to be done
-  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);
+  const { rundownMetadata, revision, customFields: resultCustomFields } = await commit(false);
 
   // schedule the side effects
   setImmediate(() => {
@@ -562,7 +578,7 @@ export async function deleteCustomField(key: CustomFieldKey, projectRundowns: Pr
   customFieldMutation.remove(customFields, key);
 
   // the custom fields have been removed and there is no processing to be done
-  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);
+  const { rundownMetadata, revision, customFields: resultCustomFields } = await commit(false);
 
   // schedule the side effects
   setImmediate(() => {
@@ -579,7 +595,8 @@ export async function deleteCustomField(key: CustomFieldKey, projectRundowns: Pr
  *
  * @private - exported for testing
  */
-export function updateRuntimeOnChange(rundownMetadata: RundownMetadata) {
+export function updateRuntimeOnChange(rundownMetadata: RundownMetadata | null) {
+  if (!rundownMetadata) return;
   // we only declare the amount of playable events
   const numEvents = rundownMetadata.timedEventOrder.length;
 
@@ -603,16 +620,15 @@ type NotifyChangesOptions = {
  */
 function notifyChanges(
   rundownId: string | undefined,
-  rundownMetadata: RundownMetadata,
+  rundownMetadata: RundownMetadata | null,
   revision: number,
   options: NotifyChangesOptions,
 ) {
   // notify timer service of changed event
-  if (options.timer && rundownId && isCurrentRundown(rundownId)) {
+  if (rundownMetadata && options.timer && rundownId && isCurrentRundown(rundownId)) {
     runtimeService.notifyOfChangedEvents(rundownMetadata);
   }
 
-  // notify external services of changes
   if (options.reload) {
     sendRefetch(RefetchKey.All);
   } else if (options.external) {
@@ -656,8 +672,23 @@ export async function initRundown(
 
   setImmediate(() => {
     notifyChanges(rundown.id, rundownMetadata, revision, { timer: true, external: true, reload });
+    sendRefetch(RefetchKey.ProjectRundowns);
     setLastLoadedRundown(rundown.id).catch((error) => {
       logger.error(LogOrigin.Server, `Failed to persist last loaded rundown: ${error}`);
     });
   });
 }
+
+export async function createNewRundown(title: string) {
+  const emptyRundown = makeNewRundown();
+  emptyRundown.title = title;
+  await getDataProvider().setRundown(emptyRundown.id, emptyRundown);
+
+  const projectRundowns = getDataProvider().getProjectRundowns();
+
+  setImmediate(() => {
+    sendRefetch(RefetchKey.ProjectRundowns);
+  });
+
+  return projectRundowns;
+}

apps/server/src/api-data/rundown/rundown.validation.ts

@@ -1,8 +1,6 @@
-import type { NextFunction, Request, Response } from 'express';
 import { body, param } from 'express-validator';
 
 import { requestValidationFunction } from '../validation-utils/validationFunction.js';
-import { getCurrentRundown } from './rundown.dao.js';
 
 // #region operations on project rundowns =========================
 
@@ -11,29 +9,6 @@ export const rundownPostValidator = [body('title').isString().trim().notEmpty(),
 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================
 
-/**
- * Middleware prevents mutating a rundown that is not selected
- * This allows our service to still only handle the current rundown
- *
- * This would need to be removed in favour or rundown selection if we would like
- * to implement the mutation of background rundowns
- */
-export async function validateRundownMutation(req: Request, res: Response, next: NextFunction) {
-  const { rundownId } = req.params;
-
-  try {
-    if (getCurrentRundown().id !== rundownId) {
-      res.status(404).json({ message: 'Cannot mutate not selected rundown' });
-      return;
-    }
-
-    next();
-  } catch (error) {
-    res.status(404).json({ message: 'Rundown not found' });
-    return;
-  }
-}
-
 export const entryPostValidator = [
   body('type').isString().isIn(['event', 'delay', 'group', 'milestone']),
   body('after').optional().isString(),

apps/server/src/api-integration/integration.controller.ts

@@ -63,7 +63,7 @@ const actionHandlers: Record<ApiActionTag, ActionHandler> = {
       throw new Error('Missing Event ID');
     }
 
-    const { entries } = getCurrentRundown();
+    const { entries, id: currentRundownId } = getCurrentRundown();
     const customFields = getProjectCustomFields();
 
     const targetEntry = entries[id];
@@ -89,8 +89,8 @@ const actionHandlers: Record<ApiActionTag, ActionHandler> = {
         Object.assign(patchEntry, newObjectProperty);
       }
     });
-    //TODO: windowed edit function
-    await editEntry(patchEntry);
+
+    await editEntry(currentRundownId, patchEntry);
     return { payload: 'success' };
   },
   /* Message Service */