fix: link generation should add prefix

* extract

* add to timeline

* translate Due

* fix timeline page

* begin adding some tests

* spelling

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

* move file

* refactor

* create hook

* refactor

* update test

* spelling

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

* remove translation

* explain isLinkedToLoaded

* add delay to calculation

* add delay value to test

* spelling

---------

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@getontime/cli",
-    "version": "3.13.1",
+    "version": "3.14.2",
     "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": "3.13.1",
+  "version": "3.14.2",
   "private": true,
   "type": "module",
   "dependencies": {
@@ -15,6 +15,7 @@
     "@mantine/hooks": "^7.13.3",
     "@react-icons/all-files": "^4.1.0",
     "@sentry/react": "^8.43.0",
+    "@table-nav/react": "^0.0.7",
     "@tanstack/react-query": "^5.62.7",
     "@tanstack/react-query-devtools": "^5.62.7",
     "@tanstack/react-table": "^8.20.5",

apps/client/src/AppRouter.tsx

@@ -158,7 +158,14 @@ export default function AppRouter() {
         {/*/!* Protected Routes *!/*/}
         <Route path='/editor' element={<Editor />} />
         <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route path='/op' element={<POperator />} />
+        <Route
+          path='/op'
+          element={
+            <ViewLoader>
+              <POperator />
+            </ViewLoader>
+          }
+        />
 
         {/*/!* Protected Routes - Elements *!/*/}
         <Route

apps/client/src/common/components/error-boundary/ErrorBoundary.jsx

@@ -26,17 +26,22 @@ class ErrorBoundary extends React.Component {
       error,
       errorInfo: info,
     });
+    this.reportContent = `${error} ${info.componentStack}`;
+
+    const appState = runtimeStore.getState();
+    if (appState.ping < 0) {
+      return;
+    }
 
     Sentry.withScope((scope) => {
       scope.setExtras({
         error,
-        store: runtimeStore.getState(),
+        store: appState,
         hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
       });
       const eventId = Sentry.captureException(error);
       this.setState({ eventId, info });
     });
-    this.reportContent = `${error} ${info.componentStack}`;
   }
 
   render() {

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

@@ -17,6 +17,7 @@ export default function useReactiveTextInput(
     submitOnCtrlEnter?: boolean;
     onCancelUpdate?: () => void;
     allowSubmitSameValue?: boolean;
+    allowKeyboardNavigation?: boolean;
   },
 ): UseReactiveTextInputReturn {
   const [text, setText] = useState<string>(initialText);
@@ -58,7 +59,14 @@ export default function useReactiveTextInput(
           setText(cleanVal);
         }
       }
-      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+
+      setTimeout(() => {
+        if (options?.allowKeyboardNavigation) {
+          ref.current?.parentElement?.focus(); // Focus on parent element to continue keyboard navigation
+        } else {
+          ref.current?.blur();
+        }
+      }); // Immediate timeout to ensure text is set before blurring
     },
     [initialText, options, ref, submitCallback],
   );
@@ -70,12 +78,25 @@ export default function useReactiveTextInput(
   const handleEscape = useCallback(() => {
     // No need to update if it hasn't changed
     setText(initialText);
+    // force the text to be the initial value
+    if (ref.current) {
+      ref.current.value = initialText;
+    }
     options?.onCancelUpdate?.();
-    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
+    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before blurring
   }, [initialText, options, ref]);
 
   const keyHandler = useMemo(() => {
-    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
+    const hotKeys: HotkeyItem[] = [
+      [
+        'Escape',
+        (event) => {
+          event.preventDefault();
+          handleEscape();
+        },
+        { preventDefault: true },
+      ],
+    ];
 
     if (options?.submitOnEnter) {
       hotKeys.push(['Enter', () => handleSubmit(text)]);
@@ -84,7 +105,22 @@ export default function useReactiveTextInput(
     if (options?.submitOnCtrlEnter) {
       hotKeys.push(['mod + Enter', () => handleSubmit(text)]);
     }
-    return getHotkeyHandler(hotKeys);
+
+    const hotKeyHandler = getHotkeyHandler(hotKeys);
+
+    return (event: KeyboardEvent<HTMLElement>) => {
+      // allow moving in input field with arrow keys
+      if (
+        event.key === 'ArrowLeft' ||
+        event.key === 'ArrowRight' ||
+        event.key === 'ArrowUp' ||
+        event.key === 'ArrowDown'
+      ) {
+        event.stopPropagation();
+      }
+
+      hotKeyHandler(event);
+    };
   }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);
 
   return {

apps/client/src/common/components/view-params-editor/ParamInput.tsx

@@ -126,9 +126,9 @@ function MultiOption(props: EditFormMultiOptionProps) {
             onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
           >
             {Object.values(paramField.values).map((option) => {
-              const { value, label } = option;
+              const { value, label, colour } = option;
               return (
-                <MenuItemOption value={value} key={value}>
+                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
                   {label}
                 </MenuItemOption>
               );

apps/client/src/common/components/view-params-editor/constants.ts

@@ -1,6 +1,6 @@
 import { CustomFields } from 'ontime-types';
 
-import type { ParamField } from './types';
+import type { MultiselectOptions, ParamField } from './types';
 
 export const makeOptionsFromCustomFields = (
   customFields: CustomFields,
@@ -18,6 +18,17 @@ export const makeOptionsFromCustomFields = (
   return options;
 };
 
+export function makeCustomFieldSelectOptions(customFields: CustomFields, filterImageType = true): MultiselectOptions {
+  const options: MultiselectOptions = {};
+  for (const [key, value] of Object.entries(customFields)) {
+    if (filterImageType && value.type === 'image') {
+      continue;
+    }
+    options[key] = { value: key, label: value.label, colour: value.colour };
+  }
+  return options;
+}
+
 export const getTimeOption = (timeFormat: string): ParamField => {
   const placeholder = `${timeFormat} (default)`;
   return {

apps/client/src/common/components/view-params-editor/types.ts

@@ -12,9 +12,11 @@ type OptionsField = {
   defaultValue?: string;
 };
 
+export type MultiselectOption = { value: string; label: string; colour: string };
+export type MultiselectOptions = Record<string, MultiselectOption>;
 type MultiOptionsField = {
   type: 'multi-option';
-  values: Record<string, { value: string; label: string; colour: string }>;
+  values: MultiselectOptions;
   defaultValue?: string;
 };
 

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

@@ -170,6 +170,12 @@ export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
   offset: state.runtime.offset,
 }));
 
+export const useTimeUntilData = createSelector((state: RuntimeStore) => ({
+  clock: state.clock,
+  offset: state.runtime.offset,
+  currentDay: state.eventNow?.dayOffset ?? 0, //The day of the currently running event
+}));
+
 export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
   offset: state.runtime.offset,
 }));

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

@@ -1,4 +1,4 @@
-import { formatTime, nowInMillis } from '../time';
+import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';
 
 describe('nowInMillis()', () => {
   it('should return the current time in milliseconds', () => {
@@ -38,3 +38,84 @@ describe('formatTime()', () => {
     expect(time).toStrictEqual('-01:00');
   });
 });
+
+describe('calculateTimeUntilStart()', () => {
+  test('ontime', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 0,
+      clock: 90,
+      offset: 0,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+  });
+
+  test('running behind', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 0,
+      clock: 90,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
+  });
+
+  test('running ahead', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 0,
+      clock: 80,
+      offset: 10,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
+  });
+
+  test('running behind with enough gaps', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 20,
+      clock: 50,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+  });
+
+  test('running behind with to little gaps', () => {
+    const test = {
+      timeStart: 100,
+      dayOffset: 0,
+      delay: 0,
+      currentDay: 0,
+      totalGap: 10,
+      clock: 50,
+      offset: -20,
+    };
+
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60);
+    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
+  });
+
+  //TODO: more indepth testing,
+  // including day offset handling
+  // and more?
+});

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

@@ -0,0 +1,12 @@
+/**
+ * Allows lazy evaluation and caching of a functions result
+ */
+export function lazyEvaluate<T>(fn: () => T): () => T {
+  let result: T | undefined;
+  return function () {
+    if (result === undefined) {
+      result = fn();
+    }
+    return result;
+  };
+}

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

@@ -1,8 +1,9 @@
-import { MaybeNumber, Settings, TimeFormat } from 'ontime-types';
-import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
+import { MaybeNumber, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
+import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
 
 import { FORMAT_12, FORMAT_24 } from '../../viewerConfig';
 import { APP_SETTINGS } from '../api/constants';
+import { useTimeUntilData } from '../hooks/useSocket';
 import { ontimeQueryClient } from '../queryClient';
 
 /**
@@ -125,3 +126,71 @@ export function formatDuration(duration: number, hideSeconds = true): string {
   }
   return result;
 }
+
+/**
+ *
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @returns
+ */
+export function useTimeUntilStart(
+  // typed like this to make it very clear what the data is
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+  },
+): number {
+  const { offset, clock, currentDay } = useTimeUntilData();
+  return calculateTimeUntilStart({ ...data, currentDay, clock, offset });
+}
+
+/**
+ *
+ * @param currentDay the day offset of the urrently running event
+ * @param totalGap accumulated gap from the current event
+ * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
+ * @param clock
+ * @param offset
+ * @returns
+ */
+export function calculateTimeUntilStart(
+  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
+    currentDay: number;
+    totalGap: number;
+    isLinkedToLoaded: boolean;
+    clock: number;
+    offset: number;
+  },
+): number {
+  const { timeStart, dayOffset, currentDay, totalGap, isLinkedToLoaded, clock, offset, delay } = data;
+
+  //How many days from the currently running event to this one
+  const relativeDayOffset = dayOffset - currentDay;
+
+  const delayedStart = Math.max(0, timeStart + delay);
+
+  //The normalised start time of this event relative to the currently running event
+  const normalisedTimeStart = delayedStart + relativeDayOffset * dayInMs;
+
+  const offsetTimestart = normalisedTimeStart - offset;
+  const offsetTimeUntil = offsetTimestart - clock;
+
+  if (isLinkedToLoaded) {
+    //if we are directly linked back to the loaded event we just follow the offset
+    return offsetTimeUntil;
+  }
+
+  const scheduledTimeUntil = normalisedTimeStart - clock;
+
+  const isAheadOfSchedule = offset >= 0;
+  const gapsCanCompensadeForOffset = totalGap + offset >= 0;
+
+  if (isAheadOfSchedule || gapsCanCompensadeForOffset) {
+    // if we are ahead of schedule or the gap can compensate for the amount we are behind then expect to start at the scheduled time
+    return scheduledTimeUntil;
+  }
+
+  // otherwise consume as much of the offset as possible with the gap
+  const offsetTimeUntilBufferedByGaps = offsetTimeUntil - totalGap;
+  return offsetTimeUntilBufferedByGaps;
+}

apps/client/src/externals.ts

@@ -19,9 +19,10 @@ export const buyMeACoffeeUrl = 'https://buymeacoffee.com/cpvalente';
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
-export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
+export const currentHostName = window.location.hostname;
+export const isLocalhost = currentHostName === 'localhost' || currentHostName === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');
+export const isOntimeCloud = currentHostName.includes('cloud.getontime.no');
 
 // resolve entrypoint URLs
 
@@ -75,4 +76,4 @@ function resolveBaseURI(): string {
   }
 
   return base;
-}
+}

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

@@ -31,7 +31,7 @@ import OntimeActionForm from './OntimeActionForm';
 
 import style from './AutomationForm.module.scss';
 
-const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';
+const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';
 
 interface AutomationFormProps {
   automation: Automation | AutomationDTO;

apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.module.scss

@@ -3,3 +3,12 @@
   background: $ui-white;
   border-radius: 3px;
 }
+
+.column {
+  margin-top: 1rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  color: $label-gray;
+  user-select: text;
+}

apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.tsx

@@ -6,13 +6,12 @@ import { Button, Select, Switch } from '@chakra-ui/react';
 import { generateUrl } from '../../../../common/api/session';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import copyToClipboard from '../../../../common/utils/copyToClipboard';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { linkToOtherHost } from '../../../../common/utils/linkUtils';
-import { serverURL } from '../../../../externals';
+import { currentHostName, isOntimeCloud, serverURL } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 
 import style from './GenerateLinkForm.module.scss';
@@ -39,6 +38,12 @@ export default function GenerateLinkForm() {
     formState: { errors },
   } = useForm<GenerateLinkFormOptions>({
     mode: 'onChange',
+    defaultValues: {
+      baseUrl: currentHostName,
+      path: '',
+      lock: false,
+      authenticate: false,
+    },
     resetOptions: {
       keepDirtyValues: true,
     },
@@ -72,8 +77,11 @@ export default function GenerateLinkForm() {
       </Info>
       <Panel.ListGroup>
         <Panel.ListItem>
-          <Panel.Field title='Host IP' description='Which IP address will be used' />
-          <Select variant='ontime' size='sm' {...register('baseUrl')}>
+          <Panel.Field
+            title='Host IP'
+            description={`Which IP address will be used${isOntimeCloud ? ' (not applicable in Ontime Cloud)' : ''}`}
+          />
+          <Select variant='ontime' isDisabled={isOntimeCloud} size='sm' {...register('baseUrl')}>
             {infoData.networkInterfaces.map((nif) => {
               return (
                 <option key={nif.name} value={nif.address}>
@@ -128,9 +136,9 @@ export default function GenerateLinkForm() {
           >
             {formState === 'success' ? 'Link copied to clipboard!' : 'Update share link'}
           </Button>
-          <div style={{ marginTop: '1rem', display: 'flex', flexDirection: 'column', gap: '0.25rem' }}>
+          <div className={style.column}>
             <QRCode size={172} value={url} className={style.qrCode} />
-            <ExternalLink href={url}>{url}</ExternalLink>
+            <div>{url}</div>
           </div>
         </Panel.ListItem>
       </Panel.ListGroup>

apps/client/src/features/app-settings/panel/network-panel/NetworkLogPanel.tsx

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
 import { usePing } from '../../../../common/hooks/useSocket';
 import { socketSendJson } from '../../../../common/utils/socket';
-import { isDockerImage } from '../../../../externals';
+import { isDockerImage, isOntimeCloud } from '../../../../externals';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import ClientControlPanel from '../client-control-panel/ClientControlPanel';
@@ -30,8 +30,12 @@ export default function NetworkLogPanel({ location }: PanelBaseProps) {
           <Panel.Card>
             <Panel.SubHeader>Share Ontime Link</Panel.SubHeader>
             <Panel.Divider />
-            <Panel.Paragraph>Ontime is streaming on the following network interfaces</Panel.Paragraph>
-            <InfoNif />
+            {!isOntimeCloud && (
+              <>
+                <Panel.Paragraph>Ontime is streaming on the following network interfaces</Panel.Paragraph>
+                <InfoNif />
+              </>
+            )}
             <GenerateLinkForm />
           </Panel.Card>
         </Panel.Section>

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

@@ -116,7 +116,7 @@ export default function Operator() {
 
   // subscriptions is a MultiSelect and may have multiple values
   const subscriptions = searchParams.getAll('subscribe').filter((value) => Object.hasOwn(customFields, value));
-  const canEdit = shouldEdit && subscriptions;
+  const canEdit = shouldEdit && subscriptions.length;
 
   const main = searchParams.get('main') as keyof TitleFields | null;
   const secondary = searchParams.get('secondary');

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

@@ -2,6 +2,7 @@ import { CustomFields } from 'ontime-types';
 
 import {
   getTimeOption,
+  makeCustomFieldSelectOptions,
   makeOptionsFromCustomFields,
   OptionTitle,
 } from '../../common/components/view-params-editor/constants';
@@ -9,13 +10,7 @@ import { ViewOption } from '../../common/components/view-params-editor/types';
 
 export const getOperatorOptions = (customFields: CustomFields, timeFormat: string): ViewOption[] => {
   const fieldOptions = makeOptionsFromCustomFields(customFields, { title: 'Title', note: 'Note' });
-
-  const customFieldSelect = Object.entries(customFields).reduce<
-    Record<string, { value: string; label: string; colour: string }>
-  >((acc, [key, field]) => {
-    acc[key] = { value: key, label: field.label, colour: field.colour };
-    return acc;
-  }, {});
+  const customFieldSelect = makeCustomFieldSelectOptions(customFields);
 
   return [
     { title: OptionTitle.ClockOptions, collapsible: true, options: [getTimeOption(timeFormat)] },
@@ -46,6 +41,13 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
           type: 'multi-option',
           values: customFieldSelect,
         },
+        {
+          id: 'shouldEdit',
+          title: 'Edit custom field',
+          description: 'Allows editing an highlighted custom field by long pressing',
+          type: 'boolean',
+          defaultValue: false,
+        },
       ],
     },
     {
@@ -59,13 +61,6 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
           type: 'boolean',
           defaultValue: false,
         },
-        {
-          id: 'shouldEdit',
-          title: 'Edit custom field',
-          description: 'Allows editing an events selected custom field by long pressing.',
-          type: 'boolean',
-          defaultValue: false,
-        },
       ],
     },
   ];

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

@@ -7,7 +7,6 @@ import {
   isOntimeEvent,
   isPlayableEvent,
   MaybeString,
-  OntimeEvent,
   PlayableEvent,
   Playback,
   RundownCached,
@@ -272,7 +271,7 @@ export default function Rundown({ data }: RundownProps) {
   let isNextDay = false;
   let totalGap = 0;
   const isEditMode = appMode === AppMode.Edit;
-  let currentDay = 0;
+  let isLinkedToLoaded = true; //check if the event can link all the way back to the currently playing event
   return (
     <div className={style.rundownContainer} ref={scrollRef} data-testid='rundown'>
       <DndContext onDragEnd={handleOnDragEnd} sensors={sensors} collisionDetection={closestCenter}>
@@ -299,7 +298,10 @@ export default function Rundown({ data }: RundownProps) {
 
                 if (isPlayableEvent(entry)) {
                   isNextDay = checkIsNextDay(entry, lastEvent);
-                  totalGap += !isPast ? entry.gap : 0;
+                  if (!isPast) {
+                    totalGap += entry.gap;
+                    isLinkedToLoaded = isLinkedToLoaded && entry.linkStart !== null;
+                  }
                   if (isNewLatest(entry, lastEvent)) {
                     // populate previous entry
                     thisEvent = entry;
@@ -313,7 +315,6 @@ export default function Rundown({ data }: RundownProps) {
               const hasCursor = entry.id === cursor;
               if (isLoaded) {
                 isPast = false;
-                currentDay = (entry as OntimeEvent).dayOffset;
               }
 
               return (
@@ -336,7 +337,7 @@ export default function Rundown({ data }: RundownProps) {
                         isRolling={featureData.playback === Playback.Roll}
                         isNextDay={isNextDay}
                         totalGap={totalGap}
-                        currentDay={currentDay}
+                        isLinkedToLoaded={isLinkedToLoaded}
                       />
                     </div>
                   </div>

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

@@ -39,7 +39,7 @@ interface RundownEntryProps {
   playback?: Playback; // we only care about this if this event is playing
   isRolling: boolean; // we need to know even if not related to this event
   totalGap: number;
-  currentDay: number;
+  isLinkedToLoaded: boolean;
 }
 
 export default function RundownEntry(props: RundownEntryProps) {
@@ -56,7 +56,7 @@ export default function RundownEntry(props: RundownEntryProps) {
     eventIndex,
     isNextDay,
     totalGap,
-    currentDay,
+    isLinkedToLoaded,
   } = props;
   const { emitError } = useEmitLog();
   const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
@@ -178,8 +178,9 @@ export default function RundownEntry(props: RundownEntryProps) {
         isRolling={isRolling}
         gap={data.gap}
         isNextDay={isNextDay}
-        dayOffset={data.dayOffset - currentDay}
+        dayOffset={data.dayOffset}
         totalGap={totalGap}
+        isLinkedToLoaded={isLinkedToLoaded}
         actionHandler={actionHandler}
       />
     );

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

@@ -51,6 +51,8 @@ export default function EditableBlockTitle(props: TitleEditorProps) {
       fontWeight='600'
       letterSpacing='0.25px'
       paddingLeft='0'
+      size='sm'
+      fontSize='1rem'
     />
   );
 }

apps/client/src/features/rundown/event-block/EventBlock.module.scss

@@ -15,10 +15,11 @@ $skip-opacity: 0.2;
     'binder ...        ...     ...';
 
   grid-template-columns: $block-binder-width 3rem 1fr auto;
-  grid-template-rows: 0.25rem 2.25rem 2.25rem 2.25rem 0.25rem;
+  grid-template-rows: 0.125rem 2rem 2rem 2rem 0.125rem;
   align-items: center;
   padding-right: $block-clearance;
   gap: 2px;
+  row-gap: 0.25rem;
 
   transition-property: background-color;
   transition-duration: $transition-time-feedback;
@@ -120,7 +121,7 @@ $skip-opacity: 0.2;
   display: flex;
   flex-direction: column;
   margin: 0 0.5rem;
-  gap: 0.5rem;
+  gap: 0.25rem;
 }
 
 .eventTimers {

apps/client/src/features/rundown/event-block/EventBlock.tsx

@@ -51,6 +51,7 @@ interface EventBlockProps {
   isNextDay: boolean;
   dayOffset: number;
   totalGap: number;
+  isLinkedToLoaded: boolean;
   actionHandler: (
     action: EventItemActions,
     payload?:
@@ -91,6 +92,7 @@ export default function EventBlock(props: EventBlockProps) {
     isNextDay,
     dayOffset,
     totalGap,
+    isLinkedToLoaded,
     actionHandler,
   } = props;
   const { selectedEventId, setSelectedEventId, clearSelectedEventId } = useEventIdSwapping();
@@ -310,6 +312,7 @@ export default function EventBlock(props: EventBlockProps) {
           dayOffset={dayOffset}
           isPast={isPast}
           totalGap={totalGap}
+          isLinkedToLoaded={isLinkedToLoaded}
         />
       )}
     </div>

apps/client/src/features/rundown/event-block/EventBlockInner.tsx

@@ -11,7 +11,6 @@ import { IoPlaySkipForward } from '@react-icons/all-files/io5/IoPlaySkipForward'
 import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { EndAction, MaybeString, Playback, TimerType, TimeStrategy } from 'ontime-types';
-import { dayInMs } from 'ontime-utils';
 
 import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';
@@ -47,6 +46,7 @@ interface EventBlockInnerProps {
   dayOffset: number;
   isPast: boolean;
   totalGap: number;
+  isLinkedToLoaded: boolean;
 }
 
 function EventBlockInner(props: EventBlockInnerProps) {
@@ -72,6 +72,7 @@ function EventBlockInner(props: EventBlockInnerProps) {
     dayOffset,
     isPast,
     totalGap,
+    isLinkedToLoaded,
   } = props;
 
   const [renderInner, setRenderInner] = useState(false);
@@ -120,11 +121,13 @@ function EventBlockInner(props: EventBlockInnerProps) {
         <EventBlockChip
           className={style.chipSection}
           id={eventId}
-          trueTimeStart={timeStart + dayOffset * dayInMs}
+          timeStart={timeStart}
+          delay={delay}
+          dayOffset={dayOffset}
+          isLinkedToLoaded={isLinkedToLoaded}
           isPast={isPast}
           isLoaded={loaded}
           totalGap={totalGap}
-          isLinkedAndNext={isNext && linkStart !== null}
           duration={duration}
         />
       )}

apps/client/src/features/rundown/event-block/composite/EventBlockChip.tsx

@@ -3,27 +3,29 @@ import { Tooltip } from '@chakra-ui/react';
 import { IoCheckmarkCircle } from '@react-icons/all-files/io5/IoCheckmarkCircle';
 import { isPlaybackActive, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
 
-import { usePlayback, useTimelineStatus } from '../../../../common/hooks/useSocket';
+import { usePlayback } from '../../../../common/hooks/useSocket';
 import useReport from '../../../../common/hooks-query/useReport';
 import { cx } from '../../../../common/utils/styleUtils';
-import { formatDuration, formatTime } from '../../../../common/utils/time';
+import { formatDuration, formatTime, useTimeUntilStart } from '../../../../common/utils/time';
 import { tooltipDelayFast } from '../../../../ontimeConfig';
 
 import style from './EventBlockChip.module.scss';
 
 interface EventBlockChipProps {
   id: string;
-  trueTimeStart: number;
+  timeStart: number;
+  delay: number;
+  dayOffset: number;
   isPast: boolean;
   isLoaded: boolean;
   className: string;
   totalGap: number;
-  isLinkedAndNext: boolean;
   duration: number;
+  isLinkedToLoaded: boolean;
 }
 
 export default function EventBlockChip(props: EventBlockChipProps) {
-  const { trueTimeStart, isPast, isLoaded, className, totalGap, isLinkedAndNext, id, duration } = props;
+  const { timeStart, delay, dayOffset, isPast, isLoaded, className, totalGap, id, duration, isLinkedToLoaded } = props;
   const { playback } = usePlayback();
 
   if (isLoaded) {
@@ -41,7 +43,13 @@ export default function EventBlockChip(props: EventBlockChipProps) {
     return (
       <Tooltip label='Expected time until start' openDelay={tooltipDelayFast}>
         <div className={className}>
-          <EventUntil trueTimeStart={trueTimeStart} totalGap={totalGap} isLinkedAndNext={isLinkedAndNext} />
+          <EventUntil
+            timeStart={timeStart}
+            delay={delay}
+            dayOffset={dayOffset}
+            totalGap={totalGap}
+            isLinkedToLoaded={isLinkedToLoaded}
+          />
         </div>
       </Tooltip>
     );
@@ -51,18 +59,17 @@ export default function EventBlockChip(props: EventBlockChipProps) {
 }
 
 interface EventUntilProps {
-  trueTimeStart: number;
+  timeStart: number;
+  delay: number;
+  dayOffset: number;
   totalGap: number;
-  isLinkedAndNext: boolean;
+  isLinkedToLoaded: boolean;
 }
 
 function EventUntil(props: EventUntilProps) {
-  const { trueTimeStart, totalGap, isLinkedAndNext } = props;
-  const { clock, offset } = useTimelineStatus();
+  const { timeStart, delay, dayOffset, totalGap, isLinkedToLoaded } = props;
 
-  const consumedOffset = isLinkedAndNext ? offset : Math.min(offset + totalGap, 0);
-  const offsetTimestart = trueTimeStart - consumedOffset;
-  const timeUntil = offsetTimestart - clock;
+  const timeUntil = useTimeUntilStart({ timeStart, delay, dayOffset, totalGap, isLinkedToLoaded });
   const isDue = timeUntil < MILLIS_PER_SECOND;
 
   const timeUntilString = isDue ? 'DUE' : `${formatDuration(Math.abs(timeUntil), timeUntil > 2 * MILLIS_PER_MINUTE)}`;

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

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import { isOntimeEvent, OntimeEvent } from 'ontime-types';
 
 import useRundown from '../../../common/hooks-query/useRundown';
+import { cx } from '../../../common/utils/styleUtils';
 
 import EventEditor from './EventEditor';
 
@@ -37,7 +38,7 @@ export default function CuesheetEventEditor(props: CuesheetEventEditorProps) {
   }
 
   return (
-    <div className={style.eventEditor} data-testid='editor-container'>
+    <div className={cx([style.eventEditor, style.inModal])} data-testid='editor-container'>
       <EventEditor event={event} />
     </div>
   );

apps/client/src/features/rundown/event-editor/EventEditor.module.scss

@@ -1,8 +1,12 @@
 .eventEditor {
-  max-height: 80vh;
+  max-height: 100%;
   display: flex;
   flex-direction: column;
   overflow-x: auto;
+
+  &.inModal {
+    max-height: 80vh;
+  }
 }
 
 .content {

apps/client/src/views/backstage/Backstage.tsx

@@ -81,10 +81,18 @@ export default function Backstage(props: BackstageProps) {
   const clock = formatTime(time.clock);
   const isPendingStart = getIsPendingStart(time.playback, time.phase);
   const startedAt = isPendingStart ? formatTime(time.secondaryTimer) : formatTime(time.startedAt);
-  const scheduledStart =
-    hasEvents && showNow ? '' : formatTime(runtime.plannedStart, { format12: 'hh:mm a', format24: 'HH:mm' });
-  const scheduledEnd =
-    hasEvents && showNow ? '' : formatTime(runtime.plannedEnd, { format12: 'hh:mm a', format24: 'HH:mm' });
+
+  const scheduledStart = (() => {
+    if (showNow) return undefined;
+    if (!hasEvents) return undefined;
+    return formatTime(runtime.plannedStart, { format12: 'hh:mm a', format24: 'HH:mm' });
+  })();
+
+  const scheduledEnd = (() => {
+    if (showNow) return undefined;
+    if (!hasEvents) return undefined;
+    return formatTime(runtime.plannedEnd, { format12: 'hh:mm a', format24: 'HH:mm' });
+  })();
 
   let displayTimer = millisToString(time.current, { fallback: timerPlaceholderMin });
   displayTimer = removeLeadingZero(displayTimer);
@@ -93,6 +101,7 @@ export default function Backstage(props: BackstageProps) {
   const qrSize = Math.max(window.innerWidth / 15, 72);
   const showProgress = getShowProgressBar(time.playback);
   const showSchedule = hasEvents && screenHeight > 420; // in vertical screens we may not have space
+  const showPending = scheduledStart && scheduledEnd;
 
   // gather option data
   const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -143,7 +152,7 @@ export default function Backstage(props: BackstageProps) {
           </div>
         )}
 
-        {!showNow && hasEvents && (
+        {showPending && (
           <div className='event'>
             <div className='title-card__placeholder'>{getLocalizedString('countdown.waiting')}</div>
             <div className='timer-group'>

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

@@ -23,8 +23,8 @@ import styles from './CuesheetPage.module.scss';
 
 export default function CuesheetPage() {
   // TODO: can we use the normalised rundown for the table?
-  const { data: flatRundown } = useFlatRundown();
-  const { data: customFields } = useCustomFields();
+  const { data: flatRundown, status: rundownStatus } = useFlatRundown();
+  const { data: customFields, status: customFieldStatus } = useCustomFields();
   const { showEditFormDrawer, isViewLocked } = useViewEditor({ isLockable: true });
   const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure();
   const { isOpen: isEventEditorOpen, onOpen: onEventEditorOpen, onClose: onEventEditorClose } = useDisclosure();
@@ -50,7 +50,7 @@ export default function CuesheetPage() {
     [onEventEditorClose, onEventEditorOpen],
   );
 
-  if (!customFields || !flatRundown) {
+  if (!customFields || !flatRundown || rundownStatus === 'pending' || customFieldStatus === 'pending') {
     return <EmptyPage text='Loading...' />;
   }
 

apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.module.scss

@@ -28,6 +28,11 @@ $table-header-font-size: calc(1rem - 2px);
     position: relative;
     @include ellipsis-overflow;
   }
+
+  th:focus,
+  td:focus {
+    outline: 2px solid $ui-white;
+  }
 }
 
 .tableHeader,

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

@@ -1,27 +1,14 @@
 import { useCallback, useRef } from 'react';
+import { useTableNav } from '@table-nav/react';
 import { ColumnDef, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import Color from 'color';
-import {
-  isOntimeBlock,
-  isOntimeDelay,
-  isOntimeEvent,
-  MaybeString,
-  OntimeEvent,
-  OntimeRundown,
-  OntimeRundownEntry,
-  TimeField,
-} from 'ontime-types';
+import { isOntimeEvent, MaybeString, OntimeEvent, OntimeRundown, OntimeRundownEntry, TimeField } from 'ontime-types';
 
 import { useEventAction } from '../../../common/hooks/useEventAction';
 import useFollowComponent from '../../../common/hooks/useFollowComponent';
-import { useSelectedEventId } from '../../../common/hooks/useSocket';
-import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import { useCuesheetOptions } from '../cuesheet.options';
 
-import BlockRow from './cuesheet-table-elements/BlockRow';
+import CuesheetBody from './cuesheet-table-elements/CuesheetBody';
 import CuesheetHeader from './cuesheet-table-elements/CuesheetHeader';
-import DelayRow from './cuesheet-table-elements/DelayRow';
-import EventRow from './cuesheet-table-elements/EventRow';
 import CuesheetTableMenu from './cuesheet-table-menu/CuesheetTableMenu';
 import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
 import useColumnManager from './useColumnManager';
@@ -38,8 +25,7 @@ export default function CuesheetTable(props: CuesheetTableProps) {
   const { data, columns, showModal } = props;
 
   const { updateEvent, updateTimer } = useEventAction();
-  const { selectedEventId } = useSelectedEventId();
-  const { followSelected, hideDelays, hidePast, showDelayedTimes, hideTableSeconds } = useCuesheetOptions();
+  const { followSelected, showDelayedTimes, hideTableSeconds } = useCuesheetOptions();
   const { columnVisibility, columnOrder, columnSizing, resetColumnOrder, setColumnVisibility, setColumnSizing } =
     useColumnManager(columns);
 
@@ -47,6 +33,8 @@ export default function CuesheetTable(props: CuesheetTableProps) {
   const tableContainerRef = useRef<HTMLDivElement | null>(null);
   useFollowComponent({ followRef: selectedRef, scrollRef: tableContainerRef, doFollow: followSelected });
 
+  const { listeners } = useTableNav();
+
   const table = useReactTable({
     data,
     columns,
@@ -63,6 +51,7 @@ export default function CuesheetTable(props: CuesheetTableProps) {
       handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom = false) => {
         // check if value is the same
         const event = data[rowIndex];
+
         if (!event || !isOntimeEvent(event)) {
           return;
         }
@@ -104,10 +93,6 @@ export default function CuesheetTable(props: CuesheetTableProps) {
   const rowModel = table.getRowModel();
   const allLeafColumns = table.getAllLeafColumns();
 
-  let eventIndex = 0;
-  // for the first event, it will be past if there is something selected
-  let isPast = Boolean(selectedEventId);
-
   return (
     <>
       <CuesheetTableSettings
@@ -117,74 +102,9 @@ export default function CuesheetTable(props: CuesheetTableProps) {
         handleClearToggles={setAllVisible}
       />
       <div ref={tableContainerRef} className={style.cuesheetContainer}>
-        <table className={style.cuesheet} id='cuesheet'>
+        <table className={style.cuesheet} id='cuesheet' {...listeners}>
           <CuesheetHeader headerGroups={headerGroups} />
-          <tbody>
-            {rowModel.rows.map((row, index) => {
-              const key = row.original.id;
-              const isSelected = selectedEventId === key;
-              const entry = row.original;
-              if (isSelected) {
-                isPast = false;
-              }
-
-              if (isOntimeBlock(entry)) {
-                return <BlockRow key={key} title={entry.title} hidePast={isPast && hidePast} />;
-              }
-              if (isOntimeDelay(entry)) {
-                if (isPast && hidePast) {
-                  return null;
-                }
-                const delayVal = entry.duration;
-                if (hideDelays || delayVal === 0) {
-                  return null;
-                }
-
-                return <DelayRow key={key} duration={delayVal} />;
-              }
-              if (isOntimeEvent(entry)) {
-                eventIndex++;
-                const isSelected = key === selectedEventId;
-
-                if (isPast && hidePast) {
-                  return null;
-                }
-
-                let rowBgColour: string | undefined;
-                if (isSelected) {
-                  rowBgColour = '#D20300'; // $red-700
-                } else if (entry.colour) {
-                  try {
-                    // the colour is user defined and might be invalid
-                    const accessibleBackgroundColor = Color(getAccessibleColour(entry.colour).backgroundColor);
-                    rowBgColour = accessibleBackgroundColor.fade(0.75).hexa();
-                  } catch (_error) {
-                    /* we do not handle errors here */
-                  }
-                }
-
-                return (
-                  <EventRow
-                    key={`${row.id}-${entry.revision}`}
-                    rowId={row.id}
-                    eventId={entry.id}
-                    eventIndex={eventIndex}
-                    rowIndex={index}
-                    isPast={isPast}
-                    selectedRef={isSelected ? selectedRef : undefined}
-                    skip={entry.skip}
-                    colour={entry.colour}
-                    rowBgColour={rowBgColour}
-                    table={table}
-                    columnSizing={columnSizing}
-                  />
-                );
-              }
-
-              // currently there is no scenario where entryType is not handled above, either way...
-              return null;
-            })}
-          </tbody>
+          <CuesheetBody rowModel={rowModel} selectedRef={selectedRef} table={table} columnSizing={columnSizing} />
         </table>
       </div>
       <CuesheetTableMenu showModal={showModal} />

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

@@ -1,4 +1,4 @@
-import { memo } from 'react';
+import { memo, useRef } from 'react';
 
 import { useCurrentBlockId } from '../../../../common/hooks/useSocket';
 
@@ -7,19 +7,37 @@ import style from '../CuesheetTable.module.scss';
 interface BlockRowProps {
   hidePast: boolean;
   title: string;
+  columnCount: number;
 }
 
 function BlockRow(props: BlockRowProps) {
-  const { hidePast, title } = props;
+  const { hidePast, title, columnCount } = props;
   const { currentBlockId } = useCurrentBlockId();
+  const firstCellRef = useRef<null | HTMLTableCellElement>(null);
 
   if (hidePast && !currentBlockId) {
     return null;
   }
 
+  const paddingRows = new Array(columnCount - 1).fill(null);
+
   return (
     <tr className={style.blockRow}>
-      <td>{title}</td>
+      <td tabIndex={-1} role='cell' ref={firstCellRef}>
+        {title}
+      </td>
+      {paddingRows.map((_value, index) => {
+        return (
+          <td
+            key={index}
+            tabIndex={-1}
+            role='cell'
+            onFocus={() => {
+              firstCellRef.current?.focus();
+            }}
+          />
+        );
+      })}
     </tr>
   );
 }

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

@@ -0,0 +1,100 @@
+import { MutableRefObject } from 'react';
+import { RowModel, Table } from '@tanstack/react-table';
+import Color from 'color';
+import { isOntimeBlock, isOntimeDelay, isOntimeEvent, OntimeRundownEntry } from 'ontime-types';
+
+import { useSelectedEventId } from '../../../../common/hooks/useSocket';
+import { lazyEvaluate } from '../../../../common/utils/lazyEvaluate';
+import { getAccessibleColour } from '../../../../common/utils/styleUtils';
+import { useCuesheetOptions } from '../../../cuesheet/cuesheet.options';
+
+import BlockRow from './BlockRow';
+import DelayRow from './DelayRow';
+import EventRow from './EventRow';
+
+interface CuesheetBodyProps {
+  rowModel: RowModel<OntimeRundownEntry>;
+  selectedRef: MutableRefObject<HTMLTableRowElement | null>;
+  table: Table<OntimeRundownEntry>;
+  columnSizing: Record<string, number>;
+}
+
+export default function CuesheetBody(props: CuesheetBodyProps) {
+  const { rowModel, selectedRef, table, columnSizing } = props;
+
+  const { selectedEventId } = useSelectedEventId();
+  const { hideDelays, hidePast } = useCuesheetOptions();
+
+  const getColumnCount = lazyEvaluate(() => table.getVisibleFlatColumns().length);
+
+  let eventIndex = 0;
+  // for the first event, it will be past if there is something selected
+  let isPast = Boolean(selectedEventId);
+  return (
+    <tbody>
+      {rowModel.rows.map((row, index) => {
+        const key = row.original.id;
+        const isSelected = selectedEventId === key;
+        const entry = row.original;
+        if (isSelected) {
+          isPast = false;
+        }
+
+        if (isOntimeBlock(entry)) {
+          const columnCount = getColumnCount();
+          return <BlockRow columnCount={columnCount} key={key} title={entry.title} hidePast={isPast && hidePast} />;
+        }
+        if (isOntimeDelay(entry)) {
+          if (isPast && hidePast) {
+            return null;
+          }
+          const delayVal = entry.duration;
+          if (hideDelays || delayVal === 0) {
+            return null;
+          }
+
+          return <DelayRow key={key} duration={delayVal} />;
+        }
+        if (isOntimeEvent(entry)) {
+          eventIndex++;
+          const isSelected = key === selectedEventId;
+
+          if (isPast && hidePast) {
+            return null;
+          }
+
+          let rowBgColour: string | undefined;
+          if (isSelected) {
+            rowBgColour = '#D20300'; // $red-700
+          } else if (entry.colour) {
+            try {
+              // the colour is user defined and might be invalid
+              const accessibleBackgroundColor = Color(getAccessibleColour(entry.colour).backgroundColor);
+              rowBgColour = accessibleBackgroundColor.fade(0.75).hexa();
+            } catch (_error) {
+              /* we do not handle errors here */
+            }
+          }
+
+          return (
+            <EventRow
+              key={row.id}
+              rowId={row.id}
+              event={entry}
+              eventIndex={eventIndex}
+              rowIndex={index}
+              isPast={isPast}
+              selectedRef={isSelected ? selectedRef : undefined}
+              rowBgColour={rowBgColour}
+              table={table}
+              columnSizing={columnSizing}
+            />
+          );
+        }
+
+        // currently there is no scenario where entryType is not handled above, either way...
+        return null;
+      })}
+    </tbody>
+  );
+}

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

@@ -24,8 +24,12 @@ export default function CuesheetHeader(props: CuesheetHeaderProps) {
 
         return (
           <tr key={headerGroup.id}>
-            {showActionMenu && <th className={style.actionColumn} />}
-            {!hideIndexColumn && <th className={style.indexColumn}>#</th>}
+            {showActionMenu && <th className={style.actionColumn} tabIndex={-1} />}
+            {!hideIndexColumn && (
+              <th className={style.indexColumn} tabIndex={-1}>
+                #
+              </th>
+            )}
             <SortableContext key={key} items={headerGroup.headers} strategy={horizontalListSortingStrategy}>
               {headerGroup.headers.map((header) => {
                 const width = header.getSize();

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

@@ -14,7 +14,9 @@ function DelayRow(props: DelayRowProps) {
 
   return (
     <tr className={style.delayRow}>
-      <td>{delayTime}</td>
+      <td tabIndex={0} role='cell'>
+        {delayTime}
+      </td>
     </tr>
   );
 }

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

@@ -2,7 +2,7 @@ import { memo, MutableRefObject, useLayoutEffect, useRef, useState } from 'react
 import { IoEllipsisHorizontal } from '@react-icons/all-files/io5/IoEllipsisHorizontal';
 import { flexRender, Table } from '@tanstack/react-table';
 import Color from 'color';
-import { OntimeRundownEntry } from 'ontime-types';
+import { OntimeEvent, OntimeRundownEntry } from 'ontime-types';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
 import { cx, getAccessibleColour } from '../../../../common/utils/styleUtils';
@@ -13,7 +13,7 @@ import style from '../CuesheetTable.module.scss';
 
 interface EventRowProps {
   rowId: string;
-  eventId: string;
+  event: OntimeEvent;
   eventIndex: number;
   rowIndex: number;
   isPast?: boolean;
@@ -26,10 +26,22 @@ interface EventRowProps {
   columnSizing: Record<string, number>;
 }
 
-export default memo(EventRow);
+export default memo(EventRow, (prevProps, nextProps) => {
+  return (
+    prevProps.rowId === nextProps.rowId &&
+    prevProps.event.revision === nextProps.event.revision &&
+    prevProps.eventIndex === nextProps.eventIndex &&
+    prevProps.rowIndex === nextProps.rowIndex &&
+    prevProps.isPast === nextProps.isPast &&
+    prevProps.selectedRef === nextProps.selectedRef &&
+    prevProps.rowBgColour === nextProps.rowBgColour &&
+    prevProps.table === nextProps.table &&
+    prevProps.columnSizing === nextProps.columnSizing
+  );
+});
 
 function EventRow(props: EventRowProps) {
-  const { rowId, eventId, eventIndex, rowIndex, isPast, selectedRef, skip, colour, rowBgColour, table } = props;
+  const { rowId, event, eventIndex, rowIndex, isPast, selectedRef, rowBgColour, table } = props;
   const { hideIndexColumn, showActionMenu } = useCuesheetOptions();
   const ownRef = useRef<HTMLTableRowElement>(null);
   const [isVisible, setIsVisible] = useState(false);
@@ -63,23 +75,23 @@ function EventRow(props: EventRowProps) {
     };
   }, [ownRef, selectedRef]);
 
-  const { color, backgroundColor } = getAccessibleColour(colour);
+  const { color, backgroundColor } = getAccessibleColour(event.colour);
   const mutedText = Color(color).fade(0.4).hexa();
 
   return (
     <tr
-      className={cx([style.eventRow, skip ?? style.skip])}
+      className={cx([style.eventRow, event.skip ?? style.skip])}
       style={{ opacity: `${isPast ? '0.2' : '1'}` }}
       ref={selectedRef ?? ownRef}
     >
       {showActionMenu && (
-        <td className={style.actionColumn}>
+        <td className={style.actionColumn} tabIndex={-1} role='cell'>
           <IconButton
             aria-label='Options'
-            onClick={(event) => {
-              const rect = event.currentTarget.getBoundingClientRect();
+            onClick={(e) => {
+              const rect = e.currentTarget.getBoundingClientRect();
               const yPos = 8 + rect.y + rect.height / 2;
-              openMenu({ x: rect.x, y: yPos }, eventId, rowIndex);
+              openMenu({ x: rect.x, y: yPos }, event.id, rowIndex);
             }}
           >
             <IoEllipsisHorizontal />
@@ -87,7 +99,7 @@ function EventRow(props: EventRowProps) {
         </td>
       )}
       {!hideIndexColumn && (
-        <td className={style.indexColumn} style={{ backgroundColor, color: mutedText }}>
+        <td className={style.indexColumn} style={{ backgroundColor, color: mutedText }} tabIndex={-1} role='cell'>
           {eventIndex}
         </td>
       )}
@@ -97,7 +109,12 @@ function EventRow(props: EventRowProps) {
             ?.getVisibleCells()
             .map((cell) => {
               return (
-                <td key={cell.id} style={{ width: cell.column.getSize(), backgroundColor: rowBgColour }}>
+                <td
+                  key={cell.id}
+                  style={{ width: cell.column.getSize(), backgroundColor: rowBgColour }}
+                  tabIndex={-1}
+                  role='cell'
+                >
                   {flexRender(cell.column.columnDef.cell, cell.getContext())}
                 </td>
               );

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

@@ -17,6 +17,7 @@ function MultiLineCell(props: MultiLineCellProps) {
 
   const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(initialValue, submitCallback, ref, {
     submitOnCtrlEnter: true,
+    allowKeyboardNavigation: true,
   });
 
   return (

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

@@ -17,6 +17,7 @@ const SingleLineCell = forwardRef((props: SingleLineCellProps, inputRef) => {
 
   const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(initialValue, submitCallback, ref, {
     allowSubmitSameValue,
+    allowKeyboardNavigation: true,
     submitOnEnter: true, // single line should submit on enter
     submitOnCtrlEnter: true,
     onCancelUpdate: handleCancelUpdate,
@@ -31,6 +32,9 @@ const SingleLineCell = forwardRef((props: SingleLineCellProps, inputRef) => {
       select() {
         ref.current?.select();
       },
+      focusParentElement() {
+        ref.current?.parentElement?.focus();
+      },
     };
   }, [ref]);
 

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

@@ -28,7 +28,7 @@ export function SortableCell({ header, style, children }: SortableCellProps) {
   };
 
   return (
-    <th ref={setNodeRef} style={dragStyle} colSpan={colSpan}>
+    <th ref={setNodeRef} style={dragStyle} colSpan={colSpan} tabIndex={-1}>
       <div {...attributes} {...listeners}>
         {children}
       </div>

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

@@ -1,22 +1,34 @@
-import { HTMLAttributes, memo, PropsWithChildren } from 'react';
+import { forwardRef, HTMLAttributes, memo, PropsWithChildren, useImperativeHandle, useRef } from 'react';
 
 import { cx } from '../../../../common/utils/styleUtils';
 
 import style from './TextLikeInput.module.scss';
 
-export default memo(TextLikeInput);
-
 interface TextLikeInputProps extends HTMLAttributes<HTMLSpanElement> {
   delayed?: boolean;
   muted?: boolean;
 }
 
-function TextLikeInput(props: PropsWithChildren<TextLikeInputProps>) {
+const TextLikeInput = forwardRef((props: PropsWithChildren<TextLikeInputProps>, textRef) => {
   const { delayed, muted, children, className, ...elementProps } = props;
+  const ref = useRef<HTMLDivElement | null>(null);
   const classes = cx([style.textInput, delayed && style.delayed, muted && style.muted, className]);
+
+  useImperativeHandle(textRef, () => {
+    return {
+      focusParentElement() {
+        ref.current?.parentElement?.focus();
+      }
+    }
+  })
+
   return (
-    <div className={classes} {...elementProps} tabIndex={0}>
+    <div className={classes} {...elementProps} tabIndex={0} ref={ref}>
       {children}
     </div>
   );
-}
+});
+
+TextLikeInput.displayName = 'TextLikeInput';
+
+export default memo(TextLikeInput);

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

@@ -11,6 +11,10 @@ interface TimeInputDurationProps {
   onSubmit: (value: string) => void;
 }
 
+interface ParentFocusableInput extends HTMLInputElement {
+  focusParentElement: () => void;
+}
+
 export default memo(TimeInputDuration);
 
 function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
@@ -18,7 +22,8 @@ function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
 
   const [isEditing, setIsEditing] = useState(false);
   const [value, setValue] = useState(initialValue);
-  const inputRef = useRef<HTMLInputElement>(null);
+  const inputRef = useRef<ParentFocusableInput>(null);
+  const textRef = useRef<ParentFocusableInput>(null);
 
   // when we go into edit mode, set focus to the input
   useEffect(() => {
@@ -36,7 +41,10 @@ function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
   }, [initialValue, isEditing]);
 
   const handleFakeFocus = () => setIsEditing(true);
-  const handleFakeBlur = () => setIsEditing(false);
+  const handleFakeBlur = () => {
+    setIsEditing(false);
+    setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
+  };
 
   const handleUpdate = useCallback(
     (newValue: string) => {
@@ -45,28 +53,33 @@ function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
       // if the user sends an empty string, we want to clear the value
       if (newValue === '') {
         onSubmit(newValue);
+        inputRef.current?.focusParentElement();
         return;
       }
 
       // we dont know the values in the rundown, escalate to handler
       if (newValue.startsWith('p') || newValue.startsWith('+')) {
         onSubmit(newValue);
+        inputRef.current?.focusParentElement();
         return;
       }
 
       const valueInMillis = parseUserTime(newValue);
       if (valueInMillis < 0 || isNaN(valueInMillis)) {
         setValue(initialValue);
+        setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
         return;
       }
 
       // if the value is the same, we may still want to push the lock change
       if (valueInMillis === initialValue && lockedValue) {
+        inputRef.current?.focusParentElement();
         return;
       }
 
       onSubmit(newValue);
       setValue(Number(newValue));
+      setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
     },
     [initialValue, lockedValue, onSubmit],
   );
@@ -82,7 +95,13 @@ function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
       handleCancelUpdate={handleFakeBlur}
     />
   ) : (
-    <TextLikeInput onClick={handleFakeFocus} onFocus={handleFakeFocus} muted={!lockedValue} delayed={delayed}>
+    <TextLikeInput
+      onClick={handleFakeFocus}
+      onFocus={handleFakeFocus}
+      muted={!lockedValue}
+      delayed={delayed}
+      ref={textRef}
+    >
       {children}
     </TextLikeInput>
   );

apps/client/src/views/public/Public.tsx

@@ -64,11 +64,16 @@ export default function Public(props: BackstageProps) {
   // gather timer data
   const clock = formatTime(time.clock);
   const isPendingStart = getIsPendingStart(time.playback, time.phase);
-  const scheduledStart = hasEvents && showNow ? '' : getFirstStartTime(events[0]);
+  const scheduledStart = (() => {
+    if (showNow) return undefined;
+    if (!hasEvents) return undefined;
+    return getFirstStartTime(events[0]);
+  })();
 
   // gather presentation styles
   const qrSize = Math.max(window.innerWidth / 15, 72);
   const showSchedule = hasEvents && screenHeight > 700; // in vertical screens we may not have space
+  const showPending = scheduledStart !== undefined;
 
   // gather option data
   const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -92,7 +97,7 @@ export default function Public(props: BackstageProps) {
         {showNow && hasEvents && (
           <TitleCard className='event now' label='now' title={nowMain} secondary={nowSecondary} />
         )}
-        {!showNow && scheduledStart && (
+        {showPending && (
           <div className='event'>
             <div className='title-card__placeholder'>{getLocalizedString('countdown.waiting')}</div>
             <div className='timer-group'>

apps/electron/package.json

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

apps/server/package.json

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

apps/server/src/api-data/session/__tests__/session.service.test.ts

@@ -0,0 +1,50 @@
+import { generateAuthenticatedUrl } from '../session.service.js';
+
+describe('generateAuthenticatedUrl()', () => {
+  describe('for local IP addresses', () => {
+    it('generates a link without locking or authentication', () => {
+      const localhostNotLocked = generateAuthenticatedUrl('http://localhost:3000', 'timer', false, false);
+      expect(localhostNotLocked.toString()).toBe('http://localhost:3000/timer');
+    });
+
+    it('generates a link with IP locking enabled', () => {
+      const ipLocked = generateAuthenticatedUrl('http://192.168.10.173:4001', 'timer', true, false);
+      expect(ipLocked.toString()).toBe('http://192.168.10.173:4001/timer?locked=true');
+    });
+
+    it('generates a link with authentication token and IP locking', () => {
+      const withAuth = generateAuthenticatedUrl('http://192.168.10.173:4001', 'timer', true, true, undefined, '1234');
+      expect(withAuth.toString()).toBe('http://192.168.10.173:4001/timer?token=1234&locked=true');
+    });
+  });
+
+  describe('for ontime-cloud URLs', () => {
+    it('generates a link without locking or authentication', () => {
+      const cloudNotLocked = generateAuthenticatedUrl(
+        'https://cloud.getontime.no/userhash',
+        'timer',
+        false,
+        false,
+        'prefix',
+      );
+      expect(cloudNotLocked.toString()).toBe('https://cloud.getontime.no/prefix/timer');
+    });
+
+    it('generates a link with IP locking enabled', () => {
+      const ipLocked = generateAuthenticatedUrl('https://cloud.getontime.no/prefix', 'timer', true, false, 'prefix');
+      expect(ipLocked.toString()).toBe('https://cloud.getontime.no/prefix/timer?locked=true');
+    });
+
+    it('generates a link with authentication token and IP locking', () => {
+      const withAuth = generateAuthenticatedUrl(
+        'https://cloud.getontime.no/prefix',
+        'timer',
+        true,
+        true,
+        'prefix',
+        '1234',
+      );
+      expect(withAuth.toString()).toBe('https://cloud.getontime.no/prefix/timer?token=1234&locked=true');
+    });
+  });
+});

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

@@ -8,7 +8,7 @@ import { getLastLoadedProject } from '../../services/app-state-service/AppStateS
 import { runtimeService } from '../../services/runtime-service/RuntimeService.js';
 import { getNetworkInterfaces } from '../../utils/network.js';
 import { getTimezoneLabel } from '../../utils/time.js';
-import { password } from '../../externals.js';
+import { password, routerPrefix } from '../../externals.js';
 import { hashPassword } from '../../utils/hash.js';
 
 const startedAt = new Date();
@@ -55,10 +55,19 @@ export const hashedPassword = hasPassword ? hashPassword(password as string) : u
 /**
  * Generates a pre-authenticated URL by injecting a token in the URL params
  */
-export function generateAuthenticatedUrl(baseUrl: string, path: string, lock: boolean, authenticate: boolean): URL {
-  const url = new URL(path, baseUrl);
-  if (authenticate && hashedPassword) {
-    url.searchParams.append('token', hashedPassword);
+export function generateAuthenticatedUrl(
+  baseUrl: string,
+  path: string,
+  lock: boolean,
+  authenticate: boolean,
+  prefix = routerPrefix,
+  hash = hashedPassword,
+): URL {
+  const url = new URL(baseUrl);
+  url.pathname = prefix ? `${prefix}/${path}` : path;
+
+  if (authenticate && hash) {
+    url.searchParams.append('token', hash);
   }
   if (lock) {
     url.searchParams.append('locked', 'true');

apps/server/src/externals.ts

@@ -16,13 +16,14 @@ export const isDocker = env === 'docker';
 export const isProduction = isDocker || (env === 'production' && !isTest);
 export const isOntimeCloud = Boolean(process.env.IS_CLOUD);
 export const password = process.env.SESSION_PASSWORD;
+export const routerPrefix = process.env.ROUTER_PREFIX;
 
 /**
  * Updates the router prefix in the index.html file
  * This is only needed in the cloud environment where the client is not at the root segment
  * ie: https://cloud.getontime.com/client-hash/timer
  */
-export function updateRouterPrefix(prefix: string | undefined = process.env.ROUTER_PREFIX): string {
+export function updateRouterPrefix(prefix: string | undefined = routerPrefix): string {
   if (!prefix) {
     return '';
   }

apps/server/src/services/runtime-service/rundownService.utils.ts

@@ -39,5 +39,6 @@ export function getShouldTimerUpdate(previousValue: MaybeNumber, currentValue: M
 export function getForceUpdate(previousUpdate: number, now: number): boolean {
   const isClockBehind = now < previousUpdate;
   const hasExceededRate = now - previousUpdate >= timerConfig.notificationRate;
-  return isClockBehind || hasExceededRate;
+  const newSeconds = millisToSeconds(previousUpdate) !== millisToSeconds(now);
+  return isClockBehind || hasExceededRate || newSeconds;
 }

package.json

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

pnpm-lock.yaml

@@ -119,6 +119,9 @@ importers:
       '@sentry/react':
         specifier: ^8.43.0
         version: 8.45.0(react@18.3.1)
+      '@table-nav/react':
+        specifier: ^0.0.7
+        version: 0.0.7(@table-nav/core@0.0.7)
       '@tanstack/react-query':
         specifier: ^5.62.7
         version: 5.62.7(react@18.3.1)
@@ -1949,6 +1952,14 @@ packages:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
     engines: {node: '>=14.16'}
 
+  '@table-nav/core@0.0.7':
+    resolution: {integrity: sha512-pCh18jHDRe3tw9sJZXfKi4cSD6VjHbn40CYdqhp5X91SIX7rakDEQAsTx6F7Fv9TUv265l+5rUDcYNaJ0N0cqQ==}
+
+  '@table-nav/react@0.0.7':
+    resolution: {integrity: sha512-S+DsD/qDqp50Z4dqt5tZFMWA3sRu0OOT/grMQuq/z/52jPEKJB+b9t+YSH8Ms55vCJOJ0DxuYldJpYrJLMG5ew==}
+    peerDependencies:
+      '@table-nav/core': ^0.0.7
+
   '@tanstack/eslint-plugin-query@5.8.4':
     resolution: {integrity: sha512-KVgcMc+Bn1qbwkxYVWQoiVSNEIN4IAiLj3cUH/SAHT8m8E59Y97o8ON1syp0Rcw094ItG8pEVZFyQuOaH6PDgQ==}
     peerDependencies:
@@ -6698,6 +6709,12 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
+  '@table-nav/core@0.0.7': {}
+
+  '@table-nav/react@0.0.7(@table-nav/core@0.0.7)':
+    dependencies:
+      '@table-nav/core': 0.0.7
+
   '@tanstack/eslint-plugin-query@5.8.4(eslint@8.56.0)(typescript@5.5.3)':
     dependencies:
       '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.5.3)