chore: lint

apps/client/src/common/context/EntryActionsContext.tsx

@@ -1,15 +1,15 @@
 import { PropsWithChildren, createContext, useContext } from 'react';
 
-import { useEntryActions } from '../hooks/useEntryAction';
+import { useEntryActions, useScopedEntryActions } from '../hooks/useEntryAction';
+import { useRundownSelectionContext } from './RundownSelectionContext';
 
 type EntryActionsContextValue = ReturnType<typeof useEntryActions>;
 const EntryActionsContext = createContext<EntryActionsContextValue | null>(null);
 
-interface EntryActionsProviderProps extends PropsWithChildren {
-  actions: EntryActionsContextValue;
-}
+export function EntryActionsProvider({ children }: PropsWithChildren) {
+  const { effectiveRundownId } = useRundownSelectionContext();
+  const actions = useScopedEntryActions(effectiveRundownId);
 
-export function EntryActionsProvider({ children, actions }: EntryActionsProviderProps) {
   return <EntryActionsContext.Provider value={actions}>{children}</EntryActionsContext.Provider>;
 }
 

apps/client/src/common/context/RundownSelectionContext.tsx

@@ -0,0 +1,120 @@
+import { Maybe, ProjectRundown } from 'ontime-types';
+import { PropsWithChildren, createContext, startTransition, useCallback, useContext, useEffect, useMemo } from 'react';
+import { useSearchParams } from 'react-router';
+import { useNavigate } from 'react-router';
+
+import { useProjectRundowns } from '../hooks-query/useProjectRundowns';
+
+export type RundownScopeValue = {
+  loadedRundownId: string;
+  selectedRundownId: Maybe<string>;
+  isLoadedRundown: boolean;
+  effectiveRundownId: string;
+  selectRundownId: (val: Maybe<string>) => void;
+  rundowns: ProjectRundown[];
+};
+
+const RundownScopeContext = createContext<RundownScopeValue | null>(null);
+
+export function RundownSelectionContextProvider({ children }: PropsWithChildren) {
+  'use memo';
+  const { data } = useProjectRundowns();
+  const { loaded, rundowns } = data;
+
+  const [selectedRundownId, setSelectedRundownId] = useSelectRundownFromParams();
+
+  const selectRundownId = useCallback(
+    (rundownId: Maybe<string>) => {
+      startTransition(() => {
+        if (rundowns.find((entry) => entry.id === rundownId)) setSelectedRundownId(rundownId);
+        else setSelectedRundownId(null);
+      });
+    },
+    [rundowns, setSelectedRundownId],
+  );
+
+  const effectiveRundownId = selectedRundownId ? selectedRundownId : loaded;
+  const isLoadedRundown = effectiveRundownId === loaded;
+
+  useEffect(() => {
+    if (!rundowns.find((entry) => entry.id === effectiveRundownId)) setSelectedRundownId(null);
+  }, [rundowns, effectiveRundownId, setSelectedRundownId]);
+
+  const value = useMemo(
+    (): RundownScopeValue => ({
+      loadedRundownId: loaded,
+      isLoadedRundown,
+      selectedRundownId,
+      effectiveRundownId,
+      selectRundownId,
+      rundowns,
+    }),
+    [loaded, isLoadedRundown, selectedRundownId, effectiveRundownId, selectRundownId, rundowns],
+  );
+
+  return <RundownScopeContext.Provider value={value}>{children}</RundownScopeContext.Provider>;
+}
+
+export function useRundownSelectionContext() {
+  const context = useContext(RundownScopeContext);
+
+  if (!context) {
+    throw new Error('useRundownScopeSelection requires a RundownSelectionContextProvider');
+  }
+
+  return context;
+}
+
+const rundownParam = 'rundownId';
+
+export function useSelectRundownFromParams(): [Maybe<string>, (id: Maybe<string>) => void] {
+  'use memo';
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const selectedRundownId = searchParams.get(rundownParam);
+  const setSelectedRundownId = useCallback(
+    (id: Maybe<string>) => {
+      if (id === null) {
+        setSearchParams((searchParams) => {
+          searchParams.delete(rundownParam);
+          return searchParams;
+        });
+      } else {
+        setSearchParams((searchParams) => {
+          searchParams.set(rundownParam, id);
+          return searchParams;
+        });
+      }
+    },
+    [setSearchParams],
+  );
+
+  return [selectedRundownId, setSelectedRundownId];
+}
+
+/**
+ *
+ * mutates the provided `searchParams`
+ */
+export function setSelectRundownInParams(id: Maybe<string>, searchParams: URLSearchParams): void {
+  if (id === null) {
+    searchParams.delete(rundownParam);
+  } else {
+    searchParams.set(rundownParam, id);
+  }
+}
+
+export function useDirectLinkToBackgroundEdit() {
+  const navigate = useNavigate();
+  const [search] = useSearchParams();
+  return useCallback(
+    async (rundownId: string) => {
+      setSelectRundownInParams(rundownId, search);
+      navigate({
+        pathname: '/cuesheet',
+        search: search.toString(),
+      });
+    },
+    [navigate, search],
+  );
+}

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

@@ -0,0 +1,79 @@
+import { useMemo } from 'react';
+
+import { useRundownSelectionContext } from '../context/RundownSelectionContext';
+import { useSelectedEventId } from '../hooks/useSocket';
+import { getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
+import { useFlatRundown, useRundown } from './useRundown';
+
+export function useContextRundownEditModal() {
+  'use memo';
+  const { effectiveRundownId } = useRundownSelectionContext();
+  const { data: rundown } = useRundown(effectiveRundownId);
+  return { rundown };
+}
+
+export function useContextRundownCueRenumberModal() {
+  'use memo';
+  const { effectiveRundownId } = useRundownSelectionContext();
+  const { data } = useRundown(effectiveRundownId);
+  const { flatOrder } = data;
+  return { flatOrder };
+}
+
+export function useContextRundownList() {
+  'use memo';
+  const { effectiveRundownId, isLoadedRundown } = useRundownSelectionContext();
+  const loadedEventId = useSelectedEventId();
+  const effectiveSelectedEventId = isLoadedRundown ? loadedEventId : null;
+  const { data: rundown, status } = useRundown(effectiveRundownId);
+  const rundownMetadata = useMemo(
+    () => getRundownMetadata(rundown, effectiveSelectedEventId),
+    [effectiveSelectedEventId, rundown],
+  );
+
+  return useMemo(
+    () => ({
+      rundown,
+      rundownMetadata,
+      status,
+      isLoadedRundown,
+    }),
+    [rundown, rundownMetadata, status, isLoadedRundown],
+  );
+}
+
+export function useContextRundownTable() {
+  'use memo';
+  const { effectiveRundownId, isLoadedRundown } = useRundownSelectionContext();
+  const loadedEventId = useSelectedEventId();
+  const effectiveSelectedEventId = isLoadedRundown ? loadedEventId : null;
+  const { data: rundown, status } = useRundown(effectiveRundownId);
+  const flatRundown = useMemo(
+    () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
+    [effectiveSelectedEventId, rundown],
+  );
+
+  return useMemo(
+    () => ({
+      flatRundown,
+      status,
+      loadedEventId,
+    }),
+    [flatRundown, status, loadedEventId],
+  );
+}
+
+export function useContextRundownFinder() {
+  'use memo';
+  const { effectiveRundownId } = useRundownSelectionContext();
+  const { data: rundown, status } = useFlatRundown(effectiveRundownId);
+
+  return useMemo(
+    () => ({
+      rundown,
+      rundownId: effectiveRundownId,
+      status,
+    }),
+    [rundown, status, effectiveRundownId],
+  );
+}

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

@@ -1,10 +1,10 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { EntryId, OntimeEntry, Rundown } from 'ontime-types';
-import { useEffect, useMemo } from 'react';
+import { useQuery } from '@tanstack/react-query';
+import { EntryId, Maybe, OntimeEntry, Rundown } from 'ontime-types';
+import { useMemo } from 'react';
 
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
-import { CURRENT_RUNDOWN_QUERY_KEY, getRundownQueryKey } from '../api/constants';
-import { fetchCurrentRundown, fetchRundown } from '../api/rundown';
+import { getRundownQueryKey } from '../api/constants';
+import { fetchRundown } from '../api/rundown';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
 import { useProjectRundowns } from './useProjectRundowns';
@@ -20,43 +20,39 @@ const cachedRundownPlaceholder: Rundown = {
 };
 
 /**
- * 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`.
+ * Provides access to a specific rundown by ID.
+ * When rundownId is not provided the loaded rundown is provided
  */
-export default function useRundown() {
-  const queryClient = useQueryClient();
+export function useRundown(rundownId: Maybe<string>) {
+  'use memo';
+
   const {
     data: { loaded: loadedRundownId },
   } = useProjectRundowns();
 
+  const effectiveRundownId = rundownId ? rundownId : loadedRundownId;
+  const isLoadedRundown = rundownId === loadedRundownId;
+
   const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
-    queryKey: loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY,
-    queryFn: ({ signal }) => fetchCurrentRundown({ signal }),
+    queryKey: getRundownQueryKey(effectiveRundownId),
+    queryFn: ({ signal }) => fetchRundown(effectiveRundownId, { signal }),
+    placeholderData: (previousData, _previousQuery) => previousData,
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  // Seed the id-keyed cache when fetching via the bootstrap alias
-  useEffect(() => {
-    if (!data || loadedRundownId) return;
-    queryClient.setQueryData(getRundownQueryKey(data.id), data);
-  }, [data, loadedRundownId, queryClient]);
-
-  // Once we have the ID, drop the temporary current cache
-  useEffect(() => {
-    if (!loadedRundownId) return;
-    queryClient.removeQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
-  }, [loadedRundownId, queryClient]);
-
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
+  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching, isLoadedRundown };
 }
 
-export function useRundownWithMetadata() {
-  const { data, status } = useRundown();
+/**
+ * @deprecated
+ */
+export function useRundownWithMetadata(rundownId: Maybe<string>) {
+  'use memo';
+
+  const { data, status, isLoadedRundown } = useRundown(rundownId);
   const selectedEventId = useSelectedEventId();
-  const rundownMetadata = useMemo(() => getRundownMetadata(data, selectedEventId), [data, selectedEventId]);
+  const effectiveSelectedEventId = isLoadedRundown ? selectedEventId : null;
+  const rundownMetadata = getRundownMetadata(data, effectiveSelectedEventId);
   return { data, status, rundownMetadata };
 }
 
@@ -64,8 +60,8 @@ export function useRundownWithMetadata() {
  * Provides access to a flat rundown
  * built from the order and rundown fields
  */
-export function useFlatRundown() {
-  const { data, status } = useRundown();
+export function useFlatRundown(rundownId: Maybe<string>) {
+  const { data, status } = useRundown(rundownId);
 
   const flatRundown = useMemo(() => {
     if (data.revision === -1) {
@@ -77,11 +73,13 @@ export function useFlatRundown() {
   return { data: flatRundown, rundownId: data.id, status };
 }
 
-export function useFlatRundownWithMetadata() {
-  const { data, status } = useRundown();
-  const selectedEventId = useSelectedEventId();
+export function useFlatRundownWithMetadata(rundownId: Maybe<string>) {
+  'use memo';
 
-  const rundownWithMetadata = useMemo(() => getFlatRundownMetadata(data, selectedEventId), [data, selectedEventId]);
+  const { data, status, isLoadedRundown } = useRundown(rundownId);
+  const selectedEventId = useSelectedEventId();
+  const effectiveSelectedEventId = isLoadedRundown ? selectedEventId : null;
+  const rundownWithMetadata = getFlatRundownMetadata(data, effectiveSelectedEventId);
   return { data: rundownWithMetadata, status };
 }
 
@@ -92,8 +90,8 @@ export function useFlatRundownWithMetadata() {
  * re-filtering on every render.
  *
  */
-export function usePartialRundown(cb: (event: ExtendedEntry<OntimeEntry>) => boolean) {
-  const { data, status } = useFlatRundownWithMetadata();
+export function usePartialRundown(rundownId: Maybe<string>, cb: (event: ExtendedEntry<OntimeEntry>) => boolean) {
+  const { data, status } = useFlatRundownWithMetadata(rundownId);
   const filteredData = useMemo(() => {
     return data.filter(cb);
   }, [data, cb]);
@@ -103,37 +101,20 @@ export function usePartialRundown(cb: (event: ExtendedEntry<OntimeEntry>) => boo
 
 /**
  * Hook to get a specific entry by ID from the rundown
+ * @deprecated
  */
-export function useEntry(entryId: EntryId | null): OntimeEntry | null {
-  const { data: rundown } = useRundown();
+export function useEntry(rundownId: Maybe<string>, entryId: EntryId | null): OntimeEntry | null {
+  const { data: rundown } = useRundown(rundownId);
 
   if (entryId === null) return null;
   return rundown.entries[entryId] ?? null;
 }
 
-export function useRundownAuxData() {
-  const { data, status } = useRundown();
+export function useRundownAuxData(rundownId: Maybe<string>) {
+  const { data, status } = useRundown(rundownId);
   const filteredData = useMemo(() => {
     const { title, id } = data;
     return { title, id };
   }, [data]);
   return { data: filteredData, status };
 }
-
-/**
- * Provides access to a specific rundown by ID.
- * When rundownId is null/undefined the query is disabled and returns the placeholder.
- */
-export function useRundownById(rundownId: string | null | undefined) {
-  const enabled = Boolean(rundownId);
-
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
-    queryKey: getRundownQueryKey(rundownId ?? ''),
-    queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
-    enabled,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    refetchInterval: queryRefetchIntervalSlow,
-  });
-
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
-}

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

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

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

@@ -90,6 +90,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 0,
       isPast: true,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -107,6 +108,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 1, // UI indexes are 1 based
       isPast: true,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -124,6 +126,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 1,
       isPast: true,
       isNextDay: false,
+      isParentToLoaded: true,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -140,6 +143,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 2,
       isPast: true,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -156,6 +160,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 2,
       isPast: true,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -172,6 +177,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 3,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: true,
       isLoaded: true,
@@ -188,6 +194,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 4,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: true,
       isLoaded: false,
@@ -204,6 +211,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 5,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 7,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -256,6 +264,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 0,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -273,6 +282,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 1,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,
@@ -290,6 +300,7 @@ describe('initRundownMetadata()', () => {
       eventIndex: 2,
       isPast: false,
       isNextDay: false,
+      isParentToLoaded: false,
       totalGap: 0,
       isLinkedToLoaded: false,
       isLoaded: false,

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

@@ -27,6 +27,7 @@ export type RundownMetadata = {
   groupColour: string | undefined;
   groupEntries: number | undefined;
   isFirstAfterGroup: boolean;
+  isParentToLoaded: boolean; // if the group contains the loaded event
 };
 
 export type ExtendedEntry<T extends OntimeEntry = OntimeEntry> = T & RundownMetadata;
@@ -94,6 +95,7 @@ export function initRundownMetadata(selectedEventId: MaybeString) {
     groupColour: undefined,
     groupEntries: undefined,
     isFirstAfterGroup: false,
+    isParentToLoaded: false,
   };
 
   function process(entry: OntimeEntry): Readonly<RundownMetadata> {
@@ -117,6 +119,7 @@ function processEntry(
   // initialise data to be overridden below
   processedData.isNextDay = false;
   processedData.isLoaded = false;
+  processedData.isParentToLoaded = false;
 
   processedData.previousEntryId = processedData.thisId; // thisId comes from the previous iteration
   processedData.thisId = entry.id; // we reassign thisId
@@ -132,6 +135,7 @@ function processEntry(
     processedData.groupId = entry.id;
     processedData.groupColour = entry.colour;
     processedData.groupEntries = entry.entries.length;
+    processedData.isParentToLoaded = selectedEventId ? entry.entries.includes(selectedEventId) : false;
   } else {
     // for delays and groups, we insert the group metadata
     if ((entry as OntimeEvent | OntimeDelay | OntimeMilestone).parent !== processedData.groupId) {

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

@@ -14,7 +14,6 @@ import {
   APP_SETTINGS,
   CLIENT_LIST,
   CSS_OVERRIDE,
-  CURRENT_RUNDOWN_QUERY_KEY,
   CUSTOM_FIELDS,
   PROJECT_DATA,
   REPORT,
@@ -242,7 +241,6 @@ export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: s
   if (!rundownId) {
     // we omit rundownId to signify invalidate all rundowns
     ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
-    ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
     return;
   }
 
@@ -256,12 +254,6 @@ export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: s
   }
 
   ontimeQueryClient.invalidateQueries({ queryKey, exact: true });
-
-  // keep current alias in sync with the ID-based cache
-  const loadedRundownId = ontimeQueryClient.getQueryData<{ loaded: string }>(PROJECT_RUNDOWNS)?.loaded;
-  if (!loadedRundownId || loadedRundownId === rundownId) {
-    ontimeQueryClient.invalidateQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
-  }
 }
 
 export function sendSocket<T extends MessageTag | ApiActionTag>(

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

@@ -5,7 +5,7 @@ import { deleteAllReport } from '../../../../common/api/report';
 import { createBlob, downloadBlob } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import useReport from '../../../../common/hooks-query/useReport';
-import useRundown from '../../../../common/hooks-query/useRundown';
+import { useRundown } from '../../../../common/hooks-query/useRundown';
 import { cx } from '../../../../common/utils/styleUtils';
 import { formatTime } from '../../../../common/utils/time';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -15,7 +15,7 @@ import style from './ReportSettings.module.scss';
 
 export default function ReportSettings() {
   const { data: reportData } = useReport();
-  const { data } = useRundown();
+  const { data } = useRundown(null);
 
   const clearReport = async () => await deleteAllReport();
   const downloadCSV = (combinedReport: CombinedReport[]) => {

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

@@ -18,9 +18,9 @@ import IconButton from '../../../../common/components/buttons/IconButton';
 import Dialog from '../../../../common/components/dialog/Dialog';
 import { DropdownMenu } from '../../../../common/components/dropdown-menu/DropdownMenu';
 import Tag from '../../../../common/components/tag/Tag';
+import { useDirectLinkToBackgroundEdit } from '../../../../common/context/RundownSelectionContext';
 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';

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

@@ -21,7 +21,7 @@ import Button from '../../../../../common/components/buttons/Button';
 import Info from '../../../../../common/components/info/Info';
 import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink';
 import Modal from '../../../../../common/components/modal/Modal';
-import useRundown from '../../../../../common/hooks-query/useRundown';
+import { useRundown } from '../../../../../common/hooks-query/useRundown';
 import { validateExcelImport } from '../../../../../common/utils/uploadUtils';
 import * as Panel from '../../../panel-utils/PanelUtils';
 import GSheetSetup from './GSheetSetup';
@@ -54,7 +54,7 @@ export default function SourcesPanel() {
   const [hasFile, setHasFile] = useState<'none' | 'loading' | 'done'>('none');
   const [activeSource, setActiveSource] = useState<ActiveSource | null>(null);
 
-  const { data: currentRundown } = useRundown();
+  const { data: currentRundown } = useRundown(null);
   const { importRundown } = useSpreadsheetImport();
 
   const fileInputRef = useRef<HTMLInputElement>(null);

apps/client/src/features/operator/useOperatorData.ts

@@ -14,7 +14,7 @@ export interface OperatorData {
 }
 
 export function useOperatorData(): ViewData<OperatorData> {
-  const { data: rundown, rundownMetadata, status: rundownStatus } = useRundownWithMetadata();
+  const { data: rundown, rundownMetadata, status: rundownStatus } = useRundownWithMetadata(null);
   const { data: customFields, status: customFieldStatus } = useCustomFields();
   const { data: settings, status: settingsStatus } = useSettings();
 

apps/client/src/features/overview/composite/TimeElements.tsx

@@ -210,7 +210,7 @@ export function MetadataTimes() {
 function GroupTimes() {
   const { clock, mode, groupExpectedEnd, actualGroupStart, currentDay, playback, phase } = useGroupTimerOverView();
   const currentGroupId = useCurrentGroupId();
-  const group = useEntry(currentGroupId) as OntimeGroup | null;
+  const group = useEntry(null, currentGroupId) as OntimeGroup | null;
 
   const hasRunningTimer = phase !== TimerPhase.Pending && isPlaybackActive(playback);
 
@@ -266,7 +266,7 @@ function GroupTimes() {
 function FlagTimes() {
   const { clock, mode, actualStart, plannedStart, playback, currentDay, phase } = useFlagTimerOverView();
   const { id, expectedStart } = useNextFlag();
-  const entry = useEntry(id) as OntimeEvent | null;
+  const entry = useEntry(null, id) as OntimeEvent | null;
 
   const hasRunningTimer = phase !== TimerPhase.Pending && isPlaybackActive(playback);
 

apps/client/src/features/overview/composite/TitleOverview.tsx

@@ -6,7 +6,7 @@ import style from './TitleOverview.module.scss';
 export default function TitleOverview() {
   'use memo';
   const { data: projectData } = useProjectData();
-  const { data: rundownData } = useRundownAuxData();
+  const { data: rundownData } = useRundownAuxData(null);
 
   if (!projectData.title && !rundownData.title) {
     return null;

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

@@ -6,8 +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 { RundownSelectionContextProvider } from '../../common/context/RundownSelectionContext';
 import { useIsSmallDevice } from '../../common/hooks/useIsSmallDevice';
 import { handleLinks } from '../../common/utils/linkUtils';
 import { cx } from '../../common/utils/styleUtils';
@@ -39,28 +38,29 @@ function RundownExport() {
     defaultValue: RundownViewMode.List,
   });
   const isSmallDevice = useIsSmallDevice();
-  const entryActions = useEntryActions();
 
   if (isSmallDevice && isExtracted) {
     return (
-      <EntryActionsProvider actions={entryActions}>
-        <ProtectRoute permission='editor'>
-          <div
-            className={cx([style.rundownExport, style.extracted])}
-            data-target='small-device'
-            data-testid='panel-rundown'
-          >
-            <FinderPlacement />
-            <ViewNavigationMenu suppressSettings />
-            <div className={style.rundown}>
-              <ErrorBoundary>
-                <RundownRoot isSmallDevice isExtracted viewMode={viewMode} setViewMode={setViewMode} />
-                <RundownContextMenu />
-              </ErrorBoundary>
+      <RundownSelectionContextProvider>
+        <EntryActionsProvider>
+          <ProtectRoute permission='editor'>
+            <div
+              className={cx([style.rundownExport, style.extracted])}
+              data-target='small-device'
+              data-testid='panel-rundown'
+            >
+              <FinderPlacement />
+              <ViewNavigationMenu suppressSettings />
+              <div className={style.rundown}>
+                <ErrorBoundary>
+                  <RundownRoot isSmallDevice isExtracted viewMode={viewMode} setViewMode={setViewMode} />
+                  <RundownContextMenu />
+                </ErrorBoundary>
+              </div>
             </div>
-          </div>
-        </ProtectRoute>
-      </EntryActionsProvider>
+          </ProtectRoute>
+        </EntryActionsProvider>
+      </RundownSelectionContextProvider>
     );
   }
 
@@ -70,30 +70,32 @@ function RundownExport() {
     viewMode === RundownViewMode.Table;
 
   return (
-    <EntryActionsProvider actions={entryActions}>
-      <ProtectRoute permission='editor'>
-        <div className={cx([style.rundownExport, isExtracted && style.extracted])} data-testid='panel-rundown'>
-          <FinderPlacement />
-          {isExtracted && <ViewNavigationMenu suppressSettings isNavigationLocked={getIsNavigationLocked()} />}
-          <div className={style.rundown}>
-            <Editor.Panel className={style.list}>
-              <ErrorBoundary>
-                {!isExtracted && <Editor.CornerExtract onClick={(event) => handleLinks('rundown', event)} />}
-                <RundownRoot isExtracted={isExtracted} viewMode={viewMode} setViewMode={setViewMode} />
-                <RundownContextMenu />
-              </ErrorBoundary>
-            </Editor.Panel>
-            {!hideSideBar && (
-              <div className={style.side}>
+    <RundownSelectionContextProvider>
+      <EntryActionsProvider>
+        <ProtectRoute permission='editor'>
+          <div className={cx([style.rundownExport, isExtracted && style.extracted])} data-testid='panel-rundown'>
+            <FinderPlacement />
+            {isExtracted && <ViewNavigationMenu suppressSettings isNavigationLocked={getIsNavigationLocked()} />}
+            <div className={style.rundown}>
+              <Editor.Panel className={style.list}>
                 <ErrorBoundary>
-                  <RundownEntryEditor />
+                  {!isExtracted && <Editor.CornerExtract onClick={(event) => handleLinks('rundown', event)} />}
+                  <RundownRoot isExtracted={isExtracted} viewMode={viewMode} setViewMode={setViewMode} />
+                  <RundownContextMenu />
                 </ErrorBoundary>
-              </div>
-            )}
+              </Editor.Panel>
+              {!hideSideBar && (
+                <div className={style.side}>
+                  <ErrorBoundary>
+                    <RundownEntryEditor />
+                  </ErrorBoundary>
+                </div>
+              )}
+            </div>
           </div>
-        </div>
-      </ProtectRoute>
-    </EntryActionsProvider>
+        </ProtectRoute>
+      </EntryActionsProvider>
+    </RundownSelectionContextProvider>
   );
 }
 
@@ -105,17 +107,16 @@ interface RundownRootProps {
 }
 
 function RundownRoot({ isSmallDevice, isExtracted, viewMode, setViewMode }: RundownRootProps) {
-  const source = useLoadedRundownSource();
-
   return (
     <div className={style.rundownRoot}>
       {isSmallDevice ? (
         <RundownHeaderMobile viewMode={viewMode} setViewMode={setViewMode} />
       ) : (
+        // TODO: add data-background-rundown={!isLoadedRundown} styling
         <RundownHeader isExtracted={isExtracted} viewMode={viewMode} setViewMode={setViewMode} />
       )}
       {viewMode === RundownViewMode.List ? <RundownList /> : <RundownTable />}
-      {viewMode === RundownViewMode.Table && <EntryEditModal rundown={source.rundown} />}
+      {viewMode === RundownViewMode.Table && <EntryEditModal />}
       <RenumberCuesDialog />
     </div>
   );

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

@@ -1,16 +1,23 @@
+import { Playback } from 'ontime-types';
 import { memo } from 'react';
 
 import Empty from '../../common/components/state/Empty';
-import { useRundownWithMetadata } from '../../common/hooks-query/useRundown';
+import { useContextRundownList } from '../../common/hooks-query/useContextRundown';
 import { useRundownEditor } from '../../common/hooks/useSocket';
 import Rundown from './Rundown';
 
+const backgroundFeatureData = {
+  playback: Playback.Stop,
+  selectedEventId: null,
+  nextEventId: null,
+};
+
 export default memo(RundownList);
 function RundownList() {
-  const { data, status, rundownMetadata } = useRundownWithMetadata();
+  const { rundown, status, rundownMetadata, isLoadedRundown } = useContextRundownList();
   const featureData = useRundownEditor();
 
-  const isLoading = status !== 'success' || !data || !rundownMetadata;
+  const isLoading = status !== 'success' || !rundown || !rundownMetadata;
 
   if (isLoading) {
     return <Empty text='Connecting to server' />;
@@ -18,12 +25,12 @@ function RundownList() {
 
   return (
     <Rundown
-      order={data.order}
-      flatOrder={data.flatOrder}
-      entries={data.entries}
-      id={data.id}
+      order={rundown.order}
+      flatOrder={rundown.flatOrder}
+      entries={rundown.entries}
+      id={rundown.id}
       rundownMetadata={rundownMetadata}
-      featureData={featureData}
+      featureData={isLoadedRundown ? featureData : backgroundFeatureData}
     />
   );
 }

apps/client/src/features/rundown/common/RundownSelect.module.scss

@@ -0,0 +1,3 @@
+.rundownSelect {
+  min-width: min(20rem, calc(100vw - 6rem));
+}

apps/client/src/features/rundown/common/RundownSelect.tsx

@@ -0,0 +1,42 @@
+import Select from '../../../common/components/select/Select';
+import { useRundownSelectionContext } from '../../../common/context/RundownSelectionContext';
+import { AppMode } from '../../../ontimeConfig';
+
+import styles from './RundownSelect.module.scss';
+
+const FOLLOW = '___null___';
+
+interface RundownSelectProps {
+  appMode: AppMode;
+}
+
+export function RundownSelect({ appMode }: RundownSelectProps) {
+  'use memo';
+  const { selectRundownId, rundowns, loadedRundownId, selectedRundownId } = useRundownSelectionContext();
+
+  const options = rundowns.map(({ id, title }) => ({
+    value: id,
+    label: loadedRundownId === id ? `${title} (loaded)` : title,
+  }));
+
+  // add a follow option
+  options.unshift({
+    value: FOLLOW,
+    label: 'Follow loaded',
+  });
+
+  return (
+    <div className={styles.rundownSelect}>
+      <Select
+        value={selectedRundownId ?? FOLLOW}
+        options={options}
+        onValueChange={(value) => {
+          if (value === FOLLOW) selectRundownId(null);
+          else selectRundownId(value);
+        }}
+        disabled={appMode === AppMode.Run}
+        fluid
+      />
+    </div>
+  );
+}

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

@@ -1,7 +1,7 @@
 import { OntimeEntry, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { useMemo } from 'react';
 
-import useRundown from '../../../common/hooks-query/useRundown';
+import { useRundown } from '../../../common/hooks-query/useRundown';
 import { useEventSelection } from '../useEventSelection';
 import EventEditorFooter from './composite/EventEditorFooter';
 import EventEditor from './EventEditor';
@@ -13,7 +13,7 @@ import style from './EntryEditor.module.scss';
 
 export default function RundownEntryEditor() {
   const selectedEvents = useEventSelection((state) => state.selectedEvents);
-  const { data } = useRundown();
+  const { data } = useRundown(null);
 
   const entry = useMemo<OntimeEntry | null>(() => {
     if (data.order.length === 0) {

apps/client/src/features/rundown/renumber-cues-dialog/RenumberCuesDialog.tsx

@@ -7,7 +7,7 @@ import Button from '../../../common/components/buttons/Button';
 import Dialog from '../../../common/components/dialog/Dialog';
 import Input from '../../../common/components/input/input/Input';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
-import useRundown from '../../../common/hooks-query/useRundown';
+import { useContextRundownCueRenumberModal } from '../../../common/hooks-query/useContextRundown';
 import { orderEntries } from '../rundown.utils';
 import { useEventSelection } from '../useEventSelection';
 
@@ -17,8 +17,7 @@ type RenumberCueData = Pick<RenumberCues, 'increment' | 'prefix' | 'start'>;
 
 export default function RenumberCuesDialog() {
   'use memo';
-  const { data } = useRundown();
-  const { flatOrder } = data;
+  const { flatOrder } = useContextRundownCueRenumberModal();
   const { onClose, isOpen } = useRenumberCuesDialogStore();
   const { renumberCues } = useEntryActionsContext();
   const selectedEvents = useEventSelection((state) => state.selectedEvents);

apps/client/src/features/rundown/rundown-header/RundownHeader.tsx

@@ -8,6 +8,7 @@ import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { setOffsetMode, useOffsetMode } from '../../../common/hooks/useSocket';
 import { AppMode } from '../../../ontimeConfig';
 import { EditorLayoutMode, useEditorLayout } from '../../../views/editor/useEditorLayout';
+import { RundownSelect } from '../common/RundownSelect';
 import { RundownViewMode } from '../rundown.options';
 import { useEditorFollowMode } from '../useEditorFollowMode';
 import RundownMenu from './RundownMenu';
@@ -24,6 +25,7 @@ interface HeaderControlsConfig {
   showRunEditToggle: boolean;
   showOffsetToggle: boolean;
   showOverflowMenu: boolean;
+  showRundownSelect: boolean;
 }
 
 export const HEADER_CONTROLS_CONFIG: Record<EditorLayoutMode, HeaderControlsConfig> = {
@@ -31,16 +33,19 @@ export const HEADER_CONTROLS_CONFIG: Record<EditorLayoutMode, HeaderControlsConf
     showRunEditToggle: true,
     showOffsetToggle: true,
     showOverflowMenu: true,
+    showRundownSelect: false,
   },
   [EditorLayoutMode.PLANNING]: {
     showRunEditToggle: false,
     showOffsetToggle: false,
     showOverflowMenu: true,
+    showRundownSelect: true,
   },
   [EditorLayoutMode.TRACKING]: {
     showRunEditToggle: false,
     showOffsetToggle: true,
     showOverflowMenu: false,
+    showRundownSelect: false,
   },
 } as const;
 
@@ -50,7 +55,8 @@ function RundownHeader({ isExtracted, viewMode, setViewMode }: RundownHeaderProp
   const offsetMode = useOffsetMode();
   const { layoutMode } = useEditorLayout();
 
-  const { showRunEditToggle, showOffsetToggle, showOverflowMenu } = HEADER_CONTROLS_CONFIG[layoutMode];
+  const { showRunEditToggle, showOffsetToggle, showOverflowMenu, showRundownSelect } =
+    HEADER_CONTROLS_CONFIG[layoutMode];
 
   const toggleAppMode = (mode: AppMode[]) => {
     // we need to stop user from deselecting a mode
@@ -122,6 +128,8 @@ function RundownHeader({ isExtracted, viewMode, setViewMode }: RundownHeaderProp
         </ToggleGroup>
       )}
 
+      {showRundownSelect && <RundownSelect appMode={editorMode} />}
+
       {showOverflowMenu && <RundownMenu allowNavigation={!isExtracted} />}
     </Toolbar.Root>
   );

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

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

apps/client/src/views/backstage/useBackstageData.ts

@@ -20,7 +20,7 @@ export function useBackstageData(): ViewData<BackstageData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundown();
+  const { data: rundownData, status: rundownStatus } = useFlatRundown(null);
   const { data: projectData, status: projectDataStatus } = useProjectData();
   const { data: settings, status: settingsStatus } = useSettings();
   const { data: customFields, status: customFieldsStatus } = useCustomFields();

apps/client/src/views/common/schedule/ScheduleContext.tsx

@@ -44,7 +44,7 @@ export const ScheduleProvider = ({ children, selectedEventId }: PropsWithChildre
     [filter],
   );
 
-  const { data: events } = usePartialRundown(filterCallback);
+  const { data: events } = usePartialRundown(null, filterCallback);
 
   const [firstIndex, setFirstIndex] = useState(-1);
   const [numPages, setNumPages] = useState(0);

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

@@ -21,7 +21,7 @@ export function useCountdownData(): ViewData<CountdownData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata();
+  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata(null);
   const { data: projectData, status: projectDataStatus } = useProjectData();
   const { data: settings, status: settingsStatus } = useSettings();
   const { data: customFields, status: customFieldsStatus } = useCustomFields();

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

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

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

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

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

@@ -1,39 +1,20 @@
-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 { useRundownSelectionContext } from '../../common/context/RundownSelectionContext';
 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({
-  source,
-  selectedRundownId,
-  setSelectedRundownId,
-  loadedRundownId,
-  projectRundowns,
-}: CuesheetTableWrapperProps) {
+function CuesheetTableWrapper() {
   const preset = use(PresetContext);
-  const isCurrentRundown = source.rundownId !== null && source.rundownId === loadedRundownId;
-  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset, { canRunMode: isCurrentRundown });
+  const { isLoadedRundown } = useRundownSelectionContext();
+
+  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset, { canRunMode: isLoadedRundown });
   const { data: customFields, status: customFieldStatus } = useCustomFields();
 
   const columns = useMemo(
@@ -50,66 +31,11 @@ function CuesheetTableWrapper({
       ) : (
         <CuesheetTable
           columns={columns}
-          source={source}
           cuesheetMode={cuesheetMode}
           tableRoot='cuesheet'
           setCuesheetMode={setCuesheetMode}
-          isCurrentRundown={isCurrentRundown}
-          insertElement={
-            <>
-              <RundownSelect
-                cuesheetMode={cuesheetMode}
-                selectedRundownId={selectedRundownId}
-                loadedRundownId={loadedRundownId}
-                setSelectedRundownId={setSelectedRundownId}
-                projectRundowns={projectRundowns}
-              />
-            </>
-          }
         />
       )}
     </CuesheetDnd>
   );
 }
-
-interface RundownSelectProps {
-  cuesheetMode: AppMode;
-  selectedRundownId: MaybeString;
-  loadedRundownId: string;
-  setSelectedRundownId: (rundownId: string) => void;
-  projectRundowns: ProjectRundown[];
-}
-
-function RundownSelect({
-  cuesheetMode,
-  projectRundowns,
-  loadedRundownId,
-  selectedRundownId,
-  setSelectedRundownId,
-}: RundownSelectProps) {
-  'use memo';
-  const options = projectRundowns.map(({ id, title }) => ({
-    value: id,
-    label: loadedRundownId === id ? `${title} (loaded)` : title,
-  }));
-  options.unshift({
-    value: FOLLOW_LOADED_RUNDOWN_ID,
-    label: 'Follow loaded', // TODO: Better wording and maybe icon? and translation
-  });
-
-  return (
-    <div className={styles.rundownSelect}>
-      <Select
-        value={selectedRundownId ?? undefined}
-        options={options}
-        onValueChange={(value) => {
-          if (value) {
-            setSelectedRundownId(value);
-          }
-        }}
-        disabled={cuesheetMode === AppMode.Run}
-        fluid
-      />
-    </div>
-  );
-}

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

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

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

@@ -1,16 +1,13 @@
-import { Rundown } from 'ontime-types';
 import { memo } from 'react';
 
 import Modal from '../../../common/components/modal/Modal';
+import { useContextRundownEditModal } from '../../../common/hooks-query/useContextRundown';
 import CuesheetEntryEditor from '../../../features/rundown/entry-editor/CuesheetEventEditor';
 import { useEditModal } from './useEditModal';
 
-interface EntryEditModalProps {
-  rundown: Rundown;
-}
-
 export default memo(EntryEditModal);
-function EntryEditModal({ rundown }: EntryEditModalProps) {
+function EntryEditModal() {
+  const { rundown } = useContextRundownEditModal();
   const entryId = useEditModal((state) => state.selectedEntryId);
   const closeModal = useEditModal((state) => state.clearSelection);
 

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

@@ -1,7 +1,7 @@
 import { useTableNav } from '@table-nav/react';
 import { ColumnDef, Table, getCoreRowModel, useReactTable } from '@tanstack/react-table';
 import { OntimeEntry, SupportedEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
-import { ComponentProps, ReactNode, memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { ComponentProps, memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import {
   ContextProp,
   ItemProps,
@@ -14,7 +14,7 @@ import {
 import EmptyPage from '../../../common/components/state/EmptyPage';
 import EmptyTableBody from '../../../common/components/state/EmptyTableBody';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
-import type { RundownSource } from '../../../common/hooks-query/useScopedRundown';
+import { useContextRundownTable } from '../../../common/hooks-query/useContextRundown';
 import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
 import { usePersistedRundownOptions } from '../../../features/rundown/rundown.options';
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
@@ -35,34 +35,22 @@ 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,
-  source,
-  tableRoot,
-  setCuesheetMode,
-  isCurrentRundown,
-  insertElement,
-}: CuesheetTableProps) {
-  const { flatRundown, status, selectedEventId } = source;
+export default function CuesheetTable({ columns, cuesheetMode, tableRoot, setCuesheetMode }: CuesheetTableProps) {
+  const { flatRundown, status, loadedEventId } = useContextRundownTable();
   const { updateEntry, updateTimer, addEntry } = useEntryActionsContext();
   const canCreateEntries = useCuesheetPermissions((state) => state.canCreateEntries) && cuesheetMode === AppMode.Edit;
 
@@ -143,17 +131,17 @@ export default function CuesheetTable({
 
   // in Run mode, follow the current event
   useEffect(() => {
-    if (virtuosoRef.current === null || cuesheetMode !== AppMode.Run || !selectedEventId) {
+    if (virtuosoRef.current === null || cuesheetMode !== AppMode.Run || !loadedEventId) {
       return;
     }
 
-    const eventIndex = flatRundown.findIndex((event) => event.id === selectedEventId);
+    const eventIndex = flatRundown.findIndex((event) => event.id === loadedEventId);
     if (eventIndex === -1) {
       return;
     }
 
     virtuosoRef.current.scrollToIndex({ index: eventIndex, behavior: 'auto', align: 'start', offset: -50 });
-  }, [cuesheetMode, flatRundown, selectedEventId]);
+  }, [cuesheetMode, flatRundown, loadedEventId]);
 
   // Provide an imperative scroll handler for explicit jumps (finder/keyboard)
   useEffect(() => {
@@ -242,17 +230,9 @@ export default function CuesheetTable({
         handleResetResizing={resetColumnResizing}
         handleResetReordering={resetColumnOrder}
         handleClearToggles={setAllVisible}
-        insertElement={insertElement}
-        modeControls={
-          tableRoot === 'cuesheet'
-            ? {
-                cuesheetMode,
-                setCuesheetMode,
-                isCurrentRundown,
-              }
-            : undefined
-        }
-        showShare={tableRoot === 'cuesheet'}
+        appMode={cuesheetMode}
+        tableRoot={tableRoot}
+        setCuesheetMode={setCuesheetMode}
       />
       <TableVirtuoso
         ref={virtuosoRef}

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

@@ -10,7 +10,9 @@ import Button from '../../../../common/components/buttons/Button';
 import Checkbox from '../../../../common/components/checkbox/Checkbox';
 import * as Editor from '../../../../common/components/editor-utils/EditorUtils';
 import PopoverContents from '../../../../common/components/popover/Popover';
+import { useRundownSelectionContext } from '../../../../common/context/RundownSelectionContext';
 import type { ExtendedEntry } from '../../../../common/utils/rundownMetadata';
+import { RundownSelect } from '../../../../features/rundown/common/RundownSelect';
 import { AppMode } from '../../../../ontimeConfig';
 import { useCuesheetPermissions } from '../../useTablePermissions';
 import CuesheetShareModal from './CuesheetShareModal';
@@ -30,21 +32,15 @@ type TableHeaderOptionValues = Pick<
   'hideTableSeconds' | 'hideIndexColumn' | 'showDelayedTimes' | 'hideDelays'
 >;
 
-type TableModeControls = {
-  cuesheetMode: AppMode;
-  setCuesheetMode: (mode: AppMode) => void;
-  isCurrentRundown?: boolean;
-};
-
 interface CuesheetTableHeaderToolbarProps {
   columns: Column<ExtendedEntry, unknown>[];
   optionsStore: TableHeaderOptionsStore;
   handleResetResizing: () => void;
   handleResetReordering: () => void;
   handleClearToggles: () => void;
-  insertElement?: ReactNode;
-  modeControls?: TableModeControls;
-  showShare?: boolean;
+  setCuesheetMode?: (mode: AppMode) => void;
+  appMode: AppMode;
+  tableRoot: 'editor' | 'cuesheet';
 }
 
 export default function CuesheetTableHeaderToolbar({
@@ -53,23 +49,23 @@ export default function CuesheetTableHeaderToolbar({
   handleResetResizing,
   handleResetReordering,
   handleClearToggles,
-  insertElement,
-  modeControls,
-  showShare = false,
+  setCuesheetMode,
+  tableRoot,
+  appMode,
 }: CuesheetTableHeaderToolbarProps) {
-  const canChangeMode = useCuesheetPermissions((state) => state.canChangeMode);
-  const canShare = useCuesheetPermissions((state) => state.canShare);
+  const canChangeMode = useCuesheetPermissions((state) => state.canChangeMode) && tableRoot === 'cuesheet';
+  const canShare = useCuesheetPermissions((state) => state.canShare) && tableRoot === 'cuesheet';
+  const showRundownSelect = tableRoot === 'cuesheet';
+  const { isLoadedRundown } = useRundownSelectionContext();
 
   const toggleCuesheetMode = (mode: AppMode[]) => {
     const newValue = mode.at(0);
-    if (!newValue || !modeControls) return;
-    modeControls.setCuesheetMode(newValue);
+    if (!newValue || !setCuesheetMode) return;
+    setCuesheetMode(newValue);
   };
 
-  const isBackground = !(modeControls?.isCurrentRundown ?? true);
-
   return (
-    <Toolbar.Root className={style.tableSettings} data-background-rundown={isBackground}>
+    <Toolbar.Root className={style.tableSettings} data-background-rundown={!isLoadedRundown}>
       <ViewSettings optionsStore={optionsStore} />
       <ColumnSettings
         columns={columns}
@@ -77,14 +73,14 @@ export default function CuesheetTableHeaderToolbar({
         handleResetReordering={handleResetReordering}
         handleClearToggles={handleClearToggles}
       />
-      {modeControls && canChangeMode && (
-        <div className={style.apart}>
-          {insertElement}
+      <div className={style.apart}>
+        {showRundownSelect && <RundownSelect appMode={appMode} />}
+        {canChangeMode && (
           <ToggleGroup
-            value={[modeControls.cuesheetMode]}
+            value={[appMode]}
             onValueChange={toggleCuesheetMode}
             className={style.group}
-            disabled={!modeControls.isCurrentRundown}
+            disabled={!isLoadedRundown}
           >
             <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
               Run
@@ -93,10 +89,10 @@ export default function CuesheetTableHeaderToolbar({
               Edit
             </Toolbar.Button>
           </ToggleGroup>
-        </div>
-      )}
+        )}
+      </div>
 
-      {showShare && canShare && (
+      {canShare && (
         <>
           <Editor.Separator orientation='vertical' />
           <CuesheetShareModal />

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

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

apps/client/src/views/editor/finder/useFinder.tsx

@@ -1,7 +1,7 @@
 import { EntryId, MaybeString, SupportedEntry, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { ChangeEvent, useCallback, useEffect, useRef, useState } from 'react';
 
-import { useFlatRundown } from '../../../common/hooks-query/useRundown';
+import { useContextRundownFinder } from '../../../common/hooks-query/useContextRundown';
 import { useSelectAndRevealEntry } from '../../../features/rundown/useSelectAndRevealEntry';
 
 const maxResults = 12;
@@ -38,7 +38,7 @@ type FilterableMilestone = {
 type FilterableEntry = FilterableGroup | FilterableEvent | FilterableMilestone;
 
 export default function useFinder() {
-  const { data, rundownId } = useFlatRundown();
+  const { rundown: data, rundownId } = useContextRundownFinder();
   const [results, setResults] = useState<FilterableEntry[]>([]);
   const [error, setError] = useState<MaybeString>(null);
   const lastSearchString = useRef('');

apps/client/src/views/editor/title-list/TitleList.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
 
 import ScrollArea from '../../../common/components/scroll-area/ScrollArea';
-import useRundown from '../../../common/hooks-query/useRundown';
+import { useRundown } from '../../../common/hooks-query/useRundown';
 import { useSelectedEventId } from '../../../common/hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata } from '../../../common/utils/rundownMetadata';
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
@@ -20,7 +20,7 @@ interface TitleListProps {
 }
 
 export default function TitleList({ mode }: TitleListProps) {
-  const { data: rundown } = useRundown();
+  const { data: rundown } = useRundown(null);
   const selectedEventId = useSelectedEventId();
   const cursor = useEventSelection((state) => state.cursor);
 

apps/client/src/views/editor/useEditorLayout.ts

@@ -1,6 +1,9 @@
 import { isValueOfEnum } from 'ontime-utils';
+import { useCallback, useEffect } from 'react';
 import { useSearchParams } from 'react-router';
 
+import { setSelectRundownInParams } from '../../common/context/RundownSelectionContext';
+
 const layoutParam = 'layout';
 
 export enum EditorLayoutMode {
@@ -20,14 +23,29 @@ function getEditorLayout(value: string | null): EditorLayoutMode {
 }
 
 export function useEditorLayout() {
+  'use memo';
+
   const [searchParams, setSearchParams] = useSearchParams();
   const layoutMode = getEditorLayout(searchParams.get(layoutParam));
 
-  const setLayoutMode = (mode: EditorLayoutMode) => {
-    const nextParams = new URLSearchParams(searchParams);
-    nextParams.set(layoutParam, mode);
-    setSearchParams(nextParams, { replace: true });
-  };
+  useEffect(() => {
+    setSearchParams((searchParams) => {
+      if (layoutMode !== EditorLayoutMode.PLANNING) setSelectRundownInParams(null, searchParams);
+      return searchParams;
+    });
+  }, [setSearchParams, layoutMode]);
+
+  const setLayoutMode = useCallback(
+    (mode: EditorLayoutMode) => {
+      setSearchParams((searchParams) => {
+        searchParams.set(layoutParam, mode);
+        // Only the Planning layout is allowed to look at something other than the current rundown
+        if (mode !== EditorLayoutMode.PLANNING) setSelectRundownInParams(null, searchParams);
+        return searchParams;
+      });
+    },
+    [setSearchParams],
+  );
 
   return { layoutMode, setLayoutMode };
 }

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

@@ -16,7 +16,7 @@ export interface TimelineData {
 
 export function useTimelineData(): ViewData<TimelineData> {
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata();
+  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata(null);
   const { data: projectData, status: projectDataStatus } = useProjectData();
   const { data: settings, status: settingsStatus } = useSettings();
   const { data: customFields, status: customFieldsStatus } = useCustomFields();

apps/client/src/views/timer/useTimerData.ts

@@ -2,7 +2,7 @@ import { CustomFields, ProjectData, RundownEntries, Settings, ViewSettings } fro
 
 import useCustomFields from '../../common/hooks-query/useCustomFields';
 import useProjectData from '../../common/hooks-query/useProjectData';
-import useRundown from '../../common/hooks-query/useRundown';
+import { useRundown } from '../../common/hooks-query/useRundown';
 import useSettings from '../../common/hooks-query/useSettings';
 import useViewSettings from '../../common/hooks-query/useViewSettings';
 import { useViewOptionsStore } from '../../common/stores/viewOptions';
@@ -26,7 +26,7 @@ export function useTimerData(): ViewData<TimerData> {
   const { data: viewSettings, status: viewSettingsStatus } = useViewSettings();
   const { data: settings, status: settingsStatus } = useSettings();
   const { data: customFields, status: customFieldsStatus } = useCustomFields();
-  const { data: rundown, status: rundownStatus } = useRundown();
+  const { data: rundown, status: rundownStatus } = useRundown(null);
   const { entries } = rundown;
 
   return {