allow editing cuesheet link permissions

Co-authored-by: Carlos Valente <carlosvalente@pm.me>

apps/cli/package.json

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

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "private": true,
   "type": "module",
   "dependencies": {

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

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

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

@@ -37,6 +37,7 @@ describe('getRouteFromPreset()', () => {
       alias: 'demopage',
       target: OntimeView.Timer,
       search: 'user=guest',
+      displayInNav: false,
       options: {},
     },
   ];
@@ -119,6 +120,7 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-4685d6',
         target: OntimeView.Cuesheet,
         search: '',
+        displayInNav: false,
         options: {
           read: 'full',
           write: '-',
@@ -131,6 +133,7 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-basic',
         target: OntimeView.Cuesheet,
         search: '',
+        displayInNav: false,
       },
     ];
     const cuesheetPresetWithNavLock: URLPreset[] = [
@@ -139,6 +142,7 @@ describe('getRouteFromPreset()', () => {
         alias: 'cuesheet-locked',
         target: OntimeView.Cuesheet,
         search: 'n=1',
+        displayInNav: false,
       },
     ];
 
@@ -220,6 +224,7 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
+        displayInNav: false,
       },
     ],
     [
@@ -231,6 +236,7 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
+        displayInNav: false,
       },
     ],
     [
@@ -242,6 +248,7 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
+        displayInNav: false,
       },
     ],
     [
@@ -253,6 +260,7 @@ describe('generateUrlPresetOptions', () => {
         target: 'timer',
         search: 'param1=value1&param2=value2',
         enabled: true,
+        displayInNav: false,
       },
     ],
   ])('should generate URL preset options for %s', (_description, alias, url, expected) => {

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

@@ -194,6 +194,7 @@ export function generateUrlPresetOptions(alias: string, userUrl: string): URLPre
     target: path,
     search: url.searchParams.toString(),
     enabled: true,
+    displayInNav: false,
   };
 }
 

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

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

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

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

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

@@ -10,13 +10,19 @@ export default function McpSection() {
   const { data: infoData } = useInfo();
   const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
 
+  // generate url
   useEffect(() => {
-    const baseUrl = isOntimeCloud
+    const baseUrl = (() => {
-      ? serverURL
+      if (isOntimeCloud) return serverURL;
-      : infoData.networkInterfaces.length > 0
-        ? `http://${infoData.networkInterfaces[0].address}:${infoData.serverPort}`
-        : serverURL;
 
+      // for local setups we prefer the localhost IP to avoid remote access
+      if (infoData.networkInterfaces.length > 0) {
+        return `http://${infoData.networkInterfaces[0].address}:${infoData.serverPort}`;
+      }
+      return serverURL;
+    })();
+
+    // we are reusing the endpoint, so locking config and nav have no effect
     generateUrl({ baseUrl, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
       .then(setMcpEndpointUrl)
       .catch(() => {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/electron/package.json

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

apps/resolver/package.json

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

apps/server/package.json

@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "exports": "./src/index.js",
   "dependencies": {
     "@googleapis/sheets": "^5.0.5",

apps/server/src/api-data/db/migration/db.migration.v3.ts

@@ -110,14 +110,13 @@ type old_URLPreset = {
 /**
  * migrates a url presets from v3 to v4
  * - pathAndParams split into a target and search
- *
  */
 export function migrateURLPresets(jsonData: object): URLPreset[] | undefined {
   if (is.objectWithKeys(jsonData, ['urlPresets']) && is.array(jsonData.urlPresets)) {
     const oldURLPresets = structuredClone(jsonData.urlPresets) as old_URLPreset;
     const newURLPreset: URLPreset[] = oldURLPresets.map(({ enabled, alias, pathAndParams }) => {
       const [target, search] = pathAndParams.split('?');
-      return { enabled, alias, target, search, options: {} } as URLPreset;
+      return { enabled, alias, target, search, displayInNav: false, options: {} } as URLPreset;
     });
     return newURLPreset;
   }

apps/server/src/api-data/db/migration/migration.test.ts

@@ -208,6 +208,7 @@ describe('v3 to v4', () => {
         target: OntimeView.Timer,
         search:
           'showLeadingZeros=true&timerType=clock&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
+        displayInNav: false,
         options: {},
       },
       {
@@ -216,6 +217,7 @@ describe('v3 to v4', () => {
         target: OntimeView.Timer,
         search:
           'showLeadingZeros=true&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
+        displayInNav: false,
         options: {},
       },
     ];

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

@@ -704,11 +704,14 @@ export async function renameRundown(id: string, title: string) {
   await dataProvider.setRundown(id, { ...rundown, title });
 
   /**
-   * If loaded we re-init the rundown
+   * If we are modifying the loaded rundown we re-init it
    * This is likely over-kill but the simplest way to ensure state consistency
    */
   if (isCurrentRundown(id)) {
-    await initRundown(dataProvider.getRundown(id), dataProvider.getCustomFields());
+    const rundown = dataProvider.getRundown(id);
+    const customField = dataProvider.getCustomFields();
+    // init rundown does its own refetch
+    await initRundown(rundown, customField);
   } else {
     setImmediate(() => {
       sendRefetch(RefetchKey.ProjectRundowns);

apps/server/src/api-data/url-presets/__tests__/urlPresets.parser.test.ts

@@ -12,7 +12,9 @@ describe('parseUrlPresets()', () => {
 
   it('parses data, skipping invalid results', () => {
     const errorEmitter = vi.fn();
-    const urlPresets = [{ enabled: true, alias: 'alias', target: 'timer', search: 'ss' }] as URLPreset[];
+    const urlPresets = [
+      { enabled: true, alias: 'alias', target: 'timer', search: 'ss', displayInNav: false },
+    ] as URLPreset[];
     const result = parseUrlPresets({ urlPresets }, errorEmitter);
     expect(result.length).toEqual(1);
     expect(result.at(0)).toMatchObject({
@@ -36,6 +38,7 @@ describe('parseUrlPresets()', () => {
           alias: 'testalias',
           target: 'timer',
           search: 'testpathAndParams',
+          displayInNav: false,
         },
       ],
     } as unknown as DatabaseModel;

apps/server/src/api-data/url-presets/urlPresets.parser.ts

@@ -26,6 +26,7 @@ export function parseUrlPresets(data: Partial<DatabaseModel>, emitError?: ErrorE
       alias: preset.alias,
       target: preset.target,
       search: preset.search ?? '',
+      displayInNav: preset.displayInNav ?? false,
       options: preset?.options,
     };
     newPresets.push(newPreset);

apps/server/src/api-data/url-presets/urlPresets.router.ts

@@ -21,6 +21,7 @@ router.post('/', validateNewPreset, async (req: Request, res: Response<URLPreset
       alias: req.body.alias,
       target: req.body.target,
       search: req.body.search,
+      displayInNav: req.body.displayInNav,
       options: req.body.options,
     };
 
@@ -55,6 +56,7 @@ router.put('/:alias', validateUpdatePreset, async (req: Request, res: Response<U
       alias: req.body.alias,
       target: req.body.target,
       search: req.body.search,
+      displayInNav: req.body.displayInNav,
       options: req.body.options ?? existingPreset.options,
     };
 

apps/server/src/api-data/url-presets/urlPresets.validation.ts

@@ -12,6 +12,7 @@ export const validateNewPreset = [
   body('alias').isString().trim().notEmpty(),
   body('target').isString().trim().notEmpty().isIn(Object.values(OntimeView)),
   body('search').isString().trim(),
+  body('displayInNav').isBoolean(),
 
   // options are currently only provided for cuesheet presets
   body('options').optional().isObject(),
@@ -27,6 +28,7 @@ export const validateUpdatePreset = [
   body('alias').isString().trim().notEmpty(),
   body('target').isString().trim().notEmpty().isIn(Object.values(OntimeView)),
   body('search').isString().trim(),
+  body('displayInNav').isBoolean(),
 
   // options are currently only provided for cuesheet presets
   body('options').optional().isObject(),

apps/server/src/api-mcp/MCP.md

@@ -1,65 +0,0 @@
-# Ontime MCP Server
-
-Ontime exposes an MCP server over Streamable HTTP.
-
-## Endpoint
-
-Default local URL:
-
-```text
-http://localhost:4001/mcp
-```
-
-If Ontime is running on another host or port, replace `localhost:4001` with that address.
-If `ROUTER_PREFIX` is configured, include it before `/mcp`, for example:
-
-```text
-http://localhost:4001/stage/mcp
-```
-
-The MCP route is stateless. Clients should send MCP requests with `POST`; `GET` and
-`DELETE` are not used.
-
-## Authentication
-
-If Ontime has no session password configured, no MCP authentication is required.
-
-If a session password is configured, authenticate with the hashed Ontime token.
-The settings UI generates an endpoint URL with the token in the query string:
-
-```text
-http://localhost:4001/mcp?token=<hashed-token>
-```
-
-If your MCP client supports request headers, you can send the same token as a
-bearer token instead:
-
-```http
-Authorization: Bearer <hashed-token>
-```
-
-This is the same token used in authenticated Ontime share URLs as the `token` query
-parameter. The raw session password is not accepted as the bearer token.
-
-## Client Configuration
-
-Use a Streamable HTTP MCP client and point it at the MCP endpoint:
-
-```json
-{
-  "mcpServers": {
-    "ontime": {
-      "url": "http://localhost:4001/mcp?token=<hashed-token>"
-    }
-  }
-}
-```
-
-Omit the token when Ontime is not password protected. If you prefer headers, use
-`"url": "http://localhost:4001/mcp"` and add an `Authorization` header with the
-same bearer token.
-
-## Quick Check
-
-The server should respond to MCP initialization requests at `/mcp`. A plain browser
-`GET` request will return `405 Method not allowed`, which is expected.

apps/server/src/api-mcp/mcp.prompts.ts

@@ -90,11 +90,10 @@ Count to end (countToEnd):
 - Do not set \`countToEnd: true\` unless the user explicitly asks for "count to end", "count to scheduled end", or confirms after you explain this behaviour.
 
 End action (endAction):
-- Leave \`endAction\` unset unless the user explicitly asks for automatic cueing or chaining. It defaults to \`none\`.
+- Controls what happens when the event's timer reaches zero and can have surprising effect. Use only if the user explicitly asks for it.
-- \`load-next\` and \`play-next\` create playback automations that remove operator control between events and can surprise operators. Do NOT add them just because events are scheduled back-to-back — a seamless schedule does not imply automated playback.
+- \`none\` (default): stops at end; operator must manually start the next event.
-- \`none\` (default): stops at end; operator manually starts the next event. Use this for essentially every event unless told otherwise.
+- \`load-next\`: pre-arms the next event; operator triggers start. Use when a human handoff is needed.
-- \`load-next\`: pre-arms the next event; operator triggers start. Only set when the user explicitly asks for it.
+- \`play-next\`: automatically starts the next event. Use for seamless back-to-back segments with no gap.
-- \`play-next\`: automatically starts the next event. Only set when the user explicitly asks for an automatic playback chain; confirm they understand it removes operator control between those events.
 
 Linking (linkStart):
 - \`linkStart\` controls schedule-change propagation through the rundown.

apps/server/src/api-mcp/mcp.router.ts

@@ -17,9 +17,20 @@ mcpRouter.post('/', async (req, res) => {
     sessionIdGenerator: undefined, // stateless: no session tracking
     enableJsonResponse: true,
   });
-  res.on('close', () => transport.close());
+  const server = createMcpServer();
+
+  let cleanedUp = false;
+  const cleanup = async () => {
+    if (cleanedUp) return;
+    cleanedUp = true;
+    transport.close();
+    await server.close?.();
+  };
+
+  res.on('close', () => void cleanup());
+  res.on('finish', () => void cleanup());
+
   try {
-    const server = createMcpServer();
     await server.connect(transport);
     await transport.handleRequest(req as IncomingMessage, res as ServerResponse, req.body);
   } catch (error) {
@@ -28,6 +39,8 @@ mcpRouter.post('/', async (req, res) => {
     if (!res.headersSent) {
       res.status(500).json({ jsonrpc: '2.0', error: { code: -32603, message }, id: req.body?.id ?? null });
     }
+  } finally {
+    await cleanup();
   }
 });
 

apps/server/src/api-mcp/mcp.schema.ts

@@ -21,8 +21,7 @@ export const EVENT_TIMER_FIELDS = {
   endAction: {
     type: 'string',
     enum: ['none', 'load-next', 'play-next'],
-    description:
+    description: 'Action when event ends: none = stop, load-next = cue next event, play-next = auto-start next event',
-      'Action when the event ends. Defaults to none. load-next and play-next create playback automations (load-next arms the next event, play-next auto-starts it) that remove operator control between events and can surprise operators. Only set load-next or play-next when the user explicitly asks for automatic cueing or chaining; otherwise omit this field and leave it as none. Do not add end actions just because events are back-to-back.',
   },
   linkStart: {
     type: 'boolean',
@@ -117,7 +116,7 @@ There are four entry types discriminated by \`type\`:
   dayOffset: number          // runtime calculated day offset from the rundown start schedule, increments when the rundown crosses midnight
   gap: number                // schedule gap between sequential playable events; negative gap means overlap
   timerType: 'count-down' | 'count-up' | 'clock' | 'none'
-  endAction: 'none' | 'load-next' | 'play-next'   // load-next/play-next create playback automations; leave as none unless the user explicitly asks for cueing/chaining
+  endAction: 'none' | 'load-next' | 'play-next'
   linkStart: boolean         // chain start to previous event's end
   countToEnd: boolean        // advanced mode: counts to scheduled timeEnd instead of duration; confirm before enabling
   skip: boolean              // event is skipped during playback
@@ -233,8 +232,10 @@ Main site: https://docs.getontime.no
 - URL presets / shared views: https://docs.getontime.no/features/url-presets/
 - HTTP Integration: https://docs.getontime.no/api/http/
 - OSC Integration: https://docs.getontime.no/api/osc/
+- Make custom views: https://docs.getontime.no/features/custom-views/
 
-## API reference
+## Helpful references
-- REST API overview: https://docs.getontime.no/api/
+- Ontime Cloud: https://docs.getontime.no/ontime-cloud/
-- WebSocket events: https://docs.getontime.no/api/websocket/
+- Connect to companion module: https://docs.getontime.no/additional-notes/companion-module/
+- Import data from spreadsheets: https://docs.getontime.no/features/import-spreadsheet/
 `;

apps/server/src/api-mcp/mcp.service.ts

@@ -108,7 +108,8 @@ export function assertKnownCustomFields(...customValues: Array<EntryFieldArgs['c
   if (unknownKeys.size > 0) {
     const missing = [...unknownKeys].join(', ');
     const available = Object.keys(customFields);
-    const hint = available.length > 0 ? `Available keys: ${available.join(', ')}.` : 'No custom fields are defined yet.';
+    const hint =
+      available.length > 0 ? `Available keys: ${available.join(', ')}.` : 'No custom fields are defined yet.';
     throw new Error(
       `Unknown custom field key(s): ${missing}. ${hint} ` +
         `Call ontime_create_custom_field with { label, type, colour } to create a missing field — ` +

apps/server/src/api-mcp/mcp.tools.ts

@@ -390,7 +390,8 @@ export const TOOL_DEFINITIONS = [
         type: {
           type: 'string',
           enum: ['text', 'image'],
-          description: 'Field type — cannot be changed after creation. Use "text" for short text values; "image" for image URLs.',
+          description:
+            'Field type — cannot be changed after creation. Use "text" for short text values; "image" for image URLs.',
         },
         colour: {
           type: 'string',
@@ -409,7 +410,10 @@ export const TOOL_DEFINITIONS = [
       required: ['key'],
       properties: {
         key: { type: 'string', description: 'Current field key (from ontime_get_custom_fields)' },
-        label: { type: 'string', description: 'New human-readable label (optional). Changes the derived key and cascades to all entries.' },
+        label: {
+          type: 'string',
+          description: 'New human-readable label (optional). Changes the derived key and cascades to all entries.',
+        },
         colour: { type: 'string', description: 'New hex colour (#RRGGBB) (optional)' },
       },
     },
@@ -525,7 +529,7 @@ const TOOL_HANDLERS: Record<ToolName, (args: Record<string, unknown>) => Promise
     const serialised = text(data);
     if (serialised.length > CHARACTER_LIMIT) {
       return ok({
-        warning: `Rundown too large (${serialised.length} chars) — fetch individual entries with ontime_get_entry. Entry IDs in order: ${rundown.order.join(', ')}`,
+        warning: `Rundown too large (${serialised.length} chars) — fetch individual entries with ontime_get_entry.`,
         truncated: true,
         rundownId: rundown.id,
         order: rundown.order,

apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts

@@ -87,8 +87,8 @@ describe('safeMerge', () => {
   it('should merge the urlPresets key when present', () => {
     const newData = {
       urlPresets: [
-        { enabled: true, alias: 'alias1', search: '' },
+        { enabled: true, alias: 'alias1', target: 'timer', search: '', displayInNav: false },
-        { enabled: true, alias: 'alias2', search: '' },
+        { enabled: true, alias: 'alias2', target: 'timer', search: '', displayInNav: false },
       ] as URLPreset[],
     };
 

apps/server/src/models/demoProject.ts

@@ -43,6 +43,7 @@ export const demoDb: DatabaseModel = {
       target: OntimeView.Timer,
       search:
         'showLeadingZeros=true&timerType=clock&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
+      displayInNav: false,
     },
     {
       enabled: true,
@@ -50,6 +51,7 @@ export const demoDb: DatabaseModel = {
       target: OntimeView.Timer,
       search:
         'hideclock=true&hidecards=true&hideprogress=true&hidemessage=true&hidesecondary=true&hidelogo=true&font=arial+black&keycolour=00ff00&timerColour=ffffff',
+      displayInNav: false,
     },
   ],
   customFields: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Time keeping for live events",
   "keywords": [
     "ontime",

packages/types/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.9.0",
+  "version": "4.10.0",
   "name": "ontime-types",
   "type": "module",
   "main": "./src/index.ts",

packages/types/src/definitions/core/UrlPreset.type.ts

@@ -20,6 +20,7 @@ type BaseURLPreset = {
   enabled: boolean;
   alias: string;
   search: string;
+  displayInNav: boolean;
   options?: Record<string, string>;
 };
 
@@ -28,6 +29,7 @@ type CuesheetUrlPreset = {
   enabled: boolean;
   alias: string;
   search: string;
+  displayInNav: boolean;
   options?: {
     read?: string;
     write?: string;

packages/types/src/translations/index.ts

@@ -26,6 +26,7 @@ export const langEn = {
   'timeline.done': 'done',
   'timeline.due': 'due',
   'timeline.followedby': 'Followed by',
+  'timeline.standby': 'Standby',
   'project.title': 'Title',
   'project.description': 'Description',
   'project.info': 'Project Info',