refactor(views): keep query status truthful, push render logic to the view boundary

Reworks the previous fix, which had base hooks (useRundown, useSettings,
useCustomFields, useProjectData, useViewSettings) rewrite their own
status/isError to hide background-refetch failures. That was misleading:
those hooks are consumed well beyond the 9 view loaders, and other callers
may legitimately want to know a fetch genuinely failed.

Instead the base hooks now return react-query's status/isError untouched,
plus the isLoadingError flag react-query already computes (true only when
a query has never received data). aggregateQueryStatus (viewLoader.utils.ts)
takes {status, isLoadingError} pairs and only reports 'error' once every
query has settled and at least one never got data; a background/refetch
error with data present now aggregates to 'success'. The two single-query
consumers outside that aggregator (RundownList/CuesheetTable via
useScopedRundown, and ProjectInfo) branch on isLoadingError directly instead
of status === 'error'.

Removes the standalone deriveQueryStatus helper introduced in the prior
iteration, since the logic now lives in the one place that already existed
for this purpose (aggregateQueryStatus) rather than a new abstraction.

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,9 +15,4 @@
     gap: 1rem;
     margin-top: 1em;
   }
-
-  .text {
-    font-weight: 600;
-    font-size: 2em;
-  }
 }

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

@@ -18,8 +18,7 @@ export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
     <tbody className={style.emptyContainer}>
       <tr>
         <td colSpan={99} className={style.emptyCell}>
-          <Empty injectedStyles={{ marginTop: '5vh' }} />
-          <span className={style.text}>{text}</span>
+          <Empty text={text} injectedStyles={{ marginTop: '5vh' }} />
           {handleAddNew && (
             <div className={style.inline}>
               <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>

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

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

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

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

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

@@ -32,7 +32,7 @@ export default function useRundown() {
     data: { loaded: loadedRundownId },
   } = useProjectRundowns();
 
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
+  const { data, status, isError, isLoadingError, refetch, isFetching } = useQuery<Rundown>({
     queryKey: loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY,
     queryFn: ({ signal }) => fetchCurrentRundown({ signal }),
     refetchInterval: queryRefetchIntervalSlow,
@@ -50,14 +50,14 @@ export default function useRundown() {
     queryClient.removeQueries({ queryKey: CURRENT_RUNDOWN_QUERY_KEY, exact: true });
   }, [loadedRundownId, queryClient]);
 
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
+  return { data: data ?? cachedRundownPlaceholder, status, isError, isLoadingError, refetch, isFetching };
 }
 
 export function useRundownWithMetadata() {
-  const { data, status } = useRundown();
+  const { data, status, isLoadingError } = useRundown();
   const selectedEventId = useSelectedEventId();
   const rundownMetadata = useMemo(() => getRundownMetadata(data, selectedEventId), [data, selectedEventId]);
-  return { data, status, rundownMetadata };
+  return { data, status, isLoadingError, rundownMetadata };
 }
 
 /**
@@ -65,7 +65,7 @@ export function useRundownWithMetadata() {
  * built from the order and rundown fields
  */
 export function useFlatRundown() {
-  const { data, status } = useRundown();
+  const { data, status, isLoadingError } = useRundown();
 
   const flatRundown = useMemo(() => {
     if (data.revision === -1) {
@@ -74,15 +74,15 @@ export function useFlatRundown() {
     return data.flatOrder.map((id) => data.entries[id]).filter((entry): entry is OntimeEntry => entry !== undefined);
   }, [data]);
 
-  return { data: flatRundown, rundownId: data.id, status };
+  return { data: flatRundown, rundownId: data.id, status, isLoadingError };
 }
 
 export function useFlatRundownWithMetadata() {
-  const { data, status } = useRundown();
+  const { data, status, isLoadingError } = useRundown();
   const selectedEventId = useSelectedEventId();
 
   const rundownWithMetadata = useMemo(() => getFlatRundownMetadata(data, selectedEventId), [data, selectedEventId]);
-  return { data: rundownWithMetadata, status };
+  return { data: rundownWithMetadata, status, isLoadingError };
 }
 
 /**
@@ -127,7 +127,7 @@ export function useRundownAuxData() {
 export function useRundownById(rundownId: string | null | undefined) {
   const enabled = Boolean(rundownId);
 
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
+  const { data, status, isError, isLoadingError, refetch, isFetching } = useQuery<Rundown>({
     queryKey: getRundownQueryKey(rundownId ?? ''),
     queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
     enabled,
@@ -135,5 +135,5 @@ export function useRundownById(rundownId: string | null | undefined) {
     refetchInterval: queryRefetchIntervalSlow,
   });
 
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
+  return { data: data ?? cachedRundownPlaceholder, status, isError, isLoadingError, refetch, isFetching };
 }

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

@@ -11,6 +11,7 @@ export type RundownSource = {
   rundown: Rundown;
   flatRundown: ExtendedEntry[];
   status: string;
+  isLoadingError: boolean;
   selectedEventId: EntryId | null;
 };
 
@@ -35,7 +36,7 @@ function useRundownSource(rundownId: string | null, loadedRundownId: string | nu
   const isLoadedTarget = rundownId !== null && rundownId === loadedRundownId;
   const runtimeSelectedEventId = useSelectedEventId();
   const effectiveSelectedEventId = isLoadedTarget ? runtimeSelectedEventId : null;
-  const { data: rundown, status } = useRundownById(rundownId);
+  const { data: rundown, status, isLoadingError } = useRundownById(rundownId);
   const flatRundown = useMemo(
     () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
     [effectiveSelectedEventId, rundown],
@@ -47,8 +48,9 @@ function useRundownSource(rundownId: string | null, loadedRundownId: string | nu
       rundown,
       flatRundown,
       status,
+      isLoadingError,
       selectedEventId: effectiveSelectedEventId,
     }),
-    [effectiveSelectedEventId, flatRundown, rundown, rundownId, status],
+    [effectiveSelectedEventId, flatRundown, isLoadingError, rundown, rundownId, status],
   );
 }

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

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

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

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

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

@@ -154,9 +154,6 @@ export const useTimer = createSelector((state: RuntimeStore) => ({
   ...state.timer,
 }));
 
-/** Shared timer for the running group, null unless the group opted in */
-export const useGroupTimer = createSelector((state: RuntimeStore) => state.groupTimer);
-
 export const useNextFlag = createSelector((state: RuntimeStore) => ({
   id: state.eventFlag?.id ?? null,
   expectedStart: state.offset.expectedFlagStart,

apps/client/src/features/control/message/TimerPreview.tsx

@@ -1,11 +1,11 @@
 import { TimerPhase, TimerType } from 'ontime-types';
-import { IoArrowDown, IoArrowUp, IoBan, IoFolderOutline, IoTime } from 'react-icons/io5';
+import { IoArrowDown, IoArrowUp, IoBan, IoTime } from 'react-icons/io5';
 import { LuArrowDownToLine } from 'react-icons/lu';
 
 import { CornerWithPip } from '../../../common/components/editor-utils/EditorUtils';
 import Tooltip from '../../../common/components/tooltip/Tooltip';
 import useViewSettings from '../../../common/hooks-query/useViewSettings';
-import { useGroupTimer, useMessagePreview } from '../../../common/hooks/useSocket';
+import { useMessagePreview } from '../../../common/hooks/useSocket';
 import { handleLinks } from '../../../common/utils/linkUtils';
 import { cx, timerPlaceholder } from '../../../common/utils/styleUtils';
 import PipRoot from '../../../views/editor/pip-timer/PipRoot';
@@ -22,7 +22,6 @@ const secondarySourceLabels: Record<string, string> = {
 export default function TimerPreview() {
   const { blink, blackout, countToEnd, phase, secondarySource, showTimerMessage, timerType } = useMessagePreview();
   const { data } = useViewSettings();
-  const isGroupTimerActive = useGroupTimer() !== null;
 
   const main = (() => {
     if (showTimerMessage) return 'Message';
@@ -106,14 +105,6 @@ export default function TimerPreview() {
         >
           <LuArrowDownToLine />
         </Tooltip>
-        <Tooltip
-          text={`Timer views are showing the ${isGroupTimerActive ? 'shared group timer' : 'event timer'}`}
-          render={<span />}
-          className={style.statusIcon}
-          data-active={isGroupTimerActive}
-        >
-          <IoFolderOutline />
-        </Tooltip>
       </div>
     </div>
   );

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

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

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

@@ -14,9 +14,18 @@ export interface OperatorData {
 }
 
 export function useOperatorData(): ViewData<OperatorData> {
-  const { data: rundown, rundownMetadata, status: rundownStatus } = useRundownWithMetadata();
-  const { data: customFields, status: customFieldStatus } = useCustomFields();
-  const { data: settings, status: settingsStatus } = useSettings();
+  const {
+    data: rundown,
+    rundownMetadata,
+    status: rundownStatus,
+    isLoadingError: rundownIsLoadingError,
+  } = useRundownWithMetadata();
+  const {
+    data: customFields,
+    status: customFieldStatus,
+    isLoadingError: customFieldIsLoadingError,
+  } = useCustomFields();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
 
   return {
     data: {
@@ -25,6 +34,10 @@ export function useOperatorData(): ViewData<OperatorData> {
       customFields,
       settings,
     },
-    status: aggregateQueryStatus([rundownStatus, customFieldStatus, settingsStatus]),
+    status: aggregateQueryStatus([
+      { status: rundownStatus, isLoadingError: rundownIsLoadingError },
+      { status: customFieldStatus, isLoadingError: customFieldIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+    ]),
   };
 }

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

@@ -1,19 +1,24 @@
 import { memo } from 'react';
 
-import Empty from '../../common/components/state/Empty';
+import EmptyFill from '../../common/components/state/EmptyFill';
 import { useRundownWithMetadata } from '../../common/hooks-query/useRundown';
 import { useRundownEditor } from '../../common/hooks/useSocket';
+import { useTranslation } from '../../translation/TranslationProvider';
 import Rundown from './Rundown';
 
 export default memo(RundownList);
 function RundownList() {
-  const { data, status, rundownMetadata } = useRundownWithMetadata();
+  const { data, status, isLoadingError, rundownMetadata } = useRundownWithMetadata();
   const featureData = useRundownEditor();
+  const { getLocalizedString } = useTranslation();
 
-  const isLoading = status !== 'success' || !data || !rundownMetadata;
+  // avoid showing the editable empty state before we know whether the rundown is actually empty
+  if (status === 'pending') {
+    return <EmptyFill text='Loading…' />;
+  }
 
-  if (isLoading) {
-    return <Empty text='Connecting to server' />;
+  if (isLoadingError) {
+    return <EmptyFill text={getLocalizedString('common.no_data')} />;
   }
 
   return (

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

@@ -5,8 +5,6 @@ import { useCallback } from 'react';
 import * as Editor from '../../../common/components/editor-utils/EditorUtils';
 import SwatchSelect from '../../../common/components/input/colour-input/SwatchSelect';
 import AppLink from '../../../common/components/link/app-link/AppLink';
-import Switch from '../../../common/components/switch/Switch';
-import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import { getOffsetState } from '../../../common/utils/offset';
@@ -97,22 +95,6 @@ export default function GroupEditor({ group }: GroupEditorProps) {
             submitHandler={handleSubmit}
           />
         </div>
-        <div>
-          <Tooltip
-            text='Timer views count the scheduled duration of the whole group instead of the running event'
-            render={<Editor.Label htmlFor='useGroupTimer' />}
-          >
-            Group timer
-          </Tooltip>
-          <Editor.Label className={style.switchLabel}>
-            <Switch
-              id='useGroupTimer'
-              checked={group.useGroupTimer}
-              onCheckedChange={(value) => updateEntry({ id: group.id, useGroupTimer: value })}
-            />
-            {group.useGroupTimer ? 'On' : 'Off'}
-          </Editor.Label>
-        </div>
       </div>
 
       <div className={style.column}>

apps/client/src/features/rundown/rundown-group/RundownGroup.tsx

@@ -15,7 +15,6 @@ import {
 
 import IconButton from '../../../common/components/buttons/IconButton';
 import Tag from '../../../common/components/tag/Tag';
-import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
@@ -190,13 +189,6 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
               {data.targetDuration !== null && <IoLockClosed className={style.lockIcon} />}
             </div>
           </div>
-          {data.useGroupTimer && (
-            <div className={style.metaEntry}>
-              <Tooltip text='Views show a shared timer for this group instead of the event timer'>
-                <Tag>Group timer</Tag>
-              </Tooltip>
-            </div>
-          )}
         </div>
       </div>
     </div>

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

@@ -1,6 +1,5 @@
 import { memo, useEffect, useMemo } from 'react';
 
-import EmptyPage from '../../../common/components/state/EmptyPage';
 import { EntryActionsProvider } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import { useLoadedRundownSource } from '../../../common/hooks-query/useScopedRundown';
@@ -13,7 +12,7 @@ import { makeRundownColumns } from './makeRundownColumns';
 
 export default memo(RundownTable);
 function RundownTable() {
-  const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const { data: customFields } = useCustomFields();
   const setPermissions = useCuesheetPermissions((state) => state.setPermissions);
   const { editorMode } = useEditorFollowMode();
   const source = useLoadedRundownSource();
@@ -32,16 +31,10 @@ function RundownTable() {
 
   const columns = useMemo(() => makeRundownColumns(customFields), [customFields]);
 
-  const isLoading = !customFields || customFieldStatus === 'pending';
-
   return (
     <EntryActionsProvider actions={actions}>
       <CuesheetDnd columns={columns} tableRoot='editor'>
-        {isLoading ? (
-          <EmptyPage text='Loading...' />
-        ) : (
-          <CuesheetTable columns={columns} source={source} cuesheetMode={editorMode} tableRoot='editor' />
-        )}
+        <CuesheetTable columns={columns} source={source} cuesheetMode={editorMode} tableRoot='editor' />
       </CuesheetDnd>
     </EntryActionsProvider>
   );

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

@@ -35,7 +35,7 @@ export default function BackstageLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <Backstage {...data} />;

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

@@ -20,10 +20,14 @@ export function useBackstageData(): ViewData<BackstageData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundown();
-  const { data: projectData, status: projectDataStatus } = useProjectData();
-  const { data: settings, status: settingsStatus } = useSettings();
-  const { data: customFields, status: customFieldsStatus } = useCustomFields();
+  const { data: rundownData, status: rundownStatus, isLoadingError: rundownIsLoadingError } = useFlatRundown();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
+  const {
+    data: customFields,
+    status: customFieldsStatus,
+    isLoadingError: customFieldsIsLoadingError,
+  } = useCustomFields();
 
   return {
     data: {
@@ -33,6 +37,11 @@ export function useBackstageData(): ViewData<BackstageData> {
       isMirrored,
       settings,
     },
-    status: aggregateQueryStatus([rundownStatus, projectDataStatus, settingsStatus, customFieldsStatus]),
+    status: aggregateQueryStatus([
+      { status: rundownStatus, isLoadingError: rundownIsLoadingError },
+      { status: projectDataStatus, isLoadingError: projectDataIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+      { status: customFieldsStatus, isLoadingError: customFieldsIsLoadingError },
+    ]),
   };
 }

apps/client/src/views/common/loader/Loader.module.scss

@@ -7,7 +7,7 @@ $dot-spacing: 1.5rem;
   display: grid;
   place-items: center;
   background-color: var(--background-color-override, $viewer-background-color);
-  height: 100vh;
+  height: 100dvh;
 }
 
 .ellipsis {
@@ -21,26 +21,26 @@ $dot-spacing: 1.5rem;
     height: $dot-size;
     border-radius: 50%;
     background-color: var(--accent-color-override, $ontime-color);
-    animation-timing-function: cubic-bezier(0, 1, 1, 0);
+    animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 
     &:nth-child(1) {
       left: $dot-size;
-      animation: lds-ellipsis1 0.6s infinite;
+      animation: lds-ellipsis1 1s infinite;
     }
 
     &:nth-child(2) {
       left: $dot-size;
-      animation: lds-ellipsis2 0.6s infinite;
+      animation: lds-ellipsis2 1s infinite;
     }
 
     &:nth-child(3) {
       left: calc($dot-size + $dot-spacing);
-      animation: lds-ellipsis2 0.6s infinite;
+      animation: lds-ellipsis2 1s infinite;
     }
 
     &:nth-child(4) {
       left: calc($dot-size + 2 * $dot-spacing);
-      animation: lds-ellipsis3 0.6s infinite;
+      animation: lds-ellipsis3 1s infinite;
     }
   }
 }

apps/client/src/views/countdown/Countdown.scss

@@ -80,21 +80,7 @@ $item-height: 3.5rem;
     display: flex;
     flex-direction: column;
     align-items: center;
-
-    button {
-      margin-top: 1.75rem;
-    }
-  }
-
-  .empty-state__content {
-    max-width: none;
-
-    span {
-      max-width: none;
-      white-space: nowrap;
-      font-size: clamp(1.5rem, 4vw, 2.25rem);
-      line-height: 1.1;
-    }
+    gap: 1.5rem;
   }
 
   .list-container {

apps/client/src/views/countdown/Countdown.tsx

@@ -43,7 +43,7 @@ export default function CountdownLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <Countdown {...data} />;
@@ -87,7 +87,7 @@ function Countdown({ customFields, rundownData, projectData, isMirrored, setting
 
       {!hasEvents && (
         <div className='empty-state'>
-          <Empty text={getLocalizedString('common.no_data')} className='empty-state__content' />
+          <Empty text={getLocalizedString('common.no_data')} />
         </div>
       )}
 
@@ -121,7 +121,7 @@ function CountdownContents({ candidates, rundownData, subscriptions, goToEditMod
   if (subscriptions.length === 0) {
     return (
       <div className='empty-state'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.select_event')} />
         <Button variant='primary' size='xlarge' onClick={goToEditMode}>
           <IoAdd /> Add
         </Button>
@@ -137,7 +137,7 @@ function CountdownContents({ candidates, rundownData, subscriptions, goToEditMod
   if (subscribedEvents.length === 0) {
     return (
       <div className='empty-state'>
-        <Empty text={getLocalizedString('countdown.select_event')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.select_event')} />
         <Button variant='primary' size='xlarge' onClick={goToEditMode}>
           <IoAdd /> Add
         </Button>
@@ -154,7 +154,7 @@ function CountdownContents({ candidates, rundownData, subscriptions, goToEditMod
   if (eventsToShow.length === 0) {
     return (
       <div className='empty-state'>
-        <Empty text={getLocalizedString('countdown.all_have_finished')} className='empty-state__content' />
+        <Empty text={getLocalizedString('countdown.all_have_finished')} />
       </div>
     );
   }

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

@@ -21,10 +21,18 @@ export function useCountdownData(): ViewData<CountdownData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata();
-  const { data: projectData, status: projectDataStatus } = useProjectData();
-  const { data: settings, status: settingsStatus } = useSettings();
-  const { data: customFields, status: customFieldsStatus } = useCustomFields();
+  const {
+    data: rundownData,
+    status: rundownStatus,
+    isLoadingError: rundownIsLoadingError,
+  } = useFlatRundownWithMetadata();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
+  const {
+    data: customFields,
+    status: customFieldsStatus,
+    isLoadingError: customFieldsIsLoadingError,
+  } = useCustomFields();
 
   return {
     data: {
@@ -34,6 +42,11 @@ export function useCountdownData(): ViewData<CountdownData> {
       isMirrored,
       settings,
     },
-    status: aggregateQueryStatus([rundownStatus, projectDataStatus, settingsStatus, customFieldsStatus]),
+    status: aggregateQueryStatus([
+      { status: rundownStatus, isLoadingError: rundownIsLoadingError },
+      { status: projectDataStatus, isLoadingError: projectDataIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+      { status: customFieldsStatus, isLoadingError: customFieldsIsLoadingError },
+    ]),
   };
 }

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

@@ -2,7 +2,6 @@ import { MaybeString, ProjectRundown } from 'ontime-types';
 import { memo, use, useMemo } from 'react';
 
 import Select from '../../common/components/select/Select';
-import EmptyPage from '../../common/components/state/EmptyPage';
 import { PresetContext } from '../../common/context/PresetContext';
 import useCustomFields from '../../common/hooks-query/useCustomFields';
 import type { RundownSource } from '../../common/hooks-query/useScopedRundown';
@@ -34,40 +33,34 @@ function CuesheetTableWrapper({
   const preset = use(PresetContext);
   const isCurrentRundown = source.rundownId !== null && source.rundownId === loadedRundownId;
   const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset, { canRunMode: isCurrentRundown });
-  const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const { data: customFields } = useCustomFields();
 
   const columns = useMemo(
     () => makeCuesheetColumns(customFields, cuesheetMode, preset),
     [customFields, cuesheetMode, preset],
   );
 
-  const isLoading = !customFields || customFieldStatus === 'pending';
-
   return (
     <CuesheetDnd columns={columns}>
-      {isLoading ? (
-        <EmptyPage text='Loading...' />
-      ) : (
-        <CuesheetTable
-          columns={columns}
-          source={source}
-          cuesheetMode={cuesheetMode}
-          tableRoot='cuesheet'
-          setCuesheetMode={setCuesheetMode}
-          isCurrentRundown={isCurrentRundown}
-          insertElement={
-            <>
-              <RundownSelect
-                cuesheetMode={cuesheetMode}
-                selectedRundownId={selectedRundownId}
-                loadedRundownId={loadedRundownId}
-                setSelectedRundownId={setSelectedRundownId}
-                projectRundowns={projectRundowns}
-              />
-            </>
-          }
-        />
-      )}
+      <CuesheetTable
+        columns={columns}
+        source={source}
+        cuesheetMode={cuesheetMode}
+        tableRoot='cuesheet'
+        setCuesheetMode={setCuesheetMode}
+        isCurrentRundown={isCurrentRundown}
+        insertElement={
+          <>
+            <RundownSelect
+              cuesheetMode={cuesheetMode}
+              selectedRundownId={selectedRundownId}
+              loadedRundownId={loadedRundownId}
+              setSelectedRundownId={setSelectedRundownId}
+              projectRundowns={projectRundowns}
+            />
+          </>
+        }
+      />
     </CuesheetDnd>
   );
 }

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

@@ -5,6 +5,10 @@ $table-header-font-size: calc(1rem - 2px);
 
 @include rows.cuesheet-row-columns($table-header-font-size);
 
+.tableLoading {
+  grid-area: table;
+}
+
 .cuesheet {
   font-size: $table-font-size;
   font-weight: 400;

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

@@ -11,7 +11,7 @@ import {
   TableVirtuosoHandle,
 } from 'react-virtuoso';
 
-import EmptyPage from '../../../common/components/state/EmptyPage';
+import EmptyFill from '../../../common/components/state/EmptyFill';
 import EmptyTableBody from '../../../common/components/state/EmptyTableBody';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import type { RundownSource } from '../../../common/hooks-query/useScopedRundown';
@@ -19,6 +19,7 @@ import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
 import { usePersistedRundownOptions } from '../../../features/rundown/rundown.options';
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
 import { AppMode } from '../../../ontimeConfig';
+import { useTranslation } from '../../../translation/TranslationProvider';
 import { usePersistedCuesheetOptions } from '../cuesheet.options';
 import { useCuesheetPermissions } from '../useTablePermissions';
 import { CuesheetHeader, SortableCuesheetHeader } from './cuesheet-table-elements/CuesheetHeader';
@@ -62,8 +63,9 @@ export default function CuesheetTable({
   isCurrentRundown,
   insertElement,
 }: CuesheetTableProps) {
-  const { flatRundown, status, selectedEventId } = source;
+  const { flatRundown, status, isLoadingError, selectedEventId } = source;
   const { updateEntry, updateTimer, addEntry } = useEntryActionsContext();
+  const { getLocalizedString } = useTranslation();
   const canCreateEntries = useCuesheetPermissions((state) => state.canCreateEntries) && cuesheetMode === AppMode.Edit;
 
   const useOptions = tableRoot === 'editor' ? usePersistedRundownOptions : usePersistedCuesheetOptions;
@@ -228,10 +230,13 @@ export default function CuesheetTable({
     });
   }, [cuesheetMode, hideIndexColumn, table]);
 
-  const isLoading = !flatRundown || status === 'pending';
+  // avoid showing the editable empty state before we know whether the rundown is actually empty
+  if (status === 'pending') {
+    return <EmptyFill text='Loading…' className={style.tableLoading} />;
+  }
 
-  if (isLoading) {
-    return <EmptyPage text='Loading...' />;
+  if (isLoadingError) {
+    return <EmptyFill text={getLocalizedString('common.no_data')} className={style.tableLoading} />;
   }
 
   return (

apps/client/src/views/editor/pip-timer/PipTimer.scss

@@ -68,18 +68,6 @@
         opacity: 0;
       }
     }
-
-    // signals that the displayed timer belongs to the group, not to the running event
-    .group-indicator {
-      text-align: center;
-      text-transform: uppercase;
-      letter-spacing: 0.25em;
-      font-weight: 600;
-      font-size: 2.5vw;
-      line-height: 1;
-      opacity: 0.7;
-      color: var(--timer-colour, $ui-white);
-    }
   }
 
   .secondary {

apps/client/src/views/editor/pip-timer/PipTimer.tsx

@@ -2,7 +2,7 @@ import { ViewSettings } from 'ontime-types';
 
 import { FitText } from '../../../common/components/fit-text/FitText';
 import MultiPartProgressBar from '../../../common/components/multi-part-progress-bar/MultiPartProgressBar';
-import { useGroupTimer, useTimerSocket } from '../../../common/hooks/useSocket';
+import { useTimerSocket } from '../../../common/hooks/useSocket';
 import { cx } from '../../../common/utils/styleUtils';
 import { getFormattedTimer, getTimerByType } from '../../common/viewUtils';
 import {
@@ -10,8 +10,9 @@ import {
   getIsPlaying,
   getSecondaryDisplay,
   getShowMessage,
-  getShowsTimerValue,
-  resolveTimerDisplay,
+  getShowModifiers,
+  getShowProgressBar,
+  getTotalTime,
 } from '../../timer/timer.utils';
 import { getTimerColour } from '../../utils/presentation.utils';
 
@@ -23,28 +24,23 @@ interface PipTimerProps {
 
 export function PipTimer({ viewSettings }: PipTimerProps) {
   const { eventNow, message, time, clock, timerTypeNow, countToEndNow, auxTimer } = useTimerSocket();
-  const groupTimer = useGroupTimer();
 
   // gather modifiers
   const showOverlay = getShowMessage(message.timer);
-  const timerDisplay = resolveTimerDisplay({
-    time,
-    groupTimer,
-    event: eventNow,
-    timerType: timerTypeNow,
-    countToEnd: countToEndNow,
-    freezeOvertime: false,
-    freezeMessage: '',
-    hidePhase: false,
-  });
-  const { showFinished, showWarning, showDanger } = timerDisplay;
-
+  const { showFinished, showWarning, showDanger } = getShowModifiers(
+    timerTypeNow,
+    countToEndNow,
+    time.phase,
+    false,
+    '',
+    false,
+  );
   const isPlaying = getIsPlaying(time.playback);
-  const showsTimerValue = getShowsTimerValue(timerTypeNow);
-  const showProgressBar = showsTimerValue;
+  const showProgressBar = getShowProgressBar(timerTypeNow);
 
   // gather timer data
-  const stageTimer = getTimerByType(false, timerTypeNow, clock, timerDisplay.source, timerTypeNow);
+  const totalTime = getTotalTime(time.duration, time.addedTime);
+  const stageTimer = getTimerByType(false, timerTypeNow, clock, time, timerTypeNow);
   const display = getFormattedTimer(stageTimer, timerTypeNow, 'min', {
     removeSeconds: false,
     removeLeadingZero: false,
@@ -84,11 +80,10 @@ export function PipTimer({ viewSettings }: PipTimerProps) {
         <div
           className={cx(['timer', !isPlaying && 'timer--paused', showFinished && 'timer--finished'])}
           style={{ fontSize: `${timerFontSize}vw` }}
-          data-phase={timerDisplay.phase}
+          data-phase={time.phase}
         >
           {display}
         </div>
-        {timerDisplay.isGroup && showsTimerValue && <div className='group-indicator'>group</div>}
         <div className={cx(['secondary', !secondaryContent && 'secondary--hidden'])}>
           <FitText mode='multi' min={12} max={256}>
             {secondaryContent}
@@ -99,12 +94,12 @@ export function PipTimer({ viewSettings }: PipTimerProps) {
       {showProgressBar && (
         <MultiPartProgressBar
           className={cx(['progress-container', !isPlaying && 'progress-container--paused'])}
-          now={timerDisplay.source.current}
-          complete={timerDisplay.total}
+          now={time.current}
+          complete={totalTime}
           normalColor={viewSettings.normalColor}
-          warning={timerDisplay.warning}
+          warning={eventNow?.timeWarning}
           warningColor={viewSettings.warningColor}
-          danger={timerDisplay.danger}
+          danger={eventNow?.timeDanger}
           dangerColor={viewSettings.dangerColor}
           hideOvertime={!showFinished}
         />

apps/client/src/views/project-info/ProjectInfo.scss

@@ -1,5 +1,7 @@
 @use '@/theme/viewerDefs' as *;
 
+$content-width: min(100%, 1100px);
+
 .project {
   margin: 0;
   box-sizing: border-box; /* reset */
@@ -16,56 +18,104 @@
   display: flex;
   flex-direction: column;
 
+  /* =================== HEADER ===================*/
+
+  .project-header {
+    width: $content-width;
+    margin-inline: auto;
+
+    display: flex;
+    align-items: center;
+    gap: clamp(12px, 2vw, 24px);
+
+    padding-bottom: $view-element-gap;
+    border-bottom: 1px solid $white-10;
+  }
+
   .logo {
     max-width: min(200px, 30vw);
   }
 
+  .title {
+    font-size: $header-font-size;
+    font-weight: 600;
+    line-height: 1.1em;
+  }
+
+  .description {
+    font-size: $base-font-size;
+    color: var(--secondary-color-override, $viewer-secondary-color);
+  }
+
+  /* =================== CONTENT ===================*/
+
   .info {
     flex: 1;
-    max-height: 100%;
+    width: $content-width;
     margin-inline: auto;
     overflow-y: auto;
-    width: min(calc(100vw - 4rem), 960px);
+
     display: flex;
     flex-direction: column;
-    align-items: start;
     gap: $view-element-gap;
 
+    padding-block: $view-element-gap;
     padding-bottom: 10vh;
   }
 
+  .info__card {
+    background-color: var(--card-background-color-override, $viewer-card-bg-color);
+    border-radius: $element-border-radius;
+    padding: $view-block-padding $view-inline-padding;
+
+    display: flex;
+    flex-direction: column;
+    gap: 0.35em;
+  }
+
+  .info__media {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    gap: $view-element-gap;
+  }
+
+  .info__media .info__value {
+    flex: 1;
+    min-width: 0;
+  }
+
   .info__label {
+    font-size: $timer-label-size;
     font-weight: 600;
+    letter-spacing: 0.05em;
     color: var(--label-color-override, $viewer-label-color);
     text-transform: uppercase;
   }
 
   .info__value {
     white-space: break-spaces;
-  }
-
-  .info__custom {
-    display: flex;
-    gap: 1rem;
+    line-height: 1.35;
+    overflow-wrap: anywhere;
   }
 
   .info__image-container {
     display: flex;
     justify-content: center;
     align-items: center;
-    width: 192px;
-    height: 192px;
+    flex: 0 0 min(192px, 25%);
   }
 
   .info__image {
+    display: block;
     max-width: 100%;
-    max-height: 100%;
+    height: auto;
     object-fit: contain;
   }
 
   .link.info__value {
-    display: flex;
-    gap: $view-element-gap;
+    display: inline-flex;
+    gap: 0.35em;
     align-items: center;
     color: $action-text-color;
 
@@ -78,12 +128,13 @@
 /* =================== MOBILE ===================*/
 @media screen and (max-width: 768px) {
   .project {
+    .project-header {
+      flex-direction: column;
+      align-items: start;
+      gap: 0.5rem;
+    }
     .logo img {
       height: min(50px, 10vh);
     }
-    .info__image-container {
-      width: 96px;
-      height: 96px;
-    }
   }
 }

apps/client/src/views/project-info/ProjectInfo.tsx

@@ -1,4 +1,5 @@
 import { OntimeView } from 'ontime-types';
+import { type ReactNode, useState } from 'react';
 import { IoOpenOutline } from 'react-icons/io5';
 
 import EmptyPage from '../../common/components/state/EmptyPage';
@@ -21,7 +22,7 @@ export default function ProjectInfoLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <ProjectInfo {...data} />;
@@ -41,56 +42,49 @@ function ProjectInfo({ projectData, isMirrored }: ProjectInfoData) {
     return (
       <>
         <ViewParamsEditor target={OntimeView.ProjectInfo} viewOptions={[]} />
-        <EmptyPage text={getLocalizedString('common.no_data')} />;
+        <EmptyPage text={getLocalizedString('common.no_data')} />
       </>
     );
   }
 
+  const hasHeader = Boolean(projectData.logo || projectData.title || projectData.description);
+
   return (
     <div className={`project ${isMirrored ? 'mirror' : ''}`} data-testid='project-view'>
       <ViewParamsEditor target={OntimeView.ProjectInfo} viewOptions={[]} />
-      {projectData.logo && <ViewLogo name={projectData.logo} className='logo' />}
+      {hasHeader && (
+        <div className='project-header'>
+          {projectData.logo && <ViewLogo name={projectData.logo} className='logo' />}
+          <div className='project-header__text'>
+            {projectData.title && <div className='title'>{projectData.title}</div>}
+            {projectData.description && <div className='description'>{projectData.description}</div>}
+          </div>
+        </div>
+      )}
       <div className='info'>
-        {projectData.title && (
-          <div>
-            <div className='info__label'>{getLocalizedString('project.title')}</div>
-            <div className='info__value'>{projectData.title}</div>
-          </div>
-        )}
-        {projectData.description && (
-          <div>
-            <div className='info__label'>{getLocalizedString('project.description')}</div>
-            <div className='info__value'>{projectData.description}</div>
-          </div>
-        )}
-        {projectData.info && (
-          <div>
-            <div className='info__label'>{getLocalizedString('project.info')}</div>
-            <div className='info__value'>{projectData.info}</div>
-          </div>
-        )}
+        {projectData.info && <InfoCard label={getLocalizedString('project.info')}>{projectData.info}</InfoCard>}
         {projectData.url && (
-          <div>
+          <div className='info__card'>
             <div className='info__label'>{getLocalizedString('project.url')}</div>
             <a href={projectData.url} target='_blank' rel='noreferrer' className='info__value link'>
-              {projectData.url} <IoOpenOutline style={{ fontSize: '1em' }} />
+              {projectData.url}
+              <IoOpenOutline style={{ fontSize: '1em' }} />
             </a>
           </div>
         )}
         {projectData.custom.map((info, idx) => {
-          const hasUrl = Boolean(info.url);
           return (
             // oxlint-disable-next-line react/no-array-index-key - we only have the index to go of  here
-            <div key={`${info.title}-${idx}`} className='info__custom'>
-              {hasUrl && (
-                <div className='info__image-container'>
-                  <img className='info__image' src={info.url} loading='lazy' />
+            <div key={`${info.title}-${idx}`} className='info__card'>
+              {info.title && <div className='info__label'>{info.title}</div>}
+              {info.url ? (
+                <div className='info__media'>
+                  <InfoImage src={info.url} />
+                  {info.value && <div className='info__value'>{info.value}</div>}
                 </div>
+              ) : (
+                info.value && <div className='info__value'>{info.value}</div>
               )}
-              <div>
-                <div className='info__label'>{info.title}</div>
-                <div className='info__value'>{info.value}</div>
-              </div>
             </div>
           );
         })}
@@ -98,3 +92,31 @@ function ProjectInfo({ projectData, isMirrored }: ProjectInfoData) {
     </div>
   );
 }
+
+interface InfoCardProps {
+  label: string;
+  children: ReactNode;
+}
+
+function InfoCard({ label, children }: InfoCardProps) {
+  return (
+    <div className='info__card'>
+      <div className='info__label'>{label}</div>
+      <div className='info__value'>{children}</div>
+    </div>
+  );
+}
+
+function InfoImage({ src }: { src: string }) {
+  const [hasError, setHasError] = useState(false);
+
+  if (hasError) {
+    return null;
+  }
+
+  return (
+    <div className='info__image-container'>
+      <img className='info__image' src={src} loading='lazy' alt='' onError={() => setHasError(true)} />
+    </div>
+  );
+}

apps/client/src/views/project-info/useProjectInfoData.ts

@@ -2,7 +2,7 @@ import { ProjectData } from 'ontime-types';
 
 import useProjectData from '../../common/hooks-query/useProjectData';
 import { useViewOptionsStore } from '../../common/stores/viewOptions';
-import { ViewData } from '../utils/viewLoader.utils';
+import { ViewData, aggregateQueryStatus } from '../utils/viewLoader.utils';
 
 export interface ProjectInfoData {
   projectData: ProjectData;
@@ -14,13 +14,13 @@ export function useProjectInfoData(): ViewData<ProjectInfoData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: projectData, status: projectDataStatus } = useProjectData();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
 
   return {
     data: {
       projectData,
       isMirrored,
     },
-    status: projectDataStatus,
+    status: aggregateQueryStatus([{ status: projectDataStatus, isLoadingError: projectDataIsLoadingError }]),
   };
 }

apps/client/src/views/studio/Studio.tsx

@@ -25,7 +25,7 @@ export default function StudioLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <Studio {...data} />;

apps/client/src/views/studio/useStudioData.ts

@@ -20,10 +20,18 @@ export function useStudioData(): ViewData<StudioData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: projectData, status: projectDataStatus } = useProjectData();
-  const { data: viewSettings, status: viewSettingsStatus } = useViewSettings();
-  const { data: settings, status: settingsStatus } = useSettings();
-  const { data: customFields, status: customFieldsStatus } = useCustomFields();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
+  const {
+    data: viewSettings,
+    status: viewSettingsStatus,
+    isLoadingError: viewSettingsIsLoadingError,
+  } = useViewSettings();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
+  const {
+    data: customFields,
+    status: customFieldsStatus,
+    isLoadingError: customFieldsIsLoadingError,
+  } = useCustomFields();
 
   return {
     data: {
@@ -33,6 +41,11 @@ export function useStudioData(): ViewData<StudioData> {
       settings,
       viewSettings,
     },
-    status: aggregateQueryStatus([projectDataStatus, viewSettingsStatus, settingsStatus, customFieldsStatus]),
+    status: aggregateQueryStatus([
+      { status: projectDataStatus, isLoadingError: projectDataIsLoadingError },
+      { status: viewSettingsStatus, isLoadingError: viewSettingsIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+      { status: customFieldsStatus, isLoadingError: customFieldsIsLoadingError },
+    ]),
   };
 }

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

@@ -1,6 +1,7 @@
 import { OntimeView } from 'ontime-types';
 import { useMemo } from 'react';
 
+import EmptyFill from '../../common/components/state/EmptyFill';
 import EmptyPage from '../../common/components/state/EmptyPage';
 import ViewLogo from '../../common/components/view-logo/ViewLogo';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
@@ -29,7 +30,7 @@ export default function TimelinePageLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <TimelinePage {...data} />;
@@ -73,7 +74,7 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD
           totalDuration={totalDuration}
         />
       ) : (
-        <EmptyPage text={getLocalizedString('common.no_data')} />
+        <EmptyFill text={getLocalizedString('common.no_data')} />
       )}
     </div>
   );

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

@@ -16,10 +16,18 @@ export interface TimelineData {
 
 export function useTimelineData(): ViewData<TimelineData> {
   // HTTP API data
-  const { data: rundownData, status: rundownStatus } = useFlatRundownWithMetadata();
-  const { data: projectData, status: projectDataStatus } = useProjectData();
-  const { data: settings, status: settingsStatus } = useSettings();
-  const { data: customFields, status: customFieldsStatus } = useCustomFields();
+  const {
+    data: rundownData,
+    status: rundownStatus,
+    isLoadingError: rundownIsLoadingError,
+  } = useFlatRundownWithMetadata();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
+  const {
+    data: customFields,
+    status: customFieldsStatus,
+    isLoadingError: customFieldsIsLoadingError,
+  } = useCustomFields();
 
   return {
     data: {
@@ -28,6 +36,11 @@ export function useTimelineData(): ViewData<TimelineData> {
       projectData,
       settings,
     },
-    status: aggregateQueryStatus([rundownStatus, projectDataStatus, settingsStatus, customFieldsStatus]),
+    status: aggregateQueryStatus([
+      { status: rundownStatus, isLoadingError: rundownIsLoadingError },
+      { status: projectDataStatus, isLoadingError: projectDataIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+      { status: customFieldsStatus, isLoadingError: customFieldsIsLoadingError },
+    ]),
   };
 }

apps/client/src/views/timer/Timer.scss

@@ -131,18 +131,6 @@
         opacity: 0;
       }
     }
-
-    // signals that the displayed timer belongs to the group, not to the running event
-    .group-indicator {
-      text-align: center;
-      text-transform: uppercase;
-      letter-spacing: 0.25em;
-      font-weight: 600;
-      font-size: 1.5vw;
-      line-height: 1;
-      opacity: 0.7;
-      color: var(--timer-colour, var(--timer-color-override, $ui-white));
-    }
   }
 
   .secondary {

apps/client/src/views/timer/Timer.tsx

@@ -8,7 +8,7 @@ import TitleCard from '../../common/components/title-card/TitleCard';
 import ViewLogo from '../../common/components/view-logo/ViewLogo';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
 import { useAutoTickingClock } from '../../common/hooks/useAutoTickingClock';
-import { useGroupTimer, useTimerSocket } from '../../common/hooks/useSocket';
+import { useTimerSocket } from '../../common/hooks/useSocket';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import { cx } from '../../common/utils/styleUtils';
 import { formatTime, getDefaultFormat } from '../../common/utils/time';
@@ -25,8 +25,9 @@ import {
   getSecondaryDisplay,
   getShowClock,
   getShowMessage,
-  getShowsTimerValue,
-  resolveTimerDisplay,
+  getShowModifiers,
+  getShowProgressBar,
+  getTotalTime,
 } from './timer.utils';
 import { TimerData, useTimerData } from './useTimerData';
 
@@ -42,7 +43,7 @@ export default function TimerLoader() {
   }
 
   if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
   }
 
   return <Timer {...data} />;
@@ -71,29 +72,23 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
     timeformat,
   } = useTimerOptions();
 
-  const groupTimer = useGroupTimer();
-
   const { getLocalizedString } = useTranslation();
   const localisedMinutes = getLocalizedString('common.minutes');
 
   // gather modifiers
   const viewTimerType = timerType ?? timerTypeNow;
   const showOverlay = getShowMessage(message.timer);
-  const timerDisplay = resolveTimerDisplay({
-    time,
-    groupTimer,
-    event: eventNow,
-    timerType: timerTypeNow,
-    countToEnd: countToEndNow,
+  const { showEndMessage, showFinished, showWarning, showDanger } = getShowModifiers(
+    timerTypeNow,
+    countToEndNow,
+    time.phase,
     freezeOvertime,
     freezeMessage,
     hidePhase,
-  });
-  const { showEndMessage, showFinished, showWarning, showDanger } = timerDisplay;
+  );
   const isPlaying = getIsPlaying(time.playback);
   const showClock = !hideClock && getShowClock(viewTimerType);
-  const showsTimerValue = getShowsTimerValue(viewTimerType);
-  const showProgressBar = !hideProgress && showsTimerValue;
+  const showProgressBar = !hideProgress && getShowProgressBar(viewTimerType);
 
   // gather card data
   const { showNow, nowMain, nowSecondary, showNext, nextMain, nextSecondary } = getCardData(
@@ -107,7 +102,8 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
   );
 
   // gather timer data
-  const stageTimer = getTimerByType(freezeOvertime, timerTypeNow, clock, timerDisplay.source, timerType);
+  const totalTime = getTotalTime(time.duration, time.addedTime);
+  const stageTimer = getTimerByType(freezeOvertime, timerTypeNow, clock, time, timerType);
   const display = getFormattedTimer(stageTimer, viewTimerType, localisedMinutes, {
     removeSeconds: hideTimerSeconds,
     removeLeadingZero: removeLeadingZeros,
@@ -182,14 +178,11 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
             className={cx(['timer', subduePaused && 'timer--paused', showFinished && 'timer--finished'])}
             style={{ fontSize: `${timerFontSize}vw` }}
             data-type={viewTimerType}
-            data-phase={timerDisplay.phase}
+            data-phase={time.phase}
           >
             {display}
           </div>
         )}
-        {timerDisplay.isGroup && showsTimerValue && !showEndMessage && (
-          <div className='group-indicator'>group</div>
-        )}
         <div className={cx(['secondary', !secondaryContent && 'secondary--hidden'])}>
           <FitText mode='multi' min={64} max={256}>
             {secondaryContent}
@@ -200,12 +193,12 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
       {showProgressBar && (
         <MultiPartProgressBar
           className={cx(['progress-container', !isPlaying && 'progress-container--paused'])}
-          now={timerDisplay.source.current}
-          complete={timerDisplay.total}
+          now={time.current}
+          complete={totalTime}
           normalColor={viewSettings.normalColor}
-          warning={timerDisplay.warning}
+          warning={eventNow?.timeWarning}
           warningColor={viewSettings.warningColor}
-          danger={timerDisplay.danger}
+          danger={eventNow?.timeDanger}
           dangerColor={viewSettings.dangerColor}
           hideOvertime={!showFinished}
         />

apps/client/src/views/timer/__tests__/timer.utils.test.ts

@@ -1,110 +0,0 @@
-import { GroupTimerState, Playback, TimerPhase, TimerState, TimerType } from 'ontime-types';
-
-import { getShowsTimerValue, resolveTimerDisplay } from '../timer.utils';
-
-const makeTime = (patch: Partial<TimerState> = {}): TimerState => ({
-  addedTime: 0,
-  current: 10000,
-  duration: 60000,
-  elapsed: 50000,
-  expectedFinish: null,
-  phase: TimerPhase.Default,
-  playback: Playback.Play,
-  secondaryTimer: null,
-  startedAt: null,
-  ...patch,
-});
-
-const makeGroupTimer = (patch: Partial<GroupTimerState> = {}): GroupTimerState => ({
-  current: 100000,
-  elapsed: 80000,
-  duration: 180000,
-  ...patch,
-});
-
-const resolve = (time: TimerState, groupTimer: GroupTimerState | null) =>
-  resolveTimerDisplay({
-    time,
-    groupTimer,
-    event: { timeWarning: 120000, timeDanger: 60000 },
-    timerType: TimerType.CountDown,
-    countToEnd: false,
-    freezeOvertime: false,
-    freezeMessage: '',
-    hidePhase: false,
-  });
-
-describe('resolveTimerDisplay()', () => {
-  it('uses the event timer when there is no group timer', () => {
-    const time = makeTime();
-    const result = resolve(time, null);
-
-    expect(result.isGroup).toBe(false);
-    expect(result.source).toBe(time);
-    expect(result.total).toBe(60000);
-    expect(result.warning).toBe(120000);
-    expect(result.danger).toBe(60000);
-  });
-
-  it('adds the time added to an event into the event total', () => {
-    expect(resolve(makeTime({ addedTime: 30000 }), null).total).toBe(90000);
-  });
-
-  it('uses the group timer when one is present', () => {
-    const groupTimer = makeGroupTimer();
-    const result = resolve(makeTime(), groupTimer);
-
-    expect(result.isGroup).toBe(true);
-    expect(result.source).toBe(groupTimer);
-    expect(result.total).toBe(180000);
-  });
-
-  it('drops the event thresholds while showing the group', () => {
-    const result = resolve(makeTime({ phase: TimerPhase.Danger }), makeGroupTimer());
-
-    expect(result.warning).toBeUndefined();
-    expect(result.danger).toBeUndefined();
-  });
-
-  it.each([TimerPhase.Warning, TimerPhase.Danger])(
-    'reports the group as running while the event is in %s',
-    (phase) => {
-      const result = resolve(makeTime({ phase }), makeGroupTimer());
-
-      expect(result.phase).toBe(TimerPhase.Default);
-      expect(result.showWarning).toBe(false);
-      expect(result.showDanger).toBe(false);
-      expect(result.showFinished).toBe(false);
-    },
-  );
-
-  it('reports overtime only once the group itself has run out of time', () => {
-    const overrunningEvent = makeTime({ current: -5000, phase: TimerPhase.Overtime });
-
-    // the event is over, but the group still has time left
-    const stillRunning = resolve(overrunningEvent, makeGroupTimer({ current: 60000 }));
-    expect(stillRunning.phase).toBe(TimerPhase.Default);
-    expect(stillRunning.showFinished).toBe(false);
-
-    const overtime = resolve(overrunningEvent, makeGroupTimer({ current: -1000 }));
-    expect(overtime.phase).toBe(TimerPhase.Overtime);
-    expect(overtime.showFinished).toBe(true);
-  });
-
-  it.each([TimerPhase.Pending, TimerPhase.None])('keeps the %s playback phase on the group', (phase) => {
-    // these describe the playback state rather than a threshold, so they are true of the group too
-    expect(resolve(makeTime({ phase }), makeGroupTimer()).phase).toBe(phase);
-  });
-});
-
-describe('getShowsTimerValue()', () => {
-  it('is true for timer types which render the running timer', () => {
-    expect(getShowsTimerValue(TimerType.CountDown)).toBe(true);
-    expect(getShowsTimerValue(TimerType.CountUp)).toBe(true);
-  });
-
-  it('is false for timer types which do not reflect what is loaded', () => {
-    expect(getShowsTimerValue(TimerType.Clock)).toBe(false);
-    expect(getShowsTimerValue(TimerType.None)).toBe(false);
-  });
-});

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

@@ -1,5 +1,4 @@
 import {
-  GroupTimerState,
   MaybeNumber,
   MessageState,
   OntimeEvent,
@@ -7,7 +6,6 @@ import {
   RundownEntries,
   TimerMessage,
   TimerPhase,
-  TimerState,
   TimerType,
 } from 'ontime-types';
 import { isPlaybackActive } from 'ontime-utils';
@@ -36,11 +34,9 @@ export function getTotalTime(duration: MaybeNumber, addedTime: MaybeNumber): num
 }
 
 /**
- * Whether this timer type renders a value derived from the running timer.
- * Clock shows the time of day and none shows nothing, so neither reflects what is loaded,
- * which also means neither can carry a progress bar or a group timer indicator
+ * Whether the progress bar should be shown for this timer type
  */
-export function getShowsTimerValue(timerType: TimerType) {
+export function getShowProgressBar(timerType: TimerType) {
   return timerType !== TimerType.None && timerType !== TimerType.Clock;
 }
 
@@ -118,59 +114,6 @@ export function getShowModifiers(
   };
 }
 
-interface ResolveTimerDisplayOptions {
-  time: TimerState;
-  /** when present, views show the group instead of the running event */
-  groupTimer: GroupTimerState | null;
-  event: Pick<OntimeEvent, 'timeWarning' | 'timeDanger'> | null;
-  timerType: TimerType;
-  countToEnd: boolean;
-  freezeOvertime: boolean;
-  freezeMessage: string;
-  hidePhase: boolean;
-}
-
-/**
- * Resolves which timer a view should display, and the modifiers that go with it.
- *
- * A group has no warning or danger thresholds of its own, so it only ever reports as
- * running or overtime. Feeding that phase through `getShowModifiers` means the warning
- * and danger states are suppressed as a consequence of what a group is, rather than
- * every view having to remember to special case them.
- */
-export function resolveTimerDisplay({
-  time,
-  groupTimer,
-  event,
-  timerType,
-  countToEnd,
-  freezeOvertime,
-  freezeMessage,
-  hidePhase,
-}: ResolveTimerDisplayOptions) {
-  const isGroup = groupTimer !== null;
-  const phase = (() => {
-    if (!isGroup) return time.phase;
-    // pending and none describe the playback state rather than a threshold,
-    // they are just as true of the group as they are of the event
-    if (time.phase === TimerPhase.Pending || time.phase === TimerPhase.None) return time.phase;
-    return groupTimer.current <= 0 ? TimerPhase.Overtime : TimerPhase.Default;
-  })();
-
-  return {
-    isGroup,
-    phase,
-    /** the values to render, shaped for getTimerByType */
-    source: isGroup ? groupTimer : time,
-    /** the target of a progress bar */
-    total: isGroup ? groupTimer.duration : getTotalTime(time.duration, time.addedTime),
-    // thresholds belong to the event, they carry no meaning against a group duration
-    warning: isGroup ? undefined : event?.timeWarning,
-    danger: isGroup ? undefined : event?.timeDanger,
-    ...getShowModifiers(timerType, countToEnd, phase, freezeOvertime, freezeMessage, hidePhase),
-  };
-}
-
 /**
  * What, if anything, should be displayed in the secondary field
  */

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

@@ -22,11 +22,19 @@ export function useTimerData(): ViewData<TimerData> {
   const isMirrored = useViewOptionsStore((state) => state.mirror);
 
   // HTTP API data
-  const { data: projectData, status: projectDataStatus } = useProjectData();
-  const { data: viewSettings, status: viewSettingsStatus } = useViewSettings();
-  const { data: settings, status: settingsStatus } = useSettings();
-  const { data: customFields, status: customFieldsStatus } = useCustomFields();
-  const { data: rundown, status: rundownStatus } = useRundown();
+  const { data: projectData, status: projectDataStatus, isLoadingError: projectDataIsLoadingError } = useProjectData();
+  const {
+    data: viewSettings,
+    status: viewSettingsStatus,
+    isLoadingError: viewSettingsIsLoadingError,
+  } = useViewSettings();
+  const { data: settings, status: settingsStatus, isLoadingError: settingsIsLoadingError } = useSettings();
+  const {
+    data: customFields,
+    status: customFieldsStatus,
+    isLoadingError: customFieldsIsLoadingError,
+  } = useCustomFields();
+  const { data: rundown, status: rundownStatus, isLoadingError: rundownIsLoadingError } = useRundown();
   const { entries } = rundown;
 
   return {
@@ -39,11 +47,11 @@ export function useTimerData(): ViewData<TimerData> {
       entries,
     },
     status: aggregateQueryStatus([
-      projectDataStatus,
-      viewSettingsStatus,
-      settingsStatus,
-      customFieldsStatus,
-      rundownStatus,
+      { status: projectDataStatus, isLoadingError: projectDataIsLoadingError },
+      { status: viewSettingsStatus, isLoadingError: viewSettingsIsLoadingError },
+      { status: settingsStatus, isLoadingError: settingsIsLoadingError },
+      { status: customFieldsStatus, isLoadingError: customFieldsIsLoadingError },
+      { status: rundownStatus, isLoadingError: rundownIsLoadingError },
     ]),
   };
 }

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

@@ -5,21 +5,27 @@ export type ViewData<T> = {
   status: QueryStatus;
 };
 
+type AggregatableQuery = {
+  status: QueryStatus;
+  /** true only when the query has never received data, ie useQuery's isLoadingError */
+  isLoadingError: boolean;
+};
+
 /**
- * Aggregates a loading status from multiple query statuses.
- * If all statuses are 'pending', returns 'pending'.
- * If all statuses are 'success', returns 'success'.
- * If any status is 'error', returns 'error'.
+ * Aggregates a loading status from multiple queries, for the purpose of deciding
+ * whether a view can render.
+ * - 'pending' while any query hasn't settled yet (no result, first fetch in flight)
+ * - 'error' once all queries have settled, if any of them never received data
+ * - 'success' once all queries have settled and every one has data to show,
+ *   even if a query's last (background) fetch failed
  */
-export function aggregateQueryStatus(statuses: QueryStatus[]): QueryStatus {
-  if (statuses.every((status) => status === 'pending')) {
+export function aggregateQueryStatus(queries: AggregatableQuery[]): QueryStatus {
+  const allSettled = queries.every((query) => query.status !== 'pending');
+  if (!allSettled) {
     return 'pending';
   }
-  if (statuses.every((status) => status === 'success')) {
-    return 'success';
-  }
-  if (statuses.some((status) => status === 'error')) {
+  if (queries.some((query) => query.isLoadingError)) {
     return 'error';
   }
-  return 'pending';
+  return 'success';
 }

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

@@ -411,7 +411,6 @@ export function migrateRundown(
           targetDuration: null,
           colour: '', //leave default colour
           custom: {}, // leave empty
-          useGroupTimer: false, // opt-in feature, off for migrated projects
           // !==== RUNTIME METADATA ====! //
           revision: -1,
           timeStart: null,

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

@@ -316,7 +316,6 @@ describe('v3 to v4', () => {
           targetDuration: null,
           timeEnd: null,
           timeStart: null,
-          useGroupTimer: false,
         },
         event2: {
           id: 'event2',
@@ -393,7 +392,6 @@ describe('v3 to v4', () => {
           targetDuration: null,
           timeEnd: null,
           timeStart: null,
-          useGroupTimer: false,
         },
         delay: {
           type: SupportedEntry.Delay,

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

@@ -301,23 +301,6 @@ describe('parseRundown()', () => {
     expect(parsedRundown.entries.group).toMatchObject({ entries: ['1', '2'] });
     expect(Object.keys(parsedRundown.entries).length).toEqual(3);
   });
-
-  it('normalises groups from projects made before the group timer existed', () => {
-    const rundown = {
-      id: 'test',
-      title: '',
-      order: ['group'],
-      flatOrder: ['group'],
-      entries: {
-        // a group as it would have been persisted by a previous version
-        group: { id: 'group', type: SupportedEntry.Group, title: 'legacy', entries: [] },
-      },
-      revision: 1,
-    } as unknown as Rundown;
-
-    const parsedRundown = parseRundown(rundown, {});
-    expect(parsedRundown.entries.group).toMatchObject({ id: 'group', useGroupTimer: false });
-  });
 });
 
 describe('sanitiseCustomFields()', () => {

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

@@ -15,7 +15,6 @@ import { makeOntimeEvent, makeOntimeGroup, makeOntimeMilestone, makeRundown } fr
 import { parseRundown } from '../rundown.parser.js';
 import {
   calculateDayOffset,
-  createGroupPatch,
   deleteById,
   doesInvalidateMetadata,
   getIntegerAndFraction,
@@ -611,25 +610,3 @@ describe('isLoadedPlayable()', () => {
     expect(isLoadedPlayable('keynote', rundown)).toBe(false);
   });
 });
-
-describe('createGroupPatch()', () => {
-  it('preserves useGroupTimer when it is not part of the patch', () => {
-    const original = makeOntimeGroup({ id: 'group', useGroupTimer: true });
-    const patched = createGroupPatch(original, { title: 'Morning sessions' });
-
-    expect(patched.title).toBe('Morning sessions');
-    expect(patched.useGroupTimer).toBe(true);
-  });
-
-  it('updates useGroupTimer when it is part of the patch', () => {
-    const original = makeOntimeGroup({ id: 'group', useGroupTimer: false });
-    expect(createGroupPatch(original, { useGroupTimer: true }).useGroupTimer).toBe(true);
-    expect(createGroupPatch(original, { useGroupTimer: false }).useGroupTimer).toBe(false);
-  });
-
-  it('ignores non boolean values for useGroupTimer', () => {
-    const original = makeOntimeGroup({ id: 'group', useGroupTimer: true });
-    // @ts-expect-error -- testing a value coming from an unvalidated request
-    expect(createGroupPatch(original, { useGroupTimer: 'nope' }).useGroupTimer).toBe(true);
-  });
-});

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

@@ -179,8 +179,6 @@ export function createGroupPatch(originalGroup: OntimeGroup, patchGroup: Partial
     entries: patchGroup.entries ?? originalGroup.entries,
     targetDuration: maybeTargetDuration(),
     colour: makeString(patchGroup.colour, originalGroup.colour),
-    useGroupTimer:
-      typeof patchGroup.useGroupTimer === 'boolean' ? patchGroup.useGroupTimer : originalGroup.useGroupTimer,
     revision: originalGroup.revision,
     timeStart: originalGroup.timeStart,
     timeEnd: originalGroup.timeEnd,

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

@@ -147,7 +147,6 @@ There are four entry types discriminated by \`type\`:
   note: string
   entries: EntryId[]
   targetDuration: number | null
-  useGroupTimer: boolean       // views show a shared timer for the whole group
   custom: { [key: string]: string }
   timeStart: number | null     // calculated from nested entries (runtime)
   timeEnd: number | null       // calculated from nested entries (runtime)

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

@@ -54,9 +54,7 @@ export type EventFieldArgs = Partial<
 >;
 export type MilestoneFieldArgs = Partial<Pick<OntimeMilestone, 'cue' | 'title' | 'note' | 'colour' | 'custom'>>;
 export type DelayFieldArgs = Partial<Pick<OntimeDelay, 'duration'>>;
-export type GroupFieldArgs = Partial<
-  Pick<OntimeGroup, 'title' | 'note' | 'colour' | 'targetDuration' | 'custom' | 'useGroupTimer'>
->;
+export type GroupFieldArgs = Partial<Pick<OntimeGroup, 'title' | 'note' | 'colour' | 'targetDuration' | 'custom'>>;
 
 export type EntryFieldArgs = EventFieldArgs & MilestoneFieldArgs & DelayFieldArgs & GroupFieldArgs;
 export type TargetRundownArgs = { rundownId?: string };
@@ -172,7 +170,6 @@ function toGroupPatch(args: CreateEntryArgs, id: EntryId): PatchWithId<OntimeGro
   if (args.colour !== undefined) patch.colour = args.colour;
   if (args.targetDuration !== undefined) patch.targetDuration = args.targetDuration;
   if (args.custom !== undefined) patch.custom = args.custom;
-  if (args.useGroupTimer !== undefined) patch.useGroupTimer = args.useGroupTimer;
 
   return Object.keys(patch).length > 1 ? patch : null;
 }

apps/server/src/app.ts

@@ -207,7 +207,6 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
   eventStore.init({
     clock: state.clock,
     timer: state.timer,
-    groupTimer: state.groupTimer,
     message: { ...runtimeStorePlaceholder.message },
     offset: state.offset,
     rundown: state.rundown,

apps/server/src/models/demoRundowns.ts

@@ -39,7 +39,6 @@ export const stageRundown: Rundown = {
       note: '',
       entries: ['9bf60f', 'bf71a2', 'c2697f', 'fa593e', 'a8b0b3'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,
@@ -173,7 +172,6 @@ export const stageRundown: Rundown = {
       note: '',
       entries: ['0aaa7d'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#3E75E8',
       custom: {},
       revision: 0,
@@ -221,7 +219,6 @@ export const stageRundown: Rundown = {
       note: '',
       entries: ['02afca', '75ce86', 'e10ed9', '07df89'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,
@@ -363,7 +360,6 @@ export const backstageRundown: Rundown = {
       note: '',
       entries: ['bs0101', 'bs0102', 'bs0103', 'bs0104'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#A790F5',
       custom: {},
       revision: 0,
@@ -480,7 +476,6 @@ export const backstageRundown: Rundown = {
       note: '',
       entries: ['bs0201', 'bs0202', 'bs0203', 'bs0204'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,
@@ -593,7 +588,6 @@ export const backstageRundown: Rundown = {
       note: '',
       entries: ['bs0301'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#3E75E8',
       custom: {},
       revision: 0,
@@ -640,7 +634,6 @@ export const backstageRundown: Rundown = {
       note: '',
       entries: ['bs0401', 'bs0402', 'bs0403', 'bs0404'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,
@@ -775,7 +768,6 @@ export const broadcastRundown: Rundown = {
       note: '',
       entries: ['br0101', 'br0102', 'br0103'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#ED3333',
       custom: {},
       revision: 0,
@@ -859,7 +851,6 @@ export const broadcastRundown: Rundown = {
       note: '',
       entries: ['br0201', 'br0202', 'br0203', 'br0204'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,
@@ -968,7 +959,6 @@ export const broadcastRundown: Rundown = {
       note: '',
       entries: ['br0301', 'br0302'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#3E75E8',
       custom: {},
       revision: 0,
@@ -1039,7 +1029,6 @@ export const broadcastRundown: Rundown = {
       note: '',
       entries: ['br0401', 'br0402', 'br0403'],
       targetDuration: null,
-      useGroupTimer: false,
       colour: '#339E4E',
       custom: {},
       revision: 0,

apps/server/src/services/__tests__/timerUtils.test.ts

@@ -1,16 +1,4 @@
-import {
-  EndAction,
-  MaybeNumber,
-  OntimeEvent,
-  OntimeGroup,
-  Playback,
-  Rundown,
-  SupportedEntry,
-  TimeOfDay,
-  TimeStrategy,
-  TimerPhase,
-  TimerType,
-} from 'ontime-types';
+import { EndAction, Playback, TimeOfDay, TimeStrategy, TimerPhase, TimerType } from 'ontime-types';
 import { MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND, dayInMs, millisToString } from 'ontime-utils';
 
 import type { RuntimeState } from '../../stores/runtimeState.js';
@@ -19,8 +7,6 @@ import {
   getCurrent,
   getElapsed,
   getExpectedFinish,
-  getGroupTimer,
-  getGroupTiming,
   getRuntimeOffset,
   getTimerPhase,
   hasCrossedMidnight,
@@ -1466,138 +1452,3 @@ describe('findDay()', () => {
     expect(findDayOffset(22 * MILLIS_PER_HOUR, 23 * MILLIS_PER_HOUR)).toBe(0); //   -> 1
   });
 });
-
-describe('getGroupTiming()', () => {
-  const makeEvent = (id: string, duration: number, patch: object = {}) =>
-    ({ id, type: SupportedEntry.Event, duration, gap: 0, skip: false, parent: 'group', ...patch }) as OntimeEvent;
-
-  const makeGroup = (entries: string[]) => ({ id: 'group', type: SupportedEntry.Group, entries }) as OntimeGroup;
-
-  const makeEntries = (...entries: OntimeEvent[]) =>
-    Object.fromEntries(entries.map((entry) => [entry.id, entry])) as Rundown['entries'];
-
-  it('splits the scheduled content around the loaded event', () => {
-    const group = makeGroup(['1', '2', '3']);
-    const entries = makeEntries(makeEvent('1', 10), makeEvent('2', 20), makeEvent('3', 30));
-
-    expect(getGroupTiming(group, entries, '1')).toStrictEqual({ before: 0, after: 50 });
-    expect(getGroupTiming(group, entries, '2')).toStrictEqual({ before: 10, after: 30 });
-    expect(getGroupTiming(group, entries, '3')).toStrictEqual({ before: 30, after: 0 });
-  });
-
-  it('accounts for the gaps between events', () => {
-    const group = makeGroup(['1', '2', '3']);
-    const entries = makeEntries(makeEvent('1', 10), makeEvent('2', 20, { gap: 5 }), makeEvent('3', 30, { gap: 7 }));
-
-    expect(getGroupTiming(group, entries, '1')).toStrictEqual({ before: 0, after: 20 + 5 + 30 + 7 });
-    // the gap before the loaded event has already passed, so it counts as time spent
-    expect(getGroupTiming(group, entries, '2')).toStrictEqual({ before: 10 + 5, after: 30 + 7 });
-  });
-
-  it('splits into values which add up to the group duration', () => {
-    const group = makeGroup(['1', '2', '3']);
-    const entries = makeEntries(makeEvent('1', 10), makeEvent('2', 20, { gap: 5 }), makeEvent('3', 30));
-    const groupDuration = 10 + 20 + 5 + 30;
-
-    for (const id of ['1', '2', '3']) {
-      const timing = getGroupTiming(group, entries, id)!;
-      expect(timing.before + entries[id].duration + timing.after).toBe(groupDuration);
-    }
-  });
-
-  it('skips entries which are not playable events', () => {
-    const group = makeGroup(['1', '2', '3', '4']);
-    const entries = {
-      ...makeEntries(makeEvent('1', 10), makeEvent('2', 20, { skip: true }), makeEvent('4', 40)),
-      '3': { id: '3', type: SupportedEntry.Milestone, parent: 'group' },
-    } as Rundown['entries'];
-
-    expect(getGroupTiming(group, entries, '1')).toStrictEqual({ before: 0, after: 40 });
-  });
-
-  it('returns null when the loaded event is not part of the group', () => {
-    const group = makeGroup(['1', '2']);
-    const entries = makeEntries(makeEvent('1', 10), makeEvent('2', 20));
-
-    expect(getGroupTiming(group, entries, 'elsewhere')).toBeNull();
-  });
-});
-
-describe('getGroupTimer()', () => {
-  const makeState = (patch: {
-    useGroupTimer?: boolean;
-    duration?: number;
-    timing?: { before: number; after: number } | null;
-    current?: MaybeNumber;
-    elapsed?: MaybeNumber;
-    addedTime?: number;
-  }) =>
-    ({
-      groupNow: { duration: patch.duration ?? 100, useGroupTimer: patch.useGroupTimer ?? true },
-      _groupTiming: patch.timing === undefined ? { before: 0, after: 0 } : patch.timing,
-      timer: {
-        current: patch.current ?? null,
-        elapsed: patch.elapsed ?? null,
-        addedTime: patch.addedTime ?? 0,
-      },
-    }) as RuntimeState;
-
-  it('is null when there is no group running', () => {
-    expect(getGroupTimer({ groupNow: null, _groupTiming: null } as RuntimeState)).toBeNull();
-  });
-
-  it('is null when the group has not opted in', () => {
-    expect(getGroupTimer(makeState({ useGroupTimer: false, current: 10 }))).toBeNull();
-  });
-
-  it('is null when the loaded event is not part of the group', () => {
-    expect(getGroupTimer(makeState({ timing: null, current: 10 }))).toBeNull();
-  });
-
-  it('offsets the event timer by the content scheduled around it', () => {
-    const state = makeState({ duration: 100, timing: { before: 30, after: 50 }, current: 20, elapsed: 0 });
-
-    expect(getGroupTimer(state)).toStrictEqual({ current: 70, elapsed: 30, duration: 100 });
-  });
-
-  it('keeps elapsed and current adding up to the total', () => {
-    const state = makeState({ duration: 100, timing: { before: 30, after: 50 }, current: 12, elapsed: 8 });
-    const groupTimer = getGroupTimer(state)!;
-
-    expect(groupTimer.elapsed + groupTimer.current).toBe(groupTimer.duration);
-  });
-
-  it('grows the total with the time added to the running event', () => {
-    const state = makeState({
-      duration: 100,
-      timing: { before: 0, after: 0 },
-      current: 160,
-      elapsed: 0,
-      addedTime: 60,
-    });
-    const groupTimer = getGroupTimer(state)!;
-
-    expect(groupTimer.duration).toBe(160);
-    // elapsed keeps counting up rather than clamping at zero once time is added
-    expect(groupTimer.elapsed).toBe(0);
-    expect(groupTimer.elapsed + groupTimer.current).toBe(groupTimer.duration);
-  });
-
-  it('reports elapsed time while the group is in credit from added time', () => {
-    const state = makeState({
-      duration: 100,
-      timing: { before: 0, after: 0 },
-      current: 150,
-      elapsed: 10,
-      addedTime: 60,
-    });
-
-    expect(getGroupTimer(state)).toStrictEqual({ current: 150, elapsed: 10, duration: 160 });
-  });
-
-  it('goes negative when the group runs into overtime', () => {
-    const state = makeState({ duration: 100, timing: { before: 90, after: 0 }, current: -15, elapsed: 25 });
-
-    expect(getGroupTimer(state)?.current).toBe(-15);
-  });
-});

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

@@ -709,18 +709,6 @@ function broadcastResult(_target: any, _propertyKey: string, descriptor: Propert
       RuntimeService.previousState.timer = { ...state.timer };
     }
 
-    /**
-     * the group timer is the event timer offset by a constant, so it changes exactly when
-     * the event timer does and can share its throttling.
-     * entry changes are also considered since loading an event can move us between groups
-     */
-    if (updateTimer || entryChanged) {
-      if (!deepEqual(RuntimeService.previousState.groupTimer, state.groupTimer)) {
-        batch.add('groupTimer', state.groupTimer);
-        RuntimeService.previousState.groupTimer = state.groupTimer ? { ...state.groupTimer } : null;
-      }
-    }
-
     /**
      * clock has changed by a second or more.
      * or the timer updated so we ensure that the timer and clock ticks are in sync

apps/server/src/services/timerUtils.ts

@@ -1,18 +1,7 @@
-import {
-  Day,
-  EntryId,
-  GroupTimerState,
-  MaybeNumber,
-  OntimeGroup,
-  Rundown,
-  TimeOfDay,
-  TimerPhase,
-  isOntimeEvent,
-  isPlayableEvent,
-} from 'ontime-types';
+import { Day, MaybeNumber, TimeOfDay, TimerPhase } from 'ontime-types';
 import { MILLIS_PER_HOUR, checkIsNow, dayInMs, isPlaybackActive } from 'ontime-utils';
 
-import type { GroupTiming, RuntimeState } from '../stores/runtimeState.js';
+import type { RuntimeState } from '../stores/runtimeState.js';
 
 /**
  * handle events that span over midnight
@@ -242,76 +231,3 @@ export function findDayOffset(plannedStart: number, clock: number): Day {
   if (distance < -12 * MILLIS_PER_HOUR) return 1 as Day;
   return 0 as Day;
 }
-
-/**
- * Splits a group's scheduled content around the loaded event.
- *
- * The result is stable for as long as the same event is loaded, so it is calculated
- * when the group is loaded rather than on every update.
- * The aggregation mirrors the group duration calculated in the rundown
- * (see rundown.dao.ts): non playable entries are skipped and the gap is
- * accounted for in every entry other than the first.
- */
-export function getGroupTiming(
-  group: OntimeGroup,
-  entries: Rundown['entries'],
-  currentEventId: EntryId,
-): GroupTiming | null {
-  const currentIndex = group.entries.indexOf(currentEventId);
-  if (currentIndex === -1) {
-    return null;
-  }
-
-  let before = 0;
-  let after = 0;
-
-  for (let i = 0; i < group.entries.length; i++) {
-    const entry = entries[group.entries[i]];
-    if (!isOntimeEvent(entry) || !isPlayableEvent(entry)) {
-      continue;
-    }
-
-    // the first entry of the group has no gap to account for,
-    // any other entry could be preceded by idle time
-    const gap = i > 0 ? entry.gap : 0;
-
-    if (i < currentIndex) {
-      before += gap + entry.duration;
-    } else if (i === currentIndex) {
-      // the loaded event contributes its own duration through the event timer,
-      // but the idle time before it has already passed
-      before += gap;
-    } else {
-      after += gap + entry.duration;
-    }
-  }
-
-  return { before, after };
-}
-
-/**
- * Derives the shared group timer from the event timer.
- *
- * Keeping this relative to the event timer is what makes the group behave as if it were
- * a single event containing all its children: pause, added time, overtime, roll and
- * midnight rollovers are all inherited instead of being recalculated.
- */
-export function getGroupTimer(state: RuntimeState): GroupTimerState | null {
-  const { groupNow, _groupTiming } = state;
-
-  if (groupNow === null || !groupNow.useGroupTimer || _groupTiming === null) {
-    return null;
-  }
-
-  const { current, elapsed, addedTime } = state.timer;
-  if (current === null) {
-    return null;
-  }
-
-  return {
-    current: current + _groupTiming.after,
-    elapsed: (elapsed ?? 0) + _groupTiming.before,
-    // mirrors the total time of an event, which grows with the time added to it
-    duration: groupNow.duration + addedTime,
-  };
-}

apps/server/src/stores/__mocks__/runtimeState.mocks.ts

@@ -9,8 +9,6 @@ const baseState: RuntimeState = {
   eventNext: null,
   eventFlag: null,
   groupNow: null,
-  groupTimer: null,
-  _groupTiming: null,
   rundown: {
     selectedEventIndex: null,
     numEvents: 0,

apps/server/src/stores/runtimeState.ts

@@ -16,7 +16,6 @@ import {
   TimeOfDay,
   TimerPhase,
   TimerState,
-  GroupTimerState,
   isOntimeEvent,
   runtimeStorePlaceholder,
 } from 'ontime-types';
@@ -40,8 +39,6 @@ import {
   getCurrent,
   getElapsed,
   getExpectedFinish,
-  getGroupTimer,
-  getGroupTiming,
   getRuntimeOffset,
   getTimerPhase,
   hasCrossedMidnight,
@@ -54,12 +51,6 @@ type ExpectedMetadata = {
   isLinkedToLoaded: boolean;
 } | null;
 
-/** scheduled content of the running group, split around the loaded event */
-export type GroupTiming = {
-  before: number;
-  after: number;
-};
-
 export type RuntimeState = {
   clock: TimeOfDay;
   groupNow: OntimeGroup | null;
@@ -68,8 +59,6 @@ export type RuntimeState = {
   eventFlag: PlayableEvent | null;
   offset: Offset;
   timer: TimerState;
-  /** derived from the timer, only refreshed on the getState() projection */
-  groupTimer: GroupTimerState | null;
   rundown: RundownState;
   // private properties of the timer calculations
   _timer: {
@@ -83,7 +72,6 @@ export type RuntimeState = {
     totalDelay: number; // this value comes from rundown service
   };
   _group: ExpectedMetadata;
-  _groupTiming: GroupTiming | null;
   _flag: ExpectedMetadata;
   _end: ExpectedMetadata;
   _startEpoch: Maybe<Instant>;
@@ -98,7 +86,6 @@ const runtimeState: RuntimeState = {
   eventFlag: null,
   offset: { ...runtimeStorePlaceholder.offset },
   timer: { ...runtimeStorePlaceholder.timer },
-  groupTimer: null,
   rundown: { ...runtimeStorePlaceholder.rundown },
   _timer: {
     forceFinish: null,
@@ -111,7 +98,6 @@ const runtimeState: RuntimeState = {
     totalDelay: 0,
   },
   _group: null,
-  _groupTiming: null,
   _flag: null,
   _end: null,
   _startEpoch: null,
@@ -129,8 +115,6 @@ export function getState(): Readonly<RuntimeState> {
     offset: { ...runtimeState.offset },
     rundown: { ...runtimeState.rundown },
     timer: { ...runtimeState.timer },
-    // derived here so it can never drift from the timer values it is built on
-    groupTimer: getGroupTimer(runtimeState),
     _timer: { ...runtimeState._timer },
     _rundown: { ...runtimeState._rundown },
   };
@@ -172,7 +156,6 @@ export function clearState() {
 
   runtimeState.groupNow = null;
   runtimeState._group = null;
-  runtimeState._groupTiming = null;
 
   runtimeState.rundown.actualStart = null;
   runtimeState.rundown.selectedEventIndex = null;
@@ -914,7 +897,6 @@ export function loadGroupFlagAndEnd(
   const previousGroup = state.groupNow?.id;
   state.groupNow = null;
   state._group = null;
-  state._groupTiming = null;
   state.eventFlag = null;
   state._flag = null;
   state._end = null;
@@ -938,11 +920,6 @@ export function loadGroupFlagAndEnd(
     state.rundown.actualGroupStart = null;
   }
 
-  // the split is stable while the same event is loaded, so we only calculate it here
-  if (state.groupNow !== null) {
-    state._groupTiming = getGroupTiming(state.groupNow, rundown.entries, state.eventNow.id);
-  }
-
   // if we don't have a any flags in the rundown then no need to look for it
   let foundFlag = !flagsPresent;
   // if we don't have a last event for the group there is no need to find its end time

packages/types/src/definitions/core/OntimeEntry.ts

@@ -46,8 +46,6 @@ export type OntimeGroup = OntimeBaseEvent & {
   targetDuration: MaybeNumber;
   colour: string;
   custom: EntryCustomFields;
-  /** whether views should display a shared timer for the group instead of the event timer */
-  useGroupTimer: boolean;
   // !==== RUNTIME METADATA ====! //
   revision: number;
   timeStart: MaybeNumber; // calculated at runtime

packages/types/src/definitions/runtime/RuntimeStore.ts

@@ -17,7 +17,6 @@ export const runtimeStorePlaceholder: Readonly<RuntimeStore> = {
     secondaryTimer: null, // change on every update
     startedAt: null, // change can only be initiated by user
   },
-  groupTimer: null, // derived from the timer, null unless the running group opted in
   message: {
     timer: {
       text: '',

packages/types/src/definitions/runtime/RuntimeStore.type.ts

@@ -3,14 +3,12 @@ import type { SimpleTimerState } from './AuxTimer.type.js';
 import type { MessageState } from './MessageControl.type.js';
 import type { Offset } from './Offset.type.js';
 import type { RundownState } from './RundownState.type.js';
-import type { GroupTimerState, TimerState } from './TimerState.type.js';
+import type { TimerState } from './TimerState.type.js';
 
 export type RuntimeStore = {
   // timer data
   clock: number;
   timer: TimerState;
-  /** shared timer for the running group, null unless the group opted in */
-  groupTimer: GroupTimerState | null;
 
   // messages service
   message: MessageState;

packages/types/src/definitions/runtime/TimerState.type.ts

@@ -11,22 +11,6 @@ export enum TimerPhase {
   Pending = 'pending',
 }
 
-/**
- * Timer for the running group, present when the group opted into a shared timer.
- *
- * The group is treated as a single event containing all its children: the values are
- * derived from the running event timer plus the content scheduled around it, so pause,
- * added time, overtime and roll are inherited from the event timer rather than recalculated.
- */
-export type GroupTimerState = {
-  /** Time remaining in the group */
-  current: number;
-  /** Time elapsed since the group started */
-  elapsed: number;
-  /** Total time in the group, includes time added to the running event */
-  duration: number;
-};
-
 /**
  * Gathers the current running timer state
  */

packages/types/src/index.ts

@@ -119,7 +119,7 @@ export type { Offset } from './definitions/runtime/Offset.type.js';
 export { OffsetMode } from './definitions/runtime/Offset.type.js';
 export type { RuntimeStore } from './definitions/runtime/RuntimeStore.type.js';
 export { runtimeStorePlaceholder } from './definitions/runtime/RuntimeStore.js';
-export { type GroupTimerState, type TimerState, TimerPhase } from './definitions/runtime/TimerState.type.js';
+export { type TimerState, TimerPhase } from './definitions/runtime/TimerState.type.js';
 
 // ---> Extra Timer
 export { type SimpleTimerState, SimplePlayback, SimpleDirection } from './definitions/runtime/AuxTimer.type.js';

packages/utils/src/rundown-utils/entryDefinitions.ts

@@ -54,7 +54,6 @@ export const group: Omit<OntimeGroup, 'id'> = {
   targetDuration: null,
   colour: '',
   custom: {},
-  useGroupTimer: false,
   // !==== RUNTIME METADATA ====! //
   revision: 0, // calculated at runtime
   timeStart: null, // calculated at runtime

packages/utils/src/rundown-utils/entryUtils.ts

@@ -69,7 +69,6 @@ export function createGroup(patch?: Partial<OntimeGroup>): OntimeGroup {
     targetDuration: patch.targetDuration ?? null,
     colour: makeString(patch.colour, ''),
     custom: patch.custom ?? {},
-    useGroupTimer: typeof patch.useGroupTimer === 'boolean' ? patch.useGroupTimer : false,
     revision: 0,
     timeStart: null,
     timeEnd: null,