bump version to 3.11.1-beta.1

refactor: improve empty state

refactor: review schedule design

- fit as many elements as possible
- expose cycle interval as an option
- stabilise rundown reference
- style tweaks

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,51 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="CssUnknownProperty" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myCustomPropertiesEnabled" value="true" />
+      <option name="myIgnoreVendorSpecificProperties" value="false" />
+      <option name="myCustomPropertiesList">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="scrollbar-color" />
+            <item index="1" class="java.lang.String" itemvalue="scrollbar-width" />
+            <item index="2" class="java.lang.String" itemvalue="app-region" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HttpUrlsUsage" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredUrls">
+        <list>
+          <option value="http://localhost" />
+          <option value="http://127.0.0.1" />
+          <option value="http://0.0.0.0" />
+          <option value="http://www.w3.org/" />
+          <option value="http://json-schema.org/draft" />
+          <option value="http://java.sun.com/" />
+          <option value="http://xmlns.jcp.org/" />
+          <option value="http://javafx.com/javafx/" />
+          <option value="http://javafx.com/fxml" />
+          <option value="http://maven.apache.org/xsd/" />
+          <option value="http://maven.apache.org/POM/" />
+          <option value="http://www.springframework.org/schema/" />
+          <option value="http://www.springframework.org/tags" />
+          <option value="http://www.springframework.org/security/tags" />
+          <option value="http://www.thymeleaf.org" />
+          <option value="http://www.jboss.org/j2ee/schema/" />
+          <option value="http://www.jboss.com/xml/ns/" />
+          <option value="http://www.ibm.com/webservices/xsd" />
+          <option value="http://activemq.apache.org/schema/" />
+          <option value="http://schema.cloudfoundry.org/spring/" />
+          <option value="http://schemas.xmlsoap.org/" />
+          <option value="http://cxf.apache.org/schemas/" />
+          <option value="http://primefaces.org/ui" />
+          <option value="http://tiles.apache.org/" />
+          <option value="http://__IP__" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

apps/cli/package.json

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

apps/client/package.json

@@ -1,40 +1,37 @@
 {
   "name": "ontime-ui",
-  "version": "3.15.2",
+  "version": "3.11.1-beta.1",
   "private": true,
   "type": "module",
   "dependencies": {
     "@chakra-ui/react": "^2.7.0",
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@emotion/is-prop-valid": "^1.3.1",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.17.2",
+    "@mantine/hooks": "^7.13.3",
+    "@react-icons/all-files": "^4.1.0",
     "@sentry/react": "^8.43.0",
-    "@table-nav/react": "^0.0.7",
     "@tanstack/react-query": "^5.62.7",
     "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.21.3",
+    "@tanstack/react-table": "^8.20.5",
     "autosize": "^6.0.1",
     "axios": "^1.2.0",
     "color": "^4.2.3",
     "csv-stringify": "^6.4.5",
     "framer-motion": "^10.10.0",
-    "prismjs": "^1.29.0",
     "react": "^18.3.1",
     "react-colorful": "^5.6.1",
     "react-dom": "^18.3.1",
     "react-fast-compare": "^3.2.2",
     "react-hook-form": "^7.53.1",
-    "react-icons": "5.4.0",
     "react-qr-code": "^2.0.12",
     "react-router-dom": "^6.3.0",
-    "react-simple-code-editor": "^0.14.1",
     "web-vitals": "^3.1.1",
-    "zustand": "^5.0.3"
+    "zustand": "^4.5.2"
   },
   "scripts": {
     "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -67,7 +64,6 @@
     "@sentry/vite-plugin": "^2.16.1",
     "@tanstack/eslint-plugin-query": "^5.8.4",
     "@types/color": "^3.0.3",
-    "@types/prismjs": "^1.26.5",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.10",
     "@typescript-eslint/eslint-plugin": "catalog:",

apps/client/src/AppRouter.tsx

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

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

@@ -1,30 +0,0 @@
-import axios from 'axios';
-
-import { apiEntryUrl } from './constants';
-
-const assetsPath = `${apiEntryUrl}/assets`;
-
-/**
- * HTTP request to get css contents
- */
-export async function getCSSContents(): Promise<string> {
-  const res = await axios.get(`${assetsPath}/css`);
-  return res.data;
-}
-
-/**
- * HTTP request to post css contents
- */
-export async function postCSSContents(css: string): Promise<void> {
-  await axios.post(`${assetsPath}/css`, {
-    css,
-  });
-}
-
-/**
- * HTTP request to restore default css
- */
-export async function restoreCSSContents(): Promise<string> {
-  const res = await axios.post(`${assetsPath}/css/restore`);
-  return res.data;
-}

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

@@ -10,16 +10,19 @@ export const PROJECT_DATA = ['project'];
 export const PROJECT_LIST = ['projectList'];
 export const RUNDOWN = ['rundown'];
 export const RUNTIME = ['runtimeStore'];
+export const SHEET_STATE = ['sheetState'];
 export const URL_PRESETS = ['urlpresets'];
 export const VIEW_SETTINGS = ['viewSettings'];
 export const CLIENT_LIST = ['clientList'];
-export const REPORT = ['report'];
 
 // API URLs
 export const apiEntryUrl = `${serverURL}/data`;
 
-const userAssetsPath = 'user';
-const cssOverridePath = 'styles/override.css';
+export const projectDataURL = `${serverURL}/project`;
+export const rundownURL = `${serverURL}/events`;
+export const ontimeURL = `${serverURL}/ontime`;
 
+export const userAssetsPath = 'user';
+export const cssOverridePath = 'styles/override.css';
 export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
 export const projectLogoPath = `${serverURL}/${userAssetsPath}/logo`;

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

@@ -1,8 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
 
-import { makeTable } from '../../views/cuesheet/cuesheet.utils';
-import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../utils/csv';
+import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
 
 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -40,12 +39,10 @@ export async function downloadProject(fileName: string) {
 export async function downloadCSV(fileName: string = 'rundown') {
   try {
     const { data, name } = await fileDownload(fileName);
-    const { project, rundowns, customFields } = data;
+    const { project, rundown, customFields } = data;
 
-    const flatRundowns = aggregateRundowns(rundowns);
-    const sheetData = makeTable(project, flatRundowns, customFields);
-
-    const fileContent = makeCSVFromArrayOfArrays(sheetData);
+    const sheetData = makeTable(project, rundown, customFields);
+    const fileContent = makeCSV(sheetData);
 
     const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
     downloadBlob(blob, `${name}.csv`);

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

@@ -1,11 +1,16 @@
 import axios, { AxiosResponse } from 'axios';
-import { CustomFields, Rundown } from 'ontime-types';
+import { CustomFields, OntimeRundown } from 'ontime-types';
 import { ImportMap } from 'ontime-utils';
 
 import { apiEntryUrl } from './constants';
 
 const excelPath = `${apiEntryUrl}/excel`;
 
+type PreviewSpreadsheetResponse = {
+  rundown: OntimeRundown;
+  customFields: CustomFields;
+};
+
 /**
  * upload Excel file to server
  * @return string - file ID op the uploaded file
@@ -29,10 +34,6 @@ export async function getWorksheetNames(): Promise<string[]> {
   return response.data;
 }
 
-type PreviewSpreadsheetResponse = {
-  rundown: Rundown;
-  customFields: CustomFields;
-};
 export async function importRundownPreview(options: ImportMap): Promise<PreviewSpreadsheetResponse> {
   const response: AxiosResponse<PreviewSpreadsheetResponse> = await axios.post(`${excelPath}/preview`, {
     options,

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

@@ -1,26 +0,0 @@
-import axios from 'axios';
-import { OntimeReport } from 'ontime-types';
-
-import { ontimeQueryClient } from '../../common/queryClient';
-
-import { apiEntryUrl, REPORT } from './constants';
-
-export const reportUrl = `${apiEntryUrl}/report`;
-
-/**
- * HTTP request to fetch all reports
- */
-export async function fetchReport(): Promise<OntimeReport> {
-  const res = await axios.get(`${reportUrl}/`);
-  return res.data;
-}
-
-export async function deleteReport(id: string) {
-  await axios.delete(`${reportUrl}/${id}`);
-  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
-}
-
-export async function deleteAllReport() {
-  await axios.delete(`${reportUrl}/all`);
-  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
-}

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

@@ -1,45 +1,29 @@
 import axios, { AxiosResponse } from 'axios';
-import {
-  EntryId,
-  MessageResponse,
-  OntimeEntry,
-  OntimeEvent,
-  ProjectRundownsList,
-  Rundown,
-  TransientEventPayload,
-} from 'ontime-types';
+import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
 
 import { apiEntryUrl } from './constants';
 
 const rundownPath = `${apiEntryUrl}/rundown`;
 
-/**
- * HTTP request to fetch a list of existing rundowns
- */
-export async function fetchProjectRundownList(): Promise<ProjectRundownsList> {
-  const res = await axios.get(`${rundownPath}/`);
-  return res.data;
-}
-
 /**
  * HTTP request to fetch all events
  */
-export async function fetchCurrentRundown(): Promise<Rundown> {
-  const res = await axios.get(`${rundownPath}/current`);
+export async function fetchNormalisedRundown(): Promise<RundownCached> {
+  const res = await axios.get(`${rundownPath}/normalised`);
   return res.data;
 }
 
 /**
- * HTTP request to post new entry
+ * HTTP request to post new event
  */
-export async function postAddEntry(data: TransientEventPayload): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
   return axios.post(rundownPath, data);
 }
 
 /**
- * HTTP request to edit an entry
+ * HTTP request to put new event
  */
-export async function putEditEntry(data: Partial<OntimeEntry>): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestPutEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
   return axios.put(rundownPath, data);
 }
 
@@ -49,9 +33,9 @@ type BatchEditEntry = {
 };
 
 /**
- * HTTP request to edit multiple events
+ * HTTP request to put multiple events
  */
-export async function putBatchEditEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
+export async function requestBatchPutEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
   return axios.put(`${rundownPath}/batch`, data);
 }
 
@@ -62,9 +46,9 @@ export type ReorderEntry = {
 };
 
 /**
- * HTTP request to reorder an entry
+ * HTTP request to reorder events
  */
-export async function patchReorderEntry(data: ReorderEntry): Promise<AxiosResponse<OntimeEntry>> {
+export async function requestReorderEvent(data: ReorderEntry): Promise<AxiosResponse<OntimeRundownEntry>> {
   return axios.patch(`${rundownPath}/reorder`, data);
 }
 
@@ -83,15 +67,15 @@ export async function requestEventSwap(data: SwapEntry): Promise<AxiosResponse<M
 /**
  * HTTP request to request application of delay
  */
-export async function requestApplyDelay(delayId: string): Promise<AxiosResponse<MessageResponse>> {
-  return axios.patch(`${rundownPath}/applydelay/${delayId}`);
+export async function requestApplyDelay(eventId: string): Promise<AxiosResponse<MessageResponse>> {
+  return axios.patch(`${rundownPath}/applydelay/${eventId}`);
 }
 
 /**
- * HTTP request to delete entries
+ * HTTP request to delete given event
  */
-export async function deleteEntries(entryIds: EntryId[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(rundownPath, { data: { ids: entryIds } });
+export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
+  return axios.delete(rundownPath, { data: { ids: eventIds } });
 }
 
 /**

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

@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { AuthenticationStatus, CustomFields, Rundown } from 'ontime-types';
+import { AuthenticationStatus, CustomFields, OntimeRundown } from 'ontime-types';
 import { ImportMap } from 'ontime-utils';
 
 import { apiEntryUrl } from './constants';
@@ -54,7 +54,7 @@ export const previewRundown = async (
   sheetId: string,
   options: ImportMap,
 ): Promise<{
-  rundown: Rundown;
+  rundown: OntimeRundown;
   customFields: CustomFields;
 }> => {
   const response = await axios.post(`${sheetsPath}/${sheetId}/read`, { options });

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

@@ -7,7 +7,7 @@ import { addLog } from '../stores/logger';
 import { nowInMillis } from '../utils/time';
 
 /**
- * Utility unwrap a potential axios error
+ * Utility unrwap a potential axios error
  * @param error
  * @returns
  */
@@ -34,7 +34,7 @@ export function maybeAxiosError(error: unknown) {
 }
 
 /**
- * Utility unwraps a potential axios error and sends to logger
+ * Utility unrwaps a potential axios error and sends to logger
  * @param prepend
  * @param error
  */

apps/client/src/common/components/app-link/AppLink.module.scss

@@ -0,0 +1,12 @@
+@use "../../../theme/mixins" as *;
+
+.link {
+  @include action-link;
+  font-size: $inner-section-text-size;
+}
+
+.linkIcon {
+  margin-left: $element-inner-spacing;
+  display: inline-block;
+  @include rotate-fourty-five;
+}

apps/client/src/common/components/app-link/AppLink.tsx

@@ -0,0 +1,26 @@
+import { MouseEvent, ReactNode } from 'react';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+
+import { openLink } from '../../utils/linkUtils';
+
+import style from './AppLink.module.scss';
+
+interface AppLinkProps {
+  href: string;
+  children: ReactNode;
+}
+
+export default function AppLink(props: AppLinkProps) {
+  const { href, children } = props;
+
+  const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
+    event.preventDefault();
+    openLink(href);
+  };
+
+  return (
+    <a href='#!' target='_blank' rel='noreferrer' className={style.link} onClick={handleClick}>
+      {children} <IoArrowUp className={style.linkIcon} />
+    </a>
+  );
+}

apps/client/src/common/components/buttons/IconButton.module.scss

@@ -1,26 +0,0 @@
-.subtle {
-  aspect-ratio: 1;
-  height: 2rem;
-  height: 2rem;
-  display: grid;
-  place-content: center;
-
-  background: $gray-1050;
-  color: $blue-400;
-  border: 1px solid transparent;
-  border-radius: 3px;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $gray-1000;
-    color: $blue-500;
-  }
-
-  &:active {
-    background: $gray-1100;
-    border-color: $gray-1250;
-  }
-
-  &:disabled {
-    background: $gray-1050;
-  }
-}

apps/client/src/common/components/buttons/IconButton.tsx

@@ -1,14 +0,0 @@
-import { ButtonHTMLAttributes } from 'react';
-
-import { cx } from '../../utils/styleUtils';
-
-import style from './IconButton.module.scss';
-
-export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
-  const { className, children, ...buttonProps } = props;
-  return (
-    <button className={cx([style.subtle, className])} {...buttonProps}>
-      {children}
-    </button>
-  );
-}

apps/client/src/common/components/client-modal/RedirectClientModal.module.scss

@@ -1,24 +0,0 @@
-.textEntry {
-  grid-area: input;
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  color: $label-gray;
-}
-
-.inlineEntry {
-  display: grid;
-  grid-template-areas:
-    'label label'
-    'input btn';
-  grid-template-columns: 1fr auto;
-  column-gap: 0.5rem;
-}
-
-.redirect {
-  grid-area: btn;
-}
-
-.label {
-  color: $label-gray;
-}

apps/client/src/common/components/client-modal/RedirectClientModal.tsx

@@ -1,125 +1,64 @@
 import { useState } from 'react';
-import { IoArrowForward } from 'react-icons/io5';
 import {
-  IconButton,
+  Button,
   Input,
+  InputGroup,
+  InputLeftAddon,
   Modal,
   ModalBody,
   ModalCloseButton,
   ModalContent,
+  ModalFooter,
   ModalHeader,
   ModalOverlay,
-  Select,
 } from '@chakra-ui/react';
 
-import { navigatorConstants } from '../../../viewerConfig';
 import { setClientRemote } from '../../hooks/useSocket';
-import useUrlPresets from '../../hooks-query/useUrlPresets';
-import Info from '../info/Info';
-import AppLink from '../link/app-link/AppLink';
-
-import style from './RedirectClientModal.module.scss';
 
 interface RedirectClientModalProps {
   id: string;
-  name: string;
-  currentPath: string;
-  origin: string;
+  name?: string;
+  path?: string;
   isOpen: boolean;
   onClose: () => void;
 }
 
 export function RedirectClientModal(props: RedirectClientModalProps) {
-  const { id, isOpen, name, currentPath, origin, onClose } = props;
-  const { data } = useUrlPresets();
+  const { id, isOpen, name = '', path: currentPath = '', onClose } = props;
   const [path, setPath] = useState(currentPath);
-  const [selected, setSelected] = useState('/');
 
   const { setRedirect } = setClientRemote;
 
-  const handleRedirect = (newPath: string) => {
-    if (newPath === '/' || newPath === currentPath) {
-      return;
+  const handleRedirect = () => {
+    if (path !== currentPath && path !== '') {
+      setRedirect({ target: id, redirect: path });
     }
-    setRedirect({ target: id, redirect: newPath });
     onClose();
   };
 
-  const enabledPresets = data.filter((preset) => preset.enabled);
+  const host = window.location.origin;
+  const canSubmit = path !== currentPath && path !== '';
 
   return (
     <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
       <ModalOverlay />
-      <ModalContent maxWidth='max(480px, 35vw)'>
+      <ModalContent>
         <ModalHeader>Redirect: {name}</ModalHeader>
         <ModalCloseButton />
         <ModalBody>
-          <Info>
-            Remotely redirect the client to a different URL. <br />
-            Either by selecting a URL Preset or entering a custom path.
-            <br />
-            <br />
-            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
-          </Info>
-          <div>
-            <span className={style.label}>Select View or URL Preset</span>
-            <div className={style.textEntry}>
-              <Select
-                size='md'
-                variant='ontime'
-                isDisabled={enabledPresets.length === 0}
-                onChange={(event) => setSelected(event.target.value)}
-              >
-                <option value='/'>Select view or preset</option>
-                {navigatorConstants.map((view) => {
-                  return (
-                    <option key={view.url} value={`/${view.url}`}>
-                      {view.label}
-                    </option>
-                  );
-                })}
-                {enabledPresets.map((preset) => {
-                  return (
-                    <option key={preset.pathAndParams} value={preset.pathAndParams}>
-                      {`Preset: ${preset.alias}`}
-                    </option>
-                  );
-                })}
-              </Select>
-              <IconButton
-                variant='ontime-filled'
-                size='md'
-                aria-label='Redirect to preset'
-                className={style.redirect}
-                icon={<IoArrowForward />}
-                isDisabled={enabledPresets.length === 0 || selected === '/'}
-                onClick={() => handleRedirect(selected)}
-              />
-            </div>
-          </div>
-          <div className={style.inlineEntry}>
-            <span className={style.label}>Enter custom path</span>
-            <label className={style.textEntry}>
-              {origin}
-              <Input
-                variant='ontime-filled'
-                size='md'
-                placeholder='eg. /minimal?key=0000ffff'
-                value={path}
-                onChange={(event) => setPath(event.target.value)}
-              />
-            </label>
-            <IconButton
-              variant='ontime-filled'
-              size='md'
-              aria-label='Redirect'
-              isDisabled={path === currentPath || path === ''}
-              className={style.redirect}
-              icon={<IoArrowForward />}
-              onClick={() => handleRedirect(path)}
-            />
-          </div>
+          <InputGroup variant='ontime-filled' size='md'>
+            <InputLeftAddon>{host}</InputLeftAddon>
+            <Input placeholder='minimal?key=0000ffff' value={path} onChange={(event) => setPath(event.target.value)} />
+          </InputGroup>
         </ModalBody>
+        <ModalFooter>
+          <Button size='md' variant='ontime-subtle' onClick={onClose}>
+            Cancel
+          </Button>
+          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
+            Submit
+          </Button>
+        </ModalFooter>
       </ModalContent>
     </Modal>
   );

apps/client/src/common/components/context-menu/ContextMenu.tsx

@@ -2,8 +2,8 @@
 // https://github.com/lukasbach/chakra-ui-contextmenu/blob/main/src/ContextMenu.tsx
 
 import { ReactElement } from 'react';
-import { IconType } from 'react-icons';
 import { Menu, MenuButton, MenuGroup, MenuList } from '@chakra-ui/react';
+import { IconType } from '@react-icons/all-files';
 import { create } from 'zustand';
 
 import { ContextMenuOption } from './ContextMenuOption';
@@ -23,7 +23,7 @@ export type OptionWithoutGroup = {
   withDivider?: boolean;
 };
 
-type OptionWithGroup = {
+export type OptionWithGroup = {
   label: string;
   group: Omit<OptionWithoutGroup, 'isGroup'>[];
 };

apps/client/src/common/components/copy-tag/CopyTag.tsx

@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
-import { IoCheckmark } from 'react-icons/io5';
-import { IoCopy } from 'react-icons/io5';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';
+import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
+import { IoCopy } from '@react-icons/all-files/io5/IoCopy';
 
 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { Size } from '../../models/Util.type';

apps/client/src/common/components/delay-indicator/DelayIndicator.tsx

@@ -1,5 +1,6 @@
-import { IoChevronDown, IoChevronUp } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
+import { IoChevronUp } from '@react-icons/all-files/io5/IoChevronUp';
 
 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { millisToDelayString } from '../../utils/dateConfig';

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

@@ -3,8 +3,8 @@ import React from 'react';
 // skipcq: JS-C1003 - sentry does not expose itself as an ES Module.
 import * as Sentry from '@sentry/react';
 
-import { hasConnected, reconnectAttempts } from '../../../common/utils/socket';
-import { runtimeStore } from '../../stores/runtime';
+import { runtimeStore } from '@/common/stores/runtime';
+import { hasConnected, reconnectAttempts, shouldReconnect } from '@/common/utils/socket';
 
 import style from './ErrorBoundary.module.scss';
 
@@ -26,22 +26,17 @@ class ErrorBoundary extends React.Component {
       error,
       errorInfo: info,
     });
-    this.reportContent = `${error} ${info.componentStack}`;
-
-    const appState = runtimeStore.getState();
-    if (appState.ping < 0) {
-      return;
-    }
 
     Sentry.withScope((scope) => {
       scope.setExtras({
         error,
-        store: appState,
-        hasSocket: { hasConnected, reconnectAttempts },
+        store: runtimeStore.getState(),
+        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
       });
       const eventId = Sentry.captureException(error);
       this.setState({ eventId, info });
     });
+    this.reportContent = `${error} ${info.componentStack}`;
   }
 
   render() {

apps/client/src/common/components/external-link/ExternalLink.tsx

@@ -1,8 +1,8 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from 'react-icons/io5';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
 
-import { openLink } from '../../../utils/linkUtils';
-import { cx } from '../../../utils/styleUtils';
+import { openLink } from '../../utils/linkUtils';
+import { cx } from '../../utils/styleUtils';
 
 import style from './ExternalLink.module.scss';
 
@@ -14,6 +14,7 @@ interface ExternalLinkProps {
 
 export default function ExternalLink(props: ExternalLinkProps) {
   const { href, inline, children } = props;
+  const classes = cx([style.link, inline ? style.inline : null]);
 
   const handleClick = (event: MouseEvent) => {
     event.preventDefault();
@@ -21,14 +22,8 @@ export default function ExternalLink(props: ExternalLinkProps) {
   };
 
   return (
-    <a
-      href='#!'
-      target='_blank'
-      rel='noreferrer'
-      className={cx([style.link, inline && style.inline])}
-      onClick={handleClick}
-    >
-      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
+    <a href='#!' target='_blank' rel='noreferrer' className={classes} onClick={handleClick}>
+      {children} <IoOpenOutline />
     </a>
   );
 }

apps/client/src/common/components/info/Info.module.scss

@@ -2,19 +2,14 @@
   display: flex;
   align-items: center;
   gap: $element-spacing;
-
-  background-color: $gray-1200;
-  border-radius: 3px;
-  font-size: $text-body-size;
   padding: 1rem;
+  margin-bottom: 1rem;
 
-  .content {
-    color: $gray-200;
-  }
+  background-color: $gray-1100;
+  border-radius: 2px;
+  font-size: $inner-section-text-size;
 
   svg {
-    min-width: 1.5rem;
-    align-self: start;
     font-size: 1.5rem;
     color: $info-blue;
   }

apps/client/src/common/components/info/Info.tsx

@@ -1,21 +1,13 @@
 import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from 'react-icons/io5';
-
-import { cx } from '../../utils/styleUtils';
+import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
 
 import style from './Info.module.scss';
 
-interface InfoProps {
-  className?: string;
-}
-
-export default function Info(props: PropsWithChildren<InfoProps>) {
-  const { className, children } = props;
-
+export default function Info({ children }: PropsWithChildren) {
   return (
-    <div className={cx([style.infoLabel, className])}>
+    <div className={style.infoLabel}>
       <IoAlertCircle />
-      <div>{children}</div>
+      {children}
     </div>
   );
 }

apps/client/src/common/components/input/colour-input/Swatch.tsx

@@ -1,4 +1,4 @@
-import { IoBan } from 'react-icons/io5';
+import { IoBan } from '@react-icons/all-files/io5/IoBan';
 
 import { cx } from '../../../utils/styleUtils';
 

apps/client/src/common/components/input/colour-input/SwatchPicker.tsx

@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from 'react-icons/io5';
+import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
 import { ViewSettings } from 'ontime-types';
 
-import { debounce } from '../../../utils/debounce';
+import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
+import { debounce } from '../../../../common/utils/debounce';
 import { cx, getAccessibleColour } from '../../../utils/styleUtils';
-import PopoverPicker from '../popover-picker/PopoverPicker';
 
 import style from './SwatchSelect.module.scss';
 

apps/client/src/common/components/input/delay-input/DelayInput.tsx

@@ -2,7 +2,7 @@ import { KeyboardEvent, useEffect, useRef, useState } from 'react';
 import { Input, Radio, RadioGroup } from '@chakra-ui/react';
 import { millisToString, parseUserTime } from 'ontime-utils';
 
-import { useEntryActions } from '../../../hooks/useEntryAction';
+import { useEventAction } from '../../../hooks/useEventAction';
 
 import style from './DelayInput.module.scss';
 
@@ -13,7 +13,7 @@ interface DelayInputProps {
 
 export default function DelayInput(props: DelayInputProps) {
   const { eventId, duration } = props;
-  const { updateEntry } = useEntryActions();
+  const { updateEvent } = useEventAction();
 
   const [value, setValue] = useState<string>('');
   const inputRef = useRef<HTMLInputElement | null>(null);
@@ -54,7 +54,7 @@ export default function DelayInput(props: DelayInputProps) {
   };
 
   const submitChange = (value: number) => {
-    updateEntry({
+    updateEvent({
       id: eventId,
       duration: value,
     });

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

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

apps/client/src/common/components/link/app-link/AppLink.module.scss

@@ -1,11 +0,0 @@
-.link {
-  color: $label-gray;
-  font-size: $text-body-size;
-  text-decoration: underline;
-  text-underline-offset: 2px;
-  color: $blue-400;
-
-  &:hover {
-    color: $blue-500;
-  }
-}

apps/client/src/common/components/link/app-link/AppLink.tsx

@@ -1,25 +0,0 @@
-import { type PropsWithChildren } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import style from './AppLink.module.scss';
-
-interface AppLinkProps {
-  search: string;
-}
-
-/**
- * Component used to navigate to an editor link inside the same window
- * Handles the path to respect Ontime Clouds base URL
- */
-export default function AppLink(props: PropsWithChildren<AppLinkProps>) {
-  const { search, children } = props;
-  const navigate = useNavigate();
-
-  const handleClick = () => navigate({ search });
-
-  return (
-    <button onClick={handleClick} className={style.link}>
-      {children}
-    </button>
-  );
-}

apps/client/src/common/components/loader-overlay/LoaderOverlay.module.scss

@@ -0,0 +1,45 @@
+$loader-size: 4rem;
+
+.overlay {
+  position: absolute;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
+  display: grid;
+  place-content: center;
+  background-color: $black-10;
+  backdrop-filter: blur(5px);
+}
+
+
+.loader {
+  width: $loader-size;
+  height: $loader-size;
+  background: $blue-500;
+  display: inline-block;
+  border-radius: 50%;
+  box-sizing: border-box;
+  animation: animloader 1s ease-in infinite;
+}
+
+@keyframes animloader {
+  0% {
+    transform: scale(0);
+    opacity: 0.6;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
+
+@keyframes animloader {
+  0% {
+    transform: scale(0);
+    opacity: 0.6;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}

apps/client/src/common/components/loader-overlay/LoaderOverlay.tsx

@@ -0,0 +1,9 @@
+import style from './LoaderOverlay.module.scss';
+
+export default function LoaderOverlay() {
+  return (
+    <div className={style.overlay}>
+      <span className={style.loader} />
+    </div>
+  );
+}

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

@@ -1,7 +1,7 @@
-import { IoApps } from 'react-icons/io5';
-import { IoSettingsOutline } from 'react-icons/io5';
+import { IoApps } from '@react-icons/all-files/io5/IoApps';
+import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
 
-import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
 
 import style from './NavigationMenu.module.scss';

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

@@ -1,6 +1,5 @@
 import { memo, PropsWithChildren } from 'react';
 import { createPortal } from 'react-dom';
-import { IoArrowUp, IoContract, IoExpand, IoLockClosedOutline, IoSwapVertical } from 'react-icons/io5';
 import { Link, useLocation } from 'react-router-dom';
 import {
   Drawer,
@@ -12,6 +11,11 @@ import {
   useDisclosure,
 } from '@chakra-ui/react';
 import { useFullscreen } from '@mantine/hooks';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoContract } from '@react-icons/all-files/io5/IoContract';
+import { IoExpand } from '@react-icons/all-files/io5/IoExpand';
+import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
+import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';
 
 import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';

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

@@ -0,0 +1,16 @@
+import { memo } from 'react';
+
+import NavigationMenu from './NavigationMenu';
+
+interface ProductionNavigationMenuProps {
+  isMenuOpen: boolean;
+  onMenuClose: () => void;
+}
+
+function ProductionNavigationMenu(props: ProductionNavigationMenuProps) {
+  const { isMenuOpen, onMenuClose } = props;
+
+  return <NavigationMenu isOpen={isMenuOpen} onClose={onMenuClose} />;
+}
+
+export default memo(ProductionNavigationMenu);

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

@@ -1,6 +1,6 @@
-import { IoLockClosedOutline } from 'react-icons/io5';
+import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
 
-import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
+import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
 
 import style from './NavigationMenu.module.scss';

apps/client/src/common/components/playback-icon/PlaybackIcon.tsx

@@ -1,5 +1,7 @@
-import { IoPause, IoPlay, IoStop } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { Playback } from 'ontime-types';
 
 import { tooltipDelayFast } from '../../../ontimeConfig';

apps/client/src/common/components/progress-bar/ProgressBar.scss

@@ -9,6 +9,10 @@ $progress-bar-br: 3px;
   border-radius: $progress-bar-br;
   background-color: var(--timer-progress-bg-override, $viewer-card-bg-color);
   overflow: clip;
+
+  &--hidden {
+    display: none;
+  }
 }
 
 .progress-bar__indicator {

apps/client/src/common/components/progress-bar/ProgressBar.tsx

@@ -7,15 +7,16 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
   current: MaybeNumber;
   duration: MaybeNumber;
+  hidden?: boolean;
   className?: string;
 }
 
 export default function ProgressBar(props: ProgressBarProps) {
-  const { current, duration, className } = props;
+  const { current, duration, hidden, className = '' } = props;
   const progress = getProgress(current, duration);
 
   return (
-    <div className={`progress-bar__bg ${className}`}>
+    <div className={`progress-bar__bg ${hidden ? 'progress-bar__bg--hidden' : ''} ${className}`}>
       <div className='progress-bar__indicator' style={{ width: `${progress}%` }} />
     </div>
   );

apps/client/src/common/components/protect-route/PinPage.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
-import { IoCheckmark } from 'react-icons/io5';
 import { IconButton, PinInput, PinInputField } from '@chakra-ui/react';
+import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
 
 import style from './ProtectRoute.module.scss';
 

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

@@ -5,7 +5,7 @@
 
   .empty {
     width: 100%;
-    opacity: 0.8;
+    opacity: 0.6;
   }
 
   .text {

apps/client/src/common/components/view-logo/ViewLogo.scss

@@ -1,5 +1,5 @@
 .viewLogo {
   max-width: 100%;
-  max-height: 75px;
+  max-height: 100%;
   display: block;
 }

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

@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { IoChevronDown } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import {
   Button,
@@ -14,6 +13,7 @@ import {
   Select,
   Switch,
 } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
 
 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
 
@@ -126,9 +126,9 @@ function MultiOption(props: EditFormMultiOptionProps) {
             onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
           >
             {Object.values(paramField.values).map((option) => {
-              const { value, label, colour } = option;
+              const { value, label } = option;
               return (
-                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
+                <MenuItemOption value={value} key={value}>
                   {label}
                 </MenuItemOption>
               );

apps/client/src/common/components/view-params-editor/ViewParamsEditor.module.scss

@@ -16,7 +16,3 @@
   overflow-y: scroll;
   padding-right: 0.5rem;
 }
-
-.info {
-  margin-bottom: 1rem;
-}

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

@@ -12,7 +12,7 @@ import {
   useDisclosure,
 } from '@chakra-ui/react';
 
-import useViewSettings from '../../hooks-query/useViewSettings';
+import useViewSettings from '../../../common/hooks-query/useViewSettings';
 import Info from '../info/Info';
 
 import { ViewOption } from './types';
@@ -132,9 +132,7 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
         </DrawerHeader>
 
         <DrawerBody>
-          {viewSettings.overrideStyles && (
-            <Info className={style.info}>This view style is being modified by a custom CSS file.</Info>
-          )}
+          {viewSettings.overrideStyles && <Info>This view style is being modified by a custom CSS file.</Info>}
           <form id='edit-params-form' onSubmit={onParamsFormSubmit} className={style.sectionList}>
             {viewOptions.map((section) => (
               <ViewParamsSection

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

@@ -1,5 +1,5 @@
-import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
 
 import { cx } from '../../utils/styleUtils';
 

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

@@ -1,45 +0,0 @@
-import { CustomFields } from 'ontime-types';
-
-import { makeOptionsFromCustomFields } from '../constants';
-
-describe('makeOptionsFromCustomFields', () => {
-  const testCustomFields: CustomFields = {
-    field1: { label: 'Field 1', colour: 'red', type: 'string' },
-    field2: { label: 'Field 2', colour: 'blue', type: 'string' },
-  };
-
-  it('creates a record of keys for the given custom fields', () => {
-    const result = makeOptionsFromCustomFields(testCustomFields);
-    expect(result).toStrictEqual({
-      'custom-field1': 'Custom: Field 1',
-      'custom-field2': 'Custom: Field 2',
-    });
-  });
-
-  it('appends additional data', () => {
-    const additionalData = {
-      test1: 'test1',
-      test2: 'test2',
-    };
-    const result = makeOptionsFromCustomFields(testCustomFields, additionalData);
-    expect(result).toStrictEqual({
-      'custom-field1': 'Custom: Field 1',
-      'custom-field2': 'Custom: Field 2',
-      test1: 'test1',
-      test2: 'test2',
-    });
-  });
-
-  it('filtersImageTypes', () => {
-    const customFieldsWIthImage: CustomFields = {
-      ...testCustomFields,
-      field3: { label: 'Field 3', colour: 'green', type: 'image' },
-    };
-
-    const result = makeOptionsFromCustomFields(customFieldsWIthImage);
-    expect(result).toStrictEqual({
-      'custom-field1': 'Custom: Field 1',
-      'custom-field2': 'Custom: Field 2',
-    });
-  });
-});

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

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

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

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

apps/client/src/common/context/useMediaQuery.ts

@@ -0,0 +1,32 @@
+// roughly from https://github.com/juliencrn/usehooks-ts/blob/master/packages/usehooks-ts/src/useMediaQuery/useMediaQuery.ts
+
+import { useCallback, useEffect, useState } from 'react';
+
+function getMatches(query: string): boolean {
+  return window.matchMedia(query).matches;
+}
+
+// TODO: debounce handleChange
+export default function useMediaQuery(query: string): boolean {
+  const [matches, setMatches] = useState<boolean>(getMatches(query));
+
+  const handleChange = useCallback(() => {
+    setMatches(getMatches(query));
+  }, [query]);
+
+  useEffect(() => {
+    const matchMedia = window.matchMedia(query);
+
+    // Triggered at the first client-side load and if query changes
+    handleChange();
+
+    // Listen matchMedia
+    matchMedia.addEventListener('change', handleChange);
+
+    return () => {
+      matchMedia.removeEventListener('change', handleChange);
+    };
+  }, [handleChange, query]);
+
+  return matches;
+}

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

@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery } from '@tanstack/react-query';
 
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
-import { getAutomationSettings } from '../api/automation';
+import { editAutomationSettings, getAutomationSettings } from '../api/automation';
 import { AUTOMATION } from '../api/constants';
+import { logAxiosError } from '../api/utils';
 import { automationPlaceholderSettings } from '../models/AutomationSettings';
+import { ontimeQueryClient } from '../queryClient';
 
 export default function useAutomationSettings() {
   const { data, status, isFetching, isError, refetch } = useQuery({
@@ -18,3 +20,15 @@ export default function useAutomationSettings() {
 
   return { data: data ?? automationPlaceholderSettings, status, isFetching, isError, refetch };
 }
+
+export function useAutomationSettingsMutation() {
+  const { isPending, mutateAsync } = useMutation({
+    mutationFn: editAutomationSettings,
+    onError: (error) => logAxiosError('Error saving Automation settings', error),
+    onSuccess: (data) => {
+      ontimeQueryClient.setQueryData(AUTOMATION, data);
+    },
+    onSettled: () => ontimeQueryClient.invalidateQueries({ queryKey: AUTOMATION }),
+  });
+  return { isPending, mutateAsync };
+}

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

@@ -11,7 +11,7 @@ const placeholderProjectList: ProjectFileListResponse = {
   lastLoadedProject: '',
 };
 
-function useProjectList() {
+export function useProjectList() {
   const { data, status, refetch } = useQuery({
     queryKey: PROJECT_LIST,
     queryFn: getProjects,

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

@@ -1,20 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { OntimeReport } from 'ontime-types';
-import { MILLIS_PER_HOUR } from 'ontime-utils';
-
-import { REPORT } from '../api/constants';
-import { fetchReport } from '../api/report';
-
-export default function useReport() {
-  const { data, refetch } = useQuery<OntimeReport>({
-    queryKey: REPORT,
-    queryFn: fetchReport,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    retry: 5,
-    retryDelay: (attempt) => attempt * 2500,
-    networkMode: 'always',
-    staleTime: MILLIS_PER_HOUR,
-  });
-
-  return { data: data ?? {}, refetch };
-}

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

@@ -1,30 +1,23 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { OntimeEntry, Rundown } from 'ontime-types';
+import { NormalisedRundown, OntimeRundown, OntimeRundownEntry, RundownCached } from 'ontime-types';
 
 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
-import { fetchCurrentRundown } from '../api/rundown';
+import { fetchNormalisedRundown } from '../api/rundown';
 
 import useProjectData from './useProjectData';
 
 // revision is -1 so that the remote revision is higher
-const cachedRundownPlaceholder: Rundown = {
-  id: 'default',
-  title: '',
-  order: [],
-  flatOrder: [],
-  entries: {},
-  revision: -1,
-};
+const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };
 
 /**
  * Normalised rundown data
  */
 export default function useRundown() {
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
+  const { data, status, isError, refetch, isFetching } = useQuery<RundownCached>({
     queryKey: RUNDOWN,
-    queryFn: fetchCurrentRundown,
+    queryFn: fetchNormalisedRundown,
     placeholderData: (previousData, _previousQuery) => previousData,
     retry: 5,
     retryDelay: (attempt) => attempt * 2500,
@@ -44,16 +37,16 @@ export function useFlatRundown() {
 
   const loadedProject = useRef<string>('');
   const [prevRevision, setPrevRevision] = useState<number>(-1);
-  const [flatRundown, setFlatRundown] = useState<OntimeEntry[]>([]);
+  const [flatRunDown, setFlatRunDown] = useState<OntimeRundown>([]);
 
   // update data whenever the revision changes
   useEffect(() => {
     if (data.revision !== -1 && data.revision !== prevRevision) {
-      const flatRundown = data.order.map((id) => data.entries[id]);
-      setFlatRundown(flatRundown);
+      const flatRundown = data.order.map((id) => data.rundown[id]);
+      setFlatRunDown(flatRundown);
       setPrevRevision(data.revision);
     }
-  }, [data.entries, data.order, data.revision, prevRevision]);
+  }, [data.order, data.revision, data.rundown, prevRevision]);
 
   // TODO: should we have a project id field?
   // invalidate current version if project changes
@@ -64,13 +57,13 @@ export function useFlatRundown() {
     }
   }, [projectData]);
 
-  return { data: flatRundown, status };
+  return { data: flatRunDown, status };
 }
 
 /**
  * Provides access to a partial rundown based on a filter callback
  */
-export function usePartialRundown(cb: (event: OntimeEntry) => boolean) {
+export function usePartialRundown(cb: (event: OntimeRundownEntry) => boolean) {
   const { data, status } = useFlatRundown();
   const filteredData = useMemo(() => {
     return data.filter(cb);

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

@@ -1,6 +1,5 @@
 import { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { useShallow } from 'zustand/shallow';
 
 import { useClientStore } from '../stores/clientStore';
 import { socketSendJson } from '../utils/socket';
@@ -10,12 +9,10 @@ import { useIsOnline } from './useSocket';
 export const useClientPath = () => {
   const navigate = useNavigate();
   const { pathname, search } = useLocation();
-  const { redirect, setRedirect } = useClientStore(
-    useShallow((store) => ({
-      redirect: store.redirect,
-      setRedirect: store.setRedirect,
-    })),
-  );
+  const { redirect, setRedirect } = useClientStore((store) => ({
+    redirect: store.redirect,
+    setRedirect: store.setRedirect,
+  }));
   const isOnline = useIsOnline();
 
   // notify of client path changes

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

@@ -1,30 +1,29 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import {
-  EntryId,
   isOntimeEvent,
-  MaybeString,
   OntimeBlock,
-  OntimeEntry,
+  OntimeDelay,
   OntimeEvent,
-  Rundown,
+  OntimeRundownEntry,
+  RundownCached,
   TimeField,
   TimeStrategy,
   TransientEventPayload,
 } from 'ontime-types';
-import { dayInMs, generateId, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
+import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
 
 import { RUNDOWN } from '../api/constants';
 import {
-  deleteEntries,
-  patchReorderEntry,
-  postAddEntry,
-  putBatchEditEvents,
-  putEditEntry,
   ReorderEntry,
   requestApplyDelay,
+  requestBatchPutEvents,
+  requestDelete,
   requestDeleteAll,
   requestEventSwap,
+  requestPostEvent,
+  requestPutEvent,
+  requestReorderEvent,
   SwapEntry,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
@@ -32,18 +31,18 @@ import { useEditorSettings } from '../stores/editorSettings';
 
 export type EventOptions = Partial<{
   // options to any new block (event / delay / block)
-  after: MaybeString;
-  before: MaybeString;
+  after: string;
+  before: string;
   // options to blocks of type OntimeEvent
   defaultPublic: boolean;
   linkPrevious: boolean;
-  lastEventId: MaybeString;
+  lastEventId: string;
 }>;
 
 /**
- * Gather utilities for actions on entries
+ * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
  */
-export const useEntryActions = () => {
+export const useEventAction = () => {
   const queryClient = useQueryClient();
   const {
     defaultPublic,
@@ -56,24 +55,12 @@ export const useEntryActions = () => {
     defaultEndAction,
   } = useEditorSettings();
 
-  const getEntryById = useCallback(
-    (eventId: string): OntimeEntry | undefined => {
-      const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
-      if (!cachedRundown?.entries) {
-        return;
-      }
-      return cachedRundown.entries[eventId];
-    },
-    [queryClient],
-  );
-
   /**
-   * Calls mutation to add new entry
+   * Calls mutation to add new event
    * @private
    */
-  const _addEntryMutation = useMutation({
-    // TODO(v4): optimistic create entry
-    mutationFn: postAddEntry,
+  const _addEventMutation = useMutation({
+    mutationFn: requestPostEvent,
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: RUNDOWN });
     },
@@ -81,14 +68,14 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Adds an entry to rundown
+   * Adds an event to rundown
    */
-  const addEntry = useCallback(
-    async (entry: Partial<OntimeEntry>, options?: EventOptions) => {
-      const newEntry: TransientEventPayload = { ...entry, id: generateId() };
+  const addEvent = useCallback(
+    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
+      const newEvent: TransientEventPayload = { ...event };
 
       // ************* CHECK OPTIONS specific to events
-      if (isOntimeEvent(newEntry)) {
+      if (isOntimeEvent(newEvent)) {
         // merge creation time options with event settings
         const applicationOptions = {
           after: options?.after,
@@ -98,60 +85,66 @@ export const useEntryActions = () => {
           linkPrevious: options?.linkPrevious ?? linkPrevious,
         };
 
-        if (applicationOptions?.lastEventId) {
+        if (applicationOptions.linkPrevious && applicationOptions?.lastEventId) {
+          newEvent.linkStart = applicationOptions.lastEventId;
+        } else if (applicationOptions?.lastEventId) {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know this is a value
-          const rundownData = queryClient.getQueryData<Rundown>(RUNDOWN)!;
-          const previousEvent = rundownData.entries[applicationOptions.lastEventId];
+          const rundownData = queryClient.getQueryData<RundownCached>(RUNDOWN)!;
+          const { rundown } = rundownData;
+          const previousEvent = rundown[applicationOptions.lastEventId];
           if (isOntimeEvent(previousEvent)) {
-            newEntry.timeStart = previousEvent.timeEnd;
+            newEvent.timeStart = previousEvent.timeEnd;
           }
         }
 
         // Override event with options from editor settings
-        newEntry.linkStart = applicationOptions.linkPrevious;
-        newEntry.isPublic = applicationOptions.defaultPublic;
-
-        if (newEntry.duration === undefined && newEntry.timeEnd === undefined) {
-          newEntry.duration = parseUserTime(defaultDuration);
+        if (applicationOptions.defaultPublic) {
+          newEvent.isPublic = true;
         }
 
-        if (newEntry.timeDanger === undefined) {
-          newEntry.timeDanger = parseUserTime(defaultDangerTime);
+        if (newEvent.duration === undefined && newEvent.timeEnd === undefined) {
+          newEvent.duration = parseUserTime(defaultDuration);
         }
 
-        if (newEntry.timeWarning === undefined) {
-          newEntry.timeWarning = parseUserTime(defaultWarnTime);
+        if (newEvent.timeDanger === undefined) {
+          newEvent.timeDanger = parseUserTime(defaultDangerTime);
         }
 
-        if (newEntry.timerType === undefined) {
-          newEntry.timerType = defaultTimerType;
+        if (newEvent.timeWarning === undefined) {
+          newEvent.timeWarning = parseUserTime(defaultWarnTime);
         }
 
-        if (newEntry.endAction === undefined) {
-          newEntry.endAction = defaultEndAction;
+        if (newEvent.timerType === undefined) {
+          newEvent.timerType = defaultTimerType;
         }
 
-        if (newEntry.timeStrategy === undefined) {
-          newEntry.timeStrategy = defaultTimeStrategy;
+        if (newEvent.endAction === undefined) {
+          newEvent.endAction = defaultEndAction;
+        }
+
+        if (newEvent.timeStrategy === undefined) {
+          newEvent.timeStrategy = defaultTimeStrategy;
         }
       }
 
       // handle adding options that concern all event type
       if (options?.after) {
-        (newEntry as TransientEventPayload).after = options.after;
+        // @ts-expect-error -- not sure how to type this, <after> is a transient property
+        newEvent.after = options.after;
       }
       if (options?.before) {
-        (newEntry as TransientEventPayload).before = options.before;
+        // @ts-expect-error -- not sure how to type this, <before> is a transient property
+        newEvent.before = options.before;
       }
 
       try {
-        await _addEntryMutation.mutateAsync(newEntry);
+        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
       } catch (error) {
         logAxiosError('Failed adding event', error);
       }
     },
     [
-      _addEntryMutation,
+      _addEventMutation,
       defaultDangerTime,
       defaultDuration,
       defaultEndAction,
@@ -165,33 +158,26 @@ export const useEntryActions = () => {
   );
 
   /**
-   * Calls mutation to update existing entry
+   * Calls mutation to update existing event
    * @private
    */
-  const _updateEntryMutation = useMutation({
-    mutationFn: putEditEntry,
+  const _updateEventMutation = useMutation({
+    mutationFn: requestPutEvent,
     // we optimistically update here
     onMutate: async (newEvent) => {
       // cancel ongoing queries
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
       const eventId = newEvent.id;
 
       if (previousData && eventId) {
         // optimistically update object
-        const newRundown = { ...previousData.entries };
+        const newRundown = { ...previousData.rundown };
         // @ts-expect-error -- we expect the events to be of same type
         newRundown[eventId] = { ...newRundown[eventId], ...newEvent };
-        queryClient.setQueryData<Rundown>(RUNDOWN, {
-          id: previousData.id,
-          title: previousData.title,
-          order: previousData.order,
-          flatOrder: previousData.flatOrder,
-          entries: newRundown,
-          revision: -1,
-        });
+        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
       }
 
       // Return a context with the previous and new events
@@ -199,7 +185,7 @@ export const useEntryActions = () => {
     },
     // Mutation fails, rollback undoes optimist update
     onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+      queryClient.setQueryData(RUNDOWN, context?.previousData);
     },
     // Mutation finished, failed or successful
     // Fetch anyway, just to be sure
@@ -210,35 +196,35 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Updates existing entry
+   * Updates existing event
    */
-  const updateEntry = useCallback(
-    async (event: Partial<OntimeEntry>) => {
+  const updateEvent = useCallback(
+    async (event: Partial<OntimeRundownEntry>) => {
       try {
-        await _updateEntryMutation.mutateAsync(event);
+        await _updateEventMutation.mutateAsync(event);
       } catch (error) {
         logAxiosError('Error updating event', error);
       }
     },
-    [_updateEntryMutation],
+    [_updateEventMutation],
   );
 
   const updateCustomField = useCallback(
-    async (entryId: EntryId, field: string, value: string) => {
-      updateEntry({ id: entryId, custom: { [field]: value } });
+    async (eventId: string, field: string, value: string) => {
+      updateEvent({ id: eventId, custom: { [field]: value } });
     },
-    [updateEntry],
+    [updateEvent],
   );
 
   /**
    * Updates time of existing event
-   * @param eventId {EntryId} - id of the event
+   * @param eventId {string} - id of the event
    * @param field {TimeField} - field to update
    * @param value {string} - new value string to be parsed
    * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
    */
   const updateTimer = useCallback(
-    async (eventId: EntryId, field: TimeField, value: string, lockOnUpdate?: boolean) => {
+    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
       // an empty value with no lock has no domain validity
       if (!lockOnUpdate && value === '') {
         return;
@@ -260,7 +246,7 @@ export const useEntryActions = () => {
           newEvent.duration = value === '' ? undefined : calculateNewValue();
         } else if (field === 'timeStart') {
           // an empty values means we should link to the previous
-          newEvent.linkStart = value === '';
+          newEvent.linkStart = value === '' ? 'true' : null;
           newEvent.timeStart = value === '' ? undefined : calculateNewValue();
         }
       } else {
@@ -268,7 +254,7 @@ export const useEntryActions = () => {
       }
 
       try {
-        await _updateEntryMutation.mutateAsync(newEvent);
+        await _updateEventMutation.mutateAsync(newEvent);
       } catch (error) {
         logAxiosError('Error updating event', error);
       }
@@ -299,9 +285,9 @@ export const useEntryActions = () => {
        * Utility function to get the previous event end time
        */
       function getPreviousEnd(): number {
-        const cachedRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
 
-        if (!cachedRundown?.order || !cachedRundown?.entries) {
+        if (!cachedRundown?.order || !cachedRundown?.rundown) {
           return 0;
         }
 
@@ -311,7 +297,7 @@ export const useEntryActions = () => {
         }
         let previousEnd = 0;
         for (let i = index - 1; i >= 0; i--) {
-          const event = cachedRundown.entries[cachedRundown.order[i]];
+          const event = cachedRundown.rundown[cachedRundown.order[i]];
           if (isOntimeEvent(event)) {
             previousEnd = event.timeEnd;
             break;
@@ -320,7 +306,7 @@ export const useEntryActions = () => {
         return previousEnd;
       }
     },
-    [_updateEntryMutation, queryClient],
+    [_updateEventMutation, queryClient],
   );
 
   /**
@@ -328,17 +314,17 @@ export const useEntryActions = () => {
    * @private
    */
   const _batchUpdateEventsMutation = useMutation({
-    mutationFn: putBatchEditEvents,
+    mutationFn: requestBatchPutEvents,
     onMutate: async ({ ids, data }) => {
       // cancel ongoing queries
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousRundown = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousEvents = queryClient.getQueryData<RundownCached>(RUNDOWN);
 
-      if (previousRundown) {
+      if (previousEvents) {
         const eventIds = new Set(ids);
-        const newRundown = { ...previousRundown.entries };
+        const newRundown = { ...previousEvents.rundown };
 
         eventIds.forEach((eventId) => {
           if (Object.hasOwn(newRundown, eventId)) {
@@ -352,24 +338,16 @@ export const useEntryActions = () => {
           }
         });
 
-        queryClient.setQueryData<Rundown>(RUNDOWN, {
-          id: previousRundown.id,
-          title: previousRundown.title,
-          order: previousRundown.order,
-          flatOrder: previousRundown.flatOrder,
-          entries: newRundown,
-          revision: -1,
-        });
+        queryClient.setQueryData(RUNDOWN, { order: previousEvents.order, rundown: newRundown, revision: -1 });
       }
-
-      // Return a context with the previous rundown
-      return { previousRundown };
+      // Return a context with the previous and new events
+      return { previousEvents };
     },
     onSettled: async () => {
       await queryClient.invalidateQueries({ queryKey: RUNDOWN });
     },
     onError: (_error, _newEvent, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousRundown);
+      queryClient.setQueryData(RUNDOWN, context?.previousEvents);
     },
     networkMode: 'always',
   });
@@ -386,29 +364,30 @@ export const useEntryActions = () => {
   );
 
   /**
-   * Calls mutation to delete an entry
+   * Calls mutation to delete an event
    * @private
    */
-  const _deleteEntryMutation = useMutation({
-    mutationFn: deleteEntries,
+  const _deleteEventMutation = useMutation({
+    mutationFn: requestDelete,
     // we optimistically update here
-    onMutate: async (entryIds: EntryId[]) => {
+    onMutate: async (eventIds: string[]) => {
       // cancel ongoing queries
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
 
       if (previousData) {
         // optimistically update object
-        const { entries, order, flatOrder } = optimisticDeleteEntries(entryIds, previousData);
+        const newOrder = previousData.order.filter((id) => !eventIds.includes(id));
+        const newRundown = { ...previousData.rundown };
+        for (const eventId of eventIds) {
+          delete newRundown[eventId];
+        }
 
-        queryClient.setQueryData<Rundown>(RUNDOWN, {
-          id: previousData.id,
-          title: previousData.title,
-          order,
-          flatOrder,
-          entries,
+        queryClient.setQueryData(RUNDOWN, {
+          order: newOrder,
+          rundown: newRundown,
           revision: -1,
         });
       }
@@ -418,8 +397,8 @@ export const useEntryActions = () => {
     },
 
     // Mutation fails, rollback undoes optimist update
-    onError: (_error, _entryIds, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    onError: (_error, _eventId, context) => {
+      queryClient.setQueryData(RUNDOWN, context?.previousData);
     },
     // Mutation finished, failed or successful
     // Fetch anyway, just to be sure
@@ -430,24 +409,24 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Deletes an event entry from the rundown
+   * Deletes an event form the list
    */
-  const deleteEntry = useCallback(
-    async (entryIds: EntryId[]) => {
+  const deleteEvent = useCallback(
+    async (eventIds: string[]) => {
       try {
-        await _deleteEntryMutation.mutateAsync(entryIds);
+        await _deleteEventMutation.mutateAsync(eventIds);
       } catch (error) {
         logAxiosError('Error deleting event', error);
       }
     },
-    [_deleteEntryMutation],
+    [_deleteEventMutation],
   );
 
   /**
    * Calls mutation to delete all events
    * @private
    */
-  const _deleteAllEntriesMutation = useMutation({
+  const _deleteAllEventsMutation = useMutation({
     mutationFn: requestDeleteAll,
     // we optimistically update here
     onMutate: async () => {
@@ -455,25 +434,18 @@ export const useEntryActions = () => {
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
 
       // optimistically update object
-      queryClient.setQueryData<Rundown>(RUNDOWN, {
-        id: previousData?.id ?? 'default',
-        title: previousData?.title ?? '',
-        order: [],
-        flatOrder: [],
-        entries: {},
-        revision: -1,
-      });
+      queryClient.setQueryData(RUNDOWN, { rundown: {}, order: [], revision: -1 });
 
       // Return a context with the previous and new events
       return { previousData };
     },
 
-    // Mutation fails, rollback optimist update
-    onError: (_error, _, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    // Mutation fails, rollback undos optimist update
+    onError: (_error, _eventId, context) => {
+      queryClient.setQueryData(RUNDOWN, context?.previousData);
     },
     // Mutation finished, failed or successful
     // Fetch anyway, just to be sure
@@ -484,15 +456,15 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Deletes all entries in the rundown
+   * Deletes all events from list
    */
-  const deleteAllEntries = useCallback(async () => {
+  const deleteAllEvents = useCallback(async () => {
     try {
-      await _deleteAllEntriesMutation.mutateAsync();
+      await _deleteAllEventsMutation.mutateAsync();
     } catch (error) {
       logAxiosError('Error deleting events', error);
     }
-  }, [_deleteAllEntriesMutation]);
+  }, [_deleteAllEventsMutation]);
 
   /**
    * Calls mutation to apply a delay
@@ -508,7 +480,7 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Applies a given delay
+   * Applies a given delay block
    */
   const applyDelay = useCallback(
     async (delayEventId: string) => {
@@ -522,30 +494,24 @@ export const useEntryActions = () => {
   );
 
   /**
-   * Calls mutation to reorder an entry
+   * Calls mutation to reorder an event
    * @private
    */
-  const _reorderEntryMutation = useMutation({
-    mutationFn: patchReorderEntry,
+  const _reorderEventMutation = useMutation({
+    mutationFn: requestReorderEvent,
     // we optimistically update here
     onMutate: async (data) => {
       // cancel ongoing queries
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
 
       if (previousData) {
         // optimistically update object
         const newOrder = reorderArray(previousData.order, data.from, data.to);
-        queryClient.setQueryData<Rundown>(RUNDOWN, {
-          id: previousData.id,
-          title: previousData.title,
-          order: newOrder,
-          flatOrder: previousData.flatOrder,
-          entries: previousData.entries,
-          revision: -1,
-        });
+
+        queryClient.setQueryData(RUNDOWN, { order: newOrder, rundown: previousData.rundown, revision: -1 });
       }
 
       // Return a context with the previous and new events
@@ -553,8 +519,8 @@ export const useEntryActions = () => {
     },
 
     // Mutation fails, rollback undoes optimist update
-    onError: (_error, _data, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+    onError: (_error, _eventId, context) => {
+      queryClient.setQueryData(RUNDOWN, context?.previousData);
     },
     // Mutation finished, failed or successful
     // Fetch anyway, just to be sure
@@ -565,22 +531,22 @@ export const useEntryActions = () => {
   });
 
   /**
-   * Reorders a given entry
+   * Reorders a given event
    */
-  const reorderEntry = useCallback(
-    async (entryId: string, from: number, to: number) => {
+  const reorderEvent = useCallback(
+    async (eventId: string, from: number, to: number) => {
       try {
         const reorderObject: ReorderEntry = {
-          eventId: entryId,
+          eventId,
           from,
           to,
         };
-        await _reorderEntryMutation.mutateAsync(reorderObject);
+        await _reorderEventMutation.mutateAsync(reorderObject);
       } catch (error) {
         logAxiosError('Error re-ordering event', error);
       }
     },
-    [_reorderEntryMutation],
+    [_reorderEventMutation],
   );
 
   /**
@@ -595,29 +561,22 @@ export const useEntryActions = () => {
       await queryClient.cancelQueries({ queryKey: RUNDOWN });
 
       // Snapshot the previous value
-      const previousData = queryClient.getQueryData<Rundown>(RUNDOWN);
+      const previousData = queryClient.getQueryData<RundownCached>(RUNDOWN);
       if (previousData) {
         // optimistically update object
-        const newRundown = { ...previousData.entries };
-        const eventA = previousData.entries[from];
-        const eventB = previousData.entries[to];
+        const newRundown = { ...previousData.rundown };
+        const eventA = previousData.rundown[from];
+        const eventB = previousData.rundown[to];
 
         if (!isOntimeEvent(eventA) || !isOntimeEvent(eventB)) {
           return;
         }
 
-        const [newA, newB] = swapEventData(eventA, eventB);
+        const { newA, newB } = swapEventData(eventA, eventB);
         newRundown[from] = newA;
         newRundown[to] = newB;
 
-        queryClient.setQueryData<Rundown>(RUNDOWN, {
-          id: previousData.id,
-          title: previousData.title,
-          order: previousData.order,
-          flatOrder: previousData.flatOrder,
-          entries: newRundown,
-          revision: -1,
-        });
+        queryClient.setQueryData(RUNDOWN, { order: previousData.order, rundown: newRundown, revision: -1 });
       }
 
       // Return a context with the previous events
@@ -626,7 +585,7 @@ export const useEntryActions = () => {
 
     // Mutation fails, rollback undoes optimist update
     onError: (_error, _eventId, context) => {
-      queryClient.setQueryData<Rundown>(RUNDOWN, context?.previousData);
+      queryClient.setQueryData(RUNDOWN, context?.previousData);
     },
     // Mutation finished, failed or successful
     // Fetch anyway, just to be sure
@@ -651,45 +610,15 @@ export const useEntryActions = () => {
   );
 
   return {
-    addEntry,
+    addEvent,
     applyDelay,
     batchUpdateEvents,
-    deleteEntry,
-    deleteAllEntries,
-    getEntryById,
-    reorderEntry,
+    deleteEvent,
+    deleteAllEvents,
+    reorderEvent,
     swapEvents,
-    updateEntry,
+    updateEvent,
     updateTimer,
     updateCustomField,
   };
 };
-
-/**
- * Utility to optimistically delete entries from client cache
- */
-function optimisticDeleteEntries(entryIds: EntryId[], rundown: Rundown) {
-  const entries = { ...rundown.entries };
-  let order = [...rundown.order];
-  let flatOrder = [...rundown.flatOrder];
-
-  for (let i = 0; i < entryIds.length; i++) {
-    const entry = entries[entryIds[i]];
-    deleteEntry(entry);
-  }
-
-  function deleteEntry(entry: OntimeEntry) {
-    if (isOntimeEvent(entry) && entry.parent) {
-      const parent = entries[entry.parent] as OntimeBlock;
-      parent.events = parent.events.filter((event) => event !== entry.id);
-      parent.numEvents -= 1;
-    } else {
-      order = order.filter((id) => id !== entry.id);
-    }
-
-    delete entries[entry.id];
-    flatOrder = flatOrder.filter((id) => id !== entry.id);
-  }
-
-  return { entries, order, flatOrder };
-}

apps/client/src/common/hooks/useFadeOutOnInactivity.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import { throttle } from '../utils/throttle';
-
+import { throttle } from '../../common/utils/throttle';
 
 export const useFadeOutOnInactivity = () => {
   const [isMouseMoved, setIsMouseMoved] = useState(false);

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

@@ -12,7 +12,7 @@ type noop = (this: any, ...args: any[]) => any;
 
 type PickFunction<T extends noop> = (this: ThisParameterType<T>, ...args: Parameters<T>) => ReturnType<T>;
 
-const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';
+export const isFunction = (value: unknown): value is (...args: any) => any => typeof value === 'function';
 
 export default function useMemoisedFn<T extends noop>(fn: T) {
   if (isDev) {

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

@@ -1,56 +1,75 @@
-import { OffsetMode, RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
+import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ontime-types';
 
 import { useRuntimeStore } from '../stores/runtime';
 import { socketSendJson } from '../utils/socket';
 
-const createSelector =
-  <T>(selector: (state: RuntimeStore) => T) =>
-  () =>
-    useRuntimeStore(selector);
-
 export const setClientRemote = {
   setIdentify: (payload: { target: string; identify: boolean }) => socketSendJson('client', payload),
   setRedirect: (payload: { target: string; redirect: string }) => socketSendJson('client', payload),
   setClientName: (payload: { target: string; rename: string }) => socketSendJson('client', payload),
 };
 
-export const useRundownEditor = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  selectedEventId: state.eventNow?.id ?? null,
-  nextEventId: state.eventNext?.id ?? null,
-}));
+export const useRundownEditor = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
+    selectedEventId: state.eventNow?.id ?? null,
+    nextEventId: state.eventNext?.id ?? null,
+  });
 
-export const useOperator = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  selectedEventId: state.eventNow?.id ?? null,
-}));
+  return useRuntimeStore(featureSelector);
+};
 
-export const useTimerViewControl = createSelector((state: RuntimeStore) => ({
-  blackout: state.message.timer.blackout,
-  blink: state.message.timer.blink,
-  secondarySource: state.message.timer.secondarySource,
-}));
+export const useOperator = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
+    selectedEventId: state.eventNow?.id ?? null,
+  });
 
-export const useTimerMessageInput = createSelector((state: RuntimeStore) => ({
-  text: state.message.timer.text,
-  visible: state.message.timer.visible,
-}));
+  return useRuntimeStore(featureSelector);
+};
 
-export const useExternalMessageInput = createSelector((state: RuntimeStore) => ({
-  text: state.message.external,
-  visible: state.message.timer.secondarySource === 'external',
-}));
+export const useTimerViewControl = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    blackout: state.message.timer.blackout,
+    blink: state.message.timer.blink,
+    secondarySource: state.message.timer.secondarySource,
+  });
 
-export const useMessagePreview = createSelector((state: RuntimeStore) => ({
-  blink: state.message.timer.blink,
-  blackout: state.message.timer.blackout,
-  phase: state.timer.phase,
-  showAuxTimer: state.message.timer.secondarySource === 'aux',
-  showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
-  showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
-  timerType: state.eventNow?.timerType ?? null,
-  countToEnd: state.eventNow?.countToEnd ?? false,
-}));
+  return useRuntimeStore(featureSelector);
+};
+
+export const useTimerMessageInput = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    text: state.message.timer.text,
+    visible: state.message.timer.visible,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useExternalMessageInput = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    text: state.message.external,
+    visible: state.message.timer.secondarySource === 'external',
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useMessagePreview = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    blink: state.message.timer.blink,
+    blackout: state.message.timer.blackout,
+    phase: state.timer.phase,
+    showAuxTimer: state.message.timer.secondarySource === 'aux',
+    showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
+    showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
+    timerType: state.eventNow?.timerType ?? null,
+    countToEnd: state.eventNow?.countToEnd ?? false,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
 
 export const setMessage = {
   timerText: (payload: string) => socketSendJson('message', { timer: { text: payload } }),
@@ -62,12 +81,16 @@ export const setMessage = {
     socketSendJson('message', { timer: { secondarySource: payload } }),
 };
 
-export const usePlaybackControl = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  numEvents: state.runtime.numEvents,
-  timerPhase: state.timer.phase,
-}));
+export const usePlaybackControl = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
+    selectedEventIndex: state.runtime.selectedEventIndex,
+    numEvents: state.runtime.numEvents,
+    timerPhase: state.timer.phase,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
 
 export const setPlayback = {
   start: () => socketSendJson('start'),
@@ -91,12 +114,32 @@ export const setPlayback = {
   },
 };
 
-export const useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);
+export const useInfoPanel = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    eventNow: state.eventNow,
+    eventNext: state.eventNext,
+    playback: state.timer.playback,
+    selectedEventIndex: state.runtime.selectedEventIndex,
+    numEvents: state.runtime.numEvents,
+  });
 
-export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
-  playback: state.auxtimer1.playback,
-  direction: state.auxtimer1.direction,
-}));
+  return useRuntimeStore(featureSelector);
+};
+
+export const useAuxTimerTime = () => {
+  const featureSelector = (state: RuntimeStore) => state.auxtimer1.current;
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useAuxTimerControl = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.auxtimer1.playback,
+    direction: state.auxtimer1.direction,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
 
 export const setAuxTimer = {
   start: () => socketSendJson('auxtimer', { '1': SimplePlayback.Start }),
@@ -106,13 +149,20 @@ export const setAuxTimer = {
   setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };
 
-export const useSelectedEventId = createSelector((state: RuntimeStore) => ({
-  selectedEventId: state.eventNow?.id ?? null,
-}));
+export const useSelectedEventId = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    selectedEventId: state.eventNow?.id ?? null,
+  });
 
-export const useCurrentBlockId = createSelector((state: RuntimeStore) => ({
-  currentBlockId: state.currentBlock.block?.id ?? null,
-}));
+  return useRuntimeStore(featureSelector);
+};
+
+export const useCurrentBlockId = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    currentBlockId: state.currentBlock.block?.id ?? null,
+  });
+  return useRuntimeStore(featureSelector);
+};
 
 export const setEventPlayback = {
   loadEvent: (id: string) => socketSendJson('load', { id }),
@@ -121,76 +171,89 @@ export const setEventPlayback = {
   pause: () => socketSendJson('pause'),
 };
 
-export const useTimer = createSelector((state: RuntimeStore) => ({
-  ...state.timer,
-}));
-
-export const useClock = createSelector((state: RuntimeStore) => ({
-  clock: state.clock,
-}));
-
-/** Used by the progress bar components */
-export const useProgressData = createSelector((state: RuntimeStore) => ({
-  current: state.timer.current,
-  duration: state.timer.duration,
-  timeWarning: state.eventNow?.timeWarning ?? null,
-  timeDanger: state.eventNow?.timeDanger ?? null,
-}));
-
-export const useRuntimeOverview = createSelector((state: RuntimeStore) => ({
-  plannedStart: state.runtime.plannedStart,
-  actualStart: state.runtime.actualStart,
-  plannedEnd: state.runtime.plannedEnd,
-  expectedEnd: state.runtime.expectedEnd,
-}));
-
-export const useRuntimePlaybackOverview = createSelector((state: RuntimeStore) => ({
-  playback: state.timer.playback,
-  clock: state.clock,
-
-  numEvents: state.runtime.numEvents,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,
-
-  currentBlock: state.currentBlock,
-}));
-
-export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
-  clock: state.clock,
-  offset: state.runtime.offset,
-}));
-
-export const useTimeUntilData = createSelector((state: RuntimeStore) => ({
-  clock: state.clock,
-  offset: state.runtime.offsetMode === OffsetMode.Absolute ? state.runtime.offset : state.runtime.relativeOffset,
-  offsetMode: state.runtime.offsetMode,
-  currentDay: state.eventNow?.dayOffset ?? 0, //The day of the currently running event
-  actualStart: state.runtime.actualStart,
-  plannedStart: state.runtime.plannedStart,
-}));
-
-export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
-  offset: state.runtime.offset,
-}));
-
-export const usePing = createSelector((state: RuntimeStore) => ({
-  ping: state.ping,
-}));
-
-/** convert ping into a derived value which changes less often */
-export const useIsOnline = createSelector((state: RuntimeStore) => ({
-  isOnline: state.ping > 0,
-}));
-
-export const useOffsetMode = createSelector((state: RuntimeStore) => ({
-  offsetMode: state.runtime.offsetMode,
-}));
-
-export const setOffsetMode = (payload: OffsetMode) => socketSendJson('offsetmode', payload);
-
-export const usePlayback = () => {
+export const useTimer = () => {
   const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
+    ...state.timer,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useClock = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    clock: state.clock,
+  });
+  return useRuntimeStore(featureSelector);
+};
+
+/** Used by the progress bar components */
+export const useProgressData = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    current: state.timer.current,
+    duration: state.timer.duration,
+    timeWarning: state.eventNow?.timeWarning ?? null,
+    timeDanger: state.eventNow?.timeDanger ?? null,
+  });
+  return useRuntimeStore(featureSelector);
+};
+
+export const setClientName = (newName: string) => socketSendJson('set-client-name', newName);
+
+export const useRuntimeOverview = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    plannedStart: state.runtime.plannedStart,
+    actualStart: state.runtime.actualStart,
+    plannedEnd: state.runtime.plannedEnd,
+    expectedEnd: state.runtime.expectedEnd,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useRuntimePlaybackOverview = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    playback: state.timer.playback,
+    clock: state.clock,
+
+    numEvents: state.runtime.numEvents,
+    selectedEventIndex: state.runtime.selectedEventIndex,
+    offset: state.runtime.offset,
+
+    currentBlock: state.currentBlock,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useTimelineStatus = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    clock: state.clock,
+    offset: state.runtime.offset,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const useRuntimeOffset = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    offset: state.runtime.offset,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+export const usePing = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    ping: state.ping,
+  });
+
+  return useRuntimeStore(featureSelector);
+};
+
+/** convert ping into a derived value which changes less often */
+export const useIsOnline = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    isOnline: state.ping > 0,
   });
 
   return useRuntimeStore(featureSelector);

apps/client/src/common/models/Info.ts

@@ -2,7 +2,7 @@ import { GetInfo } from 'ontime-types';
 
 export const ontimePlaceholderInfo: GetInfo = {
   networkInterfaces: [],
-  version: '4.0.0',
+  version: '2.0.0',
   serverPort: 4001,
   publicDir: '',
 };

apps/client/src/common/models/OntimeSettings.ts

@@ -1,7 +1,8 @@
 import { Settings } from 'ontime-types';
 
 export const ontimePlaceholderSettings: Settings = {
-  version: '4.0.0',
+  app: 'ontime',
+  version: '2.0.0',
   serverPort: 4001,
   editorKey: null,
   operatorKey: null,

apps/client/src/common/stores/logger.ts

@@ -11,7 +11,7 @@ type LogStore = {
   logs: Log[];
 };
 
-const logger = createStore<LogStore>(() => ({
+export const logger = createStore<LogStore>(() => ({
   logs: [],
 }));
 

apps/client/src/common/stores/runtime.ts

@@ -14,6 +14,18 @@ export const runtimeStore = createWithEqualityFn<RuntimeStore>(
 export const useRuntimeStore = <T>(selector: (state: RuntimeStore) => T) =>
   useStoreWithEqualityFn(runtimeStore, selector, deepCompare);
 
+let batchStore: Partial<RuntimeStore> = {};
+
+export function addToBatchUpdates<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]) {
+  batchStore[key] = value;
+}
+
+export function flushBatchUpdates() {
+  const state = runtimeStore.getState();
+  runtimeStore.setState({ ...state, ...batchStore });
+  batchStore = {};
+}
+
 /**
  * Allows patching a property of the runtime store
  */

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

@@ -1,46 +0,0 @@
-import { OntimeEntry, ProjectRundowns, Rundown } from 'ontime-types';
-
-import { aggregateRundowns, makeCSVFromArrayOfArrays } from '../csv';
-
-describe('makeCSVFromArrayOfArrays()', () => {
-  it('joins an array of arrays with commas and newlines', () => {
-    const testdata = [['field'], ['after newline', 'after comma'], ['', 'after empty']];
-    expect(makeCSVFromArrayOfArrays(testdata)).toMatchInlineSnapshot(`
-"field
-after newline,after comma
-,after empty
-"
-`);
-  });
-});
-
-describe('aggregateRundowns()', () => {
-  it('flattens an object of rundowns into a single array', () => {
-    const rundowns = {
-      first: {
-        id: '',
-        title: '',
-        revision: 0,
-        order: ['1', '2'],
-        flatOrder: ['1', '2'],
-        entries: {
-          '1': { id: '1' } as OntimeEntry,
-          '2': { id: '2' } as OntimeEntry,
-        },
-      },
-      second: {
-        id: '',
-        title: '',
-        revision: 0,
-        order: ['3', '4'],
-        flatOrder: ['3', '4'],
-        entries: {
-          '3': { id: '3' } as OntimeEntry,
-          '4': { id: '4' } as OntimeEntry,
-        },
-      } as Rundown,
-    } as ProjectRundowns;
-
-    expect(aggregateRundowns(rundowns)).toStrictEqual([{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }]);
-  });
-});

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

@@ -1,12 +1,12 @@
-import { EndAction, EntryCustomFields, OntimeEvent, SupportedEntry, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';
 
 import { cloneEvent } from '../eventsManager';
 
 describe('cloneEvent()', () => {
   it('creates a stem from a given event', () => {
-    const original: OntimeEvent = {
+    const original = {
       id: 'unique',
-      type: SupportedEntry.Event,
+      type: SupportedEvent.Event,
       title: 'title',
       cue: 'cue',
       note: 'note',
@@ -14,10 +14,6 @@ describe('cloneEvent()', () => {
       duration: 10,
       timeEnd: 10,
       timerType: TimerType.CountDown,
-      timeStrategy: TimeStrategy.LockEnd,
-      parent: 'test',
-      linkStart: false,
-      countToEnd: false,
       endAction: EndAction.None,
       isPublic: false,
       skip: false,
@@ -25,40 +21,29 @@ describe('cloneEvent()', () => {
       revision: 10,
       timeWarning: 120000,
       timeDanger: 60000,
-      delay: 0,
-      dayOffset: 0,
-      gap: 0,
       custom: {
         lighting: '3',
-      } as EntryCustomFields,
-    };
+      } as EventCustomFields,
+    } as OntimeEvent;
 
     const cloned = cloneEvent(original);
     expect(cloned).not.toBe(original);
-    expect(cloned.custom).not.toBe(original.custom);
-
-    expect(cloned).toMatchObject({
-      type: SupportedEntry.Event,
-      title: original.title,
-      note: original.note,
-      timeStart: original.timeStart,
-      duration: original.duration,
-      timeEnd: original.timeEnd,
-      timerType: original.timerType,
-      timeStrategy: original.timeStrategy,
-      parent: 'test',
-      countToEnd: original.countToEnd,
-      linkStart: original.linkStart,
-      endAction: original.endAction,
-      isPublic: original.isPublic,
-      skip: original.skip,
-      colour: original.colour,
-      revision: 0,
-      delay: original.delay,
-      dayOffset: original.dayOffset,
-      gap: 0,
-      timeWarning: original.timeWarning,
-      timeDanger: original.timeDanger,
-    });
+    // @ts-expect-error -- safeguarding this
+    expect(cloned?.id).toBe(undefined);
+    expect(cloned.title).toBe(original.title);
+    expect(cloned.note).toBe(original.note);
+    expect(cloned.endAction).toBe(original.endAction);
+    expect(cloned.timerType).toBe(original.timerType);
+    expect(cloned.timeStart).toBe(original.timeStart);
+    expect(cloned.timeEnd).toBe(original.timeEnd);
+    expect(cloned.duration).toBe(original.duration);
+    expect(cloned.isPublic).toBe(original.isPublic);
+    expect(cloned.skip).toBe(original.skip);
+    expect(cloned.colour).toBe(original.colour);
+    expect(cloned.type).toBe(SupportedEvent.Event);
+    expect(cloned.revision).toBe(0);
+    expect(cloned.timeWarning).toBe(original.timeWarning);
+    expect(cloned.timeDanger).toBe(original.timeDanger);
+    expect(cloned.custom).toStrictEqual({});
   });
 });

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

@@ -1,7 +1,4 @@
-import { OffsetMode } from 'ontime-types';
-import { dayInMs } from 'ontime-utils';
-
-import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';
+import { formatTime, nowInMillis } from '../time';
 
 describe('nowInMillis()', () => {
   it('should return the current time in milliseconds', () => {
@@ -41,257 +38,3 @@ describe('formatTime()', () => {
     expect(time).toStrictEqual('-01:00');
   });
 });
-
-describe('calculateTimeUntilStart()', () => {
-  describe('Absolute offset mode', () => {
-    test('ontime', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 90,
-        offset: 0,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-    });
-
-    test('running behind', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 90,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
-    });
-
-    test('running ahead', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 80,
-        offset: 10,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-    });
-
-    test('running behind with enough gaps', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 20,
-        clock: 50,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: null,
-        plannedStart: null,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50); // <-- when gap is enough to compensate for the running behind
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-    });
-
-    test('running behind with too little gaps', () => {
-      const test = {
-        timeStart: 100,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 10,
-        clock: 50,
-        offset: -20,
-        offsetMode: OffsetMode.Absolute,
-        actualStart: 0,
-        plannedStart: 0,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60); // <-- when gap is not enough to compensate for the running behind it absorbs at much as possible
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-    });
-  });
-
-  describe('Relative offset mode', () => {
-    test('basic function', () => {
-      const test = {
-        timeStart: 0,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      const timeStartEvent2 = 10;
-      const timeStartEvent3 = 20;
-
-      //event 1 is the currently running event
-
-      //event 2
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(10);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(10);
-
-      //event 3
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(20);
-
-      // When clock advances by 5ms, time until start should decrease by 5ms
-      test.clock = 105;
-
-      //event 2
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: true })).toBe(5);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent2, isLinkedToLoaded: false })).toBe(5);
-
-      //event 3
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, timeStart: timeStartEvent3, isLinkedToLoaded: false })).toBe(15);
-    });
-
-    test('gaps', () => {
-      const test = {
-        timeStart: 20,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 10,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
-
-      // When clock advances by 5ms, time until start should decrease by 5ms
-      test.clock = 105;
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(15);
-    });
-
-    test('added/remove time', () => {
-      const test = {
-        timeStart: 20,
-        dayOffset: 0,
-        delay: 0,
-        currentDay: 0,
-        totalGap: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(20);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20);
-
-      test.offset = 5; // remove 5 with addtime - we are ahead of time
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(15);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // unlocked evets will stay on schedule
-
-      test.offset = -5; // add 5 with addtime - we are behind
-
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(25);
-      expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(25);
-    });
-
-    test('next day', () => {
-      const test = {
-        delay: 0,
-        currentDay: 0,
-        clock: 100,
-        actualStart: 100,
-        plannedStart: 0,
-        offset: 0,
-        offsetMode: OffsetMode.Relative,
-      };
-
-      // this event will start the current day
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 10,
-          dayOffset: 0,
-          totalGap: 0,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(10);
-
-      // this event will start the next day
-      // in absolute mode this would start in dayInMs - 100 since the gap would compensate
-      // but in relative mode with and actual start that is 100 offset it starts in dayInMs
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 0,
-          dayOffset: 1,
-          totalGap: dayInMs - 20,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(dayInMs);
-
-      // advancing 100ms
-      test.clock = 200;
-
-      expect(
-        calculateTimeUntilStart({
-          ...test,
-          timeStart: 0,
-          dayOffset: 1,
-          totalGap: dayInMs - 20,
-          isLinkedToLoaded: false,
-        }),
-      ).toBe(dayInMs - 100);
-    });
-  });
-
-  test('overlap with negative total gap', () => {
-    const test = {
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      clock: 100,
-      actualStart: 100,
-      plannedStart: 0,
-      offset: 0,
-      offsetMode: OffsetMode.Relative,
-      isLinkedToLoaded: false,
-    };
-
-    // the overlap will be pushed out to the expected available time
-    expect(calculateTimeUntilStart({ ...test, timeStart: 5, totalGap: -5 })).toBe(10);
-
-    test.clock = 105;
-  });
-});

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

@@ -64,13 +64,13 @@ describe('getRouteFromPreset()', () => {
   describe('handle url sharing edge cases', () => {
     it('finds the correct preset when the url contains extra arguments', () => {
       const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy();
-    });
+      expect(getRouteFromPreset(location, presets)?.startsWith('timer?user=guest&alias=demopage')).toBeTruthy()
+    })
 
     it('appends the feature params to the alias', () => {
       const location = resolvePath('/demopage?locked=true&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
-    });
+      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&locked=true&token=123')
+    })
   });
 });
 
@@ -83,26 +83,25 @@ describe('generatePathFromPreset()', () => {
   });
 
   test('appends the feature params to the alias', () => {
-    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe(
-      'timer?user=guest&alias=demopage&locked=true&token=123',
-    );
+    expect(generatePathFromPreset('timer?user=guest', 'demopage', 'true', '123')).toBe('timer?user=guest&alias=demopage&locked=true&token=123');
   });
 });
 
 describe('arePathsEquivalent()', () => {
-  it('checks whether the paths match', () => {
+  it("checks whether the paths match",  () => {
     expect(arePathsEquivalent('demopage', 'timer')).toBeFalsy();
     expect(arePathsEquivalent('timer', 'timer')).toBeTruthy();
     expect(arePathsEquivalent('timer?user=guest', 'timer?user=guest')).toBeTruthy();
-  });
+  })
 
-  it('checks whether the params match', () => {
+  it("checks whether the params match",  () => {
     expect(arePathsEquivalent('timer?test=a', 'timer?test=b')).toBeFalsy();
     expect(arePathsEquivalent('timer?test=a', 'timer?test=a')).toBeTruthy();
-  });
+  })
 
-  it('considers edge cases for the url sharing feature', () => {
+  it("considers edge cases for the url sharing feature",  () => {
     expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=b')).toBeFalsy();
     expect(arePathsEquivalent('timer?test=a&locked=true=token=123', 'timer?test=a')).toBeTruthy();
-  });
+  })
 });
+

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

@@ -1,31 +0,0 @@
-import { stringify } from 'csv-stringify/browser/esm/sync';
-import { OntimeEntry, ProjectRundowns } from 'ontime-types';
-
-/**
- * Converts an array of arrays to a CSV file
- */
-export function makeCSVFromArrayOfArrays(arrayOfArrays: string[][]): string {
-  return stringify(arrayOfArrays);
-}
-
-/**
- * Receives an object of rundowns, and flattens them into a single, linear rundown
- * Used for CSV export
- */
-export function aggregateRundowns(rundowns: ProjectRundowns): OntimeEntry[] {
-  const rundownKeys = Object.keys(rundowns);
-  if (rundownKeys.length === 0) return [];
-  const flatRundown: OntimeEntry[] = [];
-
-  for (const key of rundownKeys) {
-    const { order, entries } = rundowns[key];
-
-    for (let i = 0; i < order.length; i++) {
-      const entryId = order[i];
-      const entry = entries[entryId];
-
-      flatRundown.push(entry);
-    }
-  }
-  return flatRundown;
-}

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

@@ -1,4 +1,4 @@
-import { OntimeEvent, SupportedEntry } from 'ontime-types';
+import { OntimeEvent, SupportedEvent } from 'ontime-types';
 
 /**
  * @description Creates a safe duplicate of an event
@@ -9,7 +9,7 @@ import { OntimeEvent, SupportedEntry } from 'ontime-types';
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
 export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
   return {
-    type: SupportedEntry.Event,
+    type: SupportedEvent.Event,
     title: event.title,
     note: event.note,
     timeStart: event.timeStart,
@@ -23,13 +23,12 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
     isPublic: event.isPublic,
     skip: event.skip,
     colour: event.colour,
-    parent: event.parent,
     revision: 0,
-    delay: event.delay, // the events will be collocated, so having the same metadata is a good start
-    dayOffset: event.dayOffset,
+    delay: 0,
+    dayOffset: 0,
     gap: 0,
     timeWarning: event.timeWarning,
     timeDanger: event.timeDanger,
-    custom: { ...event.custom },
+    custom: {},
   };
 };

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

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

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

@@ -6,6 +6,7 @@ import { baseURI, serverURL } from '../../externals';
  * Open an external URLs: specifically for a electron / browser case
  * If electron: ask main process to call a new browser window
  * If browser: open in new tab
+ * @param url
  */
 export function openLink(url: string) {
   if (window.process?.type === 'renderer') {

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

@@ -1,8 +0,0 @@
-import { MaybeString } from 'ontime-types';
-
-export default function safeParseNumber(value: MaybeString, defaultValue: number = 0): number {
-  if (!value) return defaultValue;
-  const number = Number(value);
-  if (isNaN(number)) return defaultValue;
-  return number;
-}

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

@@ -1,7 +1,7 @@
-import { Log, Rundown, RuntimeStore } from 'ontime-types';
+import { Log, RundownCached, RuntimeStore } from 'ontime-types';
 
 import { isProduction, websocketUrl } from '../../externals';
-import { CLIENT_LIST, CUSTOM_FIELDS, REPORT, RUNDOWN, RUNTIME } from '../api/constants';
+import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
 import { invalidateAllCaches } from '../api/utils';
 import { ontimeQueryClient } from '../queryClient';
 import {
@@ -14,12 +14,13 @@ import {
 } from '../stores/clientStore';
 import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { addToBatchUpdates, flushBatchUpdates, patchRuntime, patchRuntimeProperty } from '../stores/runtime';
 
-let websocket: WebSocket | null = null;
+export let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
 const reconnectInterval = 1000;
 
+export let shouldReconnect = true;
 export let hasConnected = false;
 export let reconnectAttempts = 0;
 
@@ -33,32 +34,27 @@ export const connectSocket = () => {
     hasConnected = true;
     reconnectAttempts = 0;
 
-    socketSendJson('set-client-patch', {
-      type: 'ontime',
-      origin: window.location.origin,
-      path: window.location.pathname + window.location.search,
-    });
-    setOnlineStatus(true);
-
     if (preferredClientName) {
       socketSendJson('set-client-name', preferredClientName);
     }
+
+    socketSendJson('set-client-type', 'ontime');
+    setOnlineStatus(true);
   };
 
   websocket.onclose = () => {
     console.warn('WebSocket disconnected');
+    setOnlineStatus(false);
 
-    // we decide to allows reconnect
-    reconnectTimeout = setTimeout(() => {
-      if (reconnectAttempts > 2) {
-        setOnlineStatus(false);
-      }
-      console.warn('WebSocket: attempting reconnect');
-      if (websocket && websocket.readyState === WebSocket.CLOSED) {
-        reconnectAttempts += 1;
-        connectSocket();
-      }
-    }, reconnectInterval);
+    if (shouldReconnect) {
+      reconnectTimeout = setTimeout(() => {
+        console.warn('WebSocket: attempting reconnect');
+        if (websocket && websocket.readyState === WebSocket.CLOSED) {
+          reconnectAttempts += 1;
+          connectSocket();
+        }
+      }, reconnectInterval);
+    }
   };
 
   websocket.onerror = (error) => {
@@ -82,14 +78,16 @@ export const connectSocket = () => {
           updateDevTools({ ping: offset });
           break;
         }
-        case 'client': {
-          if (typeof payload === 'object' || payload !== null) {
-            if (payload.clientId && payload.clientName) {
-              setClientId(payload.clientId);
-              if (!preferredClientName) {
-                setClientName(payload.clientName);
-              }
-            }
+        case 'client-id': {
+          if (typeof payload === 'string') {
+            setClientId(payload);
+          }
+          break;
+        }
+
+        case 'client-name': {
+          if (typeof payload === 'string') {
+            setClientName(payload);
           }
           break;
         }
@@ -141,31 +139,76 @@ export const connectSocket = () => {
           updateDevTools(serverPayload);
           break;
         }
-        case 'ontime-patch': {
-          const patch = payload as Partial<RuntimeStore>;
-          patchRuntime(patch);
-          updateDevTools(patch);
+        case 'ontime-clock': {
+          addToBatchUpdates('clock', payload);
+          updateDevTools({ clock: payload });
+          break;
+        }
+        case 'ontime-timer': {
+          addToBatchUpdates('timer', payload);
+          updateDevTools({ timer: payload });
+          break;
+        }
+        case 'ontime-onAir': {
+          addToBatchUpdates('onAir', payload);
+          updateDevTools({ onAir: payload });
+          break;
+        }
+        case 'ontime-message': {
+          addToBatchUpdates('message', payload);
+          updateDevTools({ message: payload });
+          break;
+        }
+        case 'ontime-runtime': {
+          addToBatchUpdates('runtime', payload);
+          updateDevTools({ runtime: payload });
+          break;
+        }
+        case 'ontime-eventNow': {
+          addToBatchUpdates('eventNow', payload);
+          updateDevTools({ eventNow: payload });
+          break;
+        }
+        case 'ontime-currentBlock': {
+          addToBatchUpdates('currentBlock', payload);
+          updateDevTools({ currentBlock: payload });
+          break;
+        }
+        case 'ontime-publicEventNow': {
+          addToBatchUpdates('publicEventNow', payload);
+          updateDevTools({ publicEventNow: payload });
+          break;
+        }
+        case 'ontime-eventNext': {
+          addToBatchUpdates('eventNext', payload);
+          updateDevTools({ eventNext: payload });
+          break;
+        }
+        case 'ontime-publicEventNext': {
+          addToBatchUpdates('publicEventNext', payload);
+          updateDevTools({ publicEventNext: payload });
+          break;
+        }
+        case 'ontime-auxtimer1': {
+          addToBatchUpdates('auxtimer1', payload);
+          updateDevTools({ auxtimer1: payload });
           break;
         }
         case 'ontime-refetch': {
           // the refetch message signals that the rundown has changed in the server side
-          const { reload, target } = payload;
+          const { revision, reload } = payload;
+          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;
+
           if (reload) {
             invalidateAllCaches();
-          } else if (target === 'RUNDOWN') {
-            const { revision } = payload;
-            const currentRevision = ontimeQueryClient.getQueryData<Rundown>(RUNDOWN)?.revision ?? -1;
-            if (revision > currentRevision) {
-              ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
-              ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
-            }
-          } else if (target === 'REPORT') {
-            ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
+          } else if (revision > currentRevision) {
+            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
+            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
           }
           break;
         }
-        default: {
-          console.log('unknown WS message', type);
+        case 'ontime-flush': {
+          flushBatchUpdates()
           break;
         }
       }
@@ -175,6 +218,11 @@ export const connectSocket = () => {
   };
 };
 
+export const disconnectSocket = () => {
+  shouldReconnect = false;
+  websocket?.close();
+};
+
 export const socketSend = (message: any) => {
   if (websocket && websocket.readyState === WebSocket.OPEN) {
     websocket.send(message);

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

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

apps/client/src/declarations/test.d.ts

@@ -0,0 +1,11 @@
+import { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';
+
+import 'vitest';
+
+// ugly hack because vite and pnpm are not playing ball with jest
+// https://github.com/testing-library/jest-dom/issues/123
+declare global {
+  namespace Vi {
+    type Assertion<T = any> = TestingLibraryMatchers<T, void>;
+  }
+}

apps/client/src/externals.ts

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

apps/client/src/features/app-settings/panel-content/PanelContent.tsx

@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
-import { IoClose } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoClose } from '@react-icons/all-files/io5/IoClose';
 
 import style from './PanelContent.module.scss';
 

apps/client/src/features/app-settings/panel-utils/PanelUtils.module.scss

@@ -183,7 +183,7 @@ $inner-padding: 1rem;
   color: $muted-gray;
 
   td {
-    padding-block: 5rem;
+    padding-block: 1rem;
   }
 
   button {
@@ -207,9 +207,6 @@ $inner-padding: 1rem;
   &.end {
     justify-content: flex-end;
   }
-  &.apart {
-    justify-content: space-between;
-  }
 }
 
 @keyframes animloader {

apps/client/src/features/app-settings/panel-utils/PanelUtils.tsx

@@ -1,6 +1,6 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 
 import { cx } from '../../../common/utils/styleUtils';
 
@@ -67,17 +67,9 @@ export function TableEmpty({ label, handleClick }: { label?: string; handleClick
     <tr className={style.empty}>
       <td colSpan={99}>
         <div>{label ?? 'No data yet'}</div>
-        {handleClick && (
-          <Button
-            onClick={handleClick}
-            isDisabled={!handleClick}
-            variant='ontime-filled'
-            rightIcon={<IoAdd />}
-            size='sm'
-          >
-            New
-          </Button>
-        )}
+        <Button onClick={handleClick} isDisabled={!handleClick} variant='ontime-filled' rightIcon={<IoAdd />} size='sm'>
+          New
+        </Button>
       </td>
     </tr>
   );
@@ -113,8 +105,8 @@ export function BlockQuote({ children }: { children: ReactNode }) {
   return <blockquote className={style.blockquote}>{children}</blockquote>;
 }
 
-export function Error({ children, className }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
-  return <div className={cx([style.fieldError, className])}>{children}</div>;
+export function Error({ children }: { children: ReactNode }) {
+  return <div className={style.fieldError}>{children}</div>;
 }
 
 export function Divider() {
@@ -136,7 +128,7 @@ type AllowedInlineTags = 'div' | 'td';
 type InlineProps<C extends AllowedInlineTags> = {
   as?: C;
   relation?: 'inner' | 'component' | 'section';
-  align?: 'start' | 'end' | 'apart';
+  align?: 'start' | 'end';
   className?: string;
 };
 

apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx

@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import {
   buyMeACoffeeUrl,
   discordUrl,

apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx

@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
 import { appVersion } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

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

@@ -27,8 +27,7 @@
 .titleSection,
 .filterSection,
 .oscSection,
-.httpSection,
-.actionSection {
+.httpSection {
   display: grid;
   grid-gap: 0.5rem;
 
@@ -41,10 +40,8 @@
 .ruleSection,
 .filterSection,
 .oscSection,
-.httpSection,
-.actionSection {
-  label,
-  div {
+.httpSection {
+  label, div {
     // we use the div as non-interactive placeholder for button cells
     // it needs to match the size of the label element
     font-size: calc(1rem - 3px);
@@ -54,6 +51,7 @@
   }
 }
 
+
 .titleSection {
   grid-template-columns: 1fr;
 }
@@ -70,14 +68,6 @@
   grid-template-columns: 1fr auto;
 }
 
-.actionSection {
-  grid-template-columns: auto 1fr 1fr auto;
-
-  .test {
-    grid-column: -1;
-  }
-}
-
 .outputCard {
   border-left: 0.25rem solid $gray-1200;
   padding-left: 0.5rem;

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

@@ -1,22 +1,23 @@
 import { useEffect, useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoTrash } from 'react-icons/io5';
-import { Button, IconButton, Input, Radio, RadioGroup, Select } from '@chakra-ui/react';
 import {
-  Automation,
-  AutomationDTO,
-  HTTPOutput,
-  isHTTPOutput,
-  isOntimeAction,
-  isOSCOutput,
-  OntimeAction,
-  OSCOutput,
-} from 'ontime-types';
+  Alert,
+  AlertDescription,
+  AlertIcon,
+  Button,
+  IconButton,
+  Input,
+  Radio,
+  RadioGroup,
+  Select,
+} from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { Automation, AutomationDTO, HTTPOutput, isHTTPOutput, isOSCOutput, OSCOutput } from 'ontime-types';
 
 import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
@@ -26,11 +27,10 @@ import * as Panel from '../../panel-utils/PanelUtils';
 
 import TemplateInput from './template-input/TemplateInput';
 import { isAutomation, makeFieldList } from './automationUtils';
-import OntimeActionForm from './OntimeActionForm';
 
 import style from './AutomationForm.module.scss';
 
-const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';
+const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';
 
 interface AutomationFormProps {
   automation: Automation | AutomationDTO;
@@ -51,7 +51,6 @@ export default function AutomationForm(props: AutomationFormProps) {
     register,
     setError,
     setFocus,
-    setValue,
     formState: { errors, isSubmitting, isDirty, isValid },
   } = useForm<AutomationDTO>({
     mode: 'onChange',
@@ -102,11 +101,6 @@ export default function AutomationForm(props: AutomationFormProps) {
     appendOutput({ type: 'http', url: '' });
   };
 
-  const handleAddnewOntimeAction = () => {
-    // @ts-expect-error -- we dont want to choose an action
-    appendOutput({ type: 'ontime', action: undefined });
-  };
-
   const handleTestOSCOutput = async (index: number) => {
     try {
       const values = getValues(`outputs.${index}`) as OSCOutput;
@@ -140,19 +134,6 @@ export default function AutomationForm(props: AutomationFormProps) {
     }
   };
 
-  const handleTestOntimeAction = async (index: number) => {
-    try {
-      const values = getValues(`outputs.${index}`) as OntimeAction;
-      // NOTE: there is no meaningful validation to do here, we let the server deal with the data
-      await testOutput({
-        ...values,
-        type: 'ontime',
-      });
-    } catch (_error) {
-      /** we dont handle errors here */
-    }
-  };
-
   const onSubmit = async (values: AutomationDTO) => {
     if (isAutomation(automation)) {
       await handleEdit(automation.id, { id: automation.id, ...values });
@@ -209,7 +190,7 @@ export default function AutomationForm(props: AutomationFormProps) {
       </div>
 
       <div className={style.innerSection}>
-        <h3>Filters (optional)</h3>
+        <h3>Filters</h3>
         <div className={style.ruleSection}>
           <label>
             Trigger outputs if
@@ -224,80 +205,74 @@ export default function AutomationForm(props: AutomationFormProps) {
               )}
             />
           </label>
-          {fieldFilters.map((field, index) => {
-            const key = `filters.${index}.field.${field.id}`;
-            return (
-              <div key={key} className={style.filterSection}>
-                <label>
-                  Runtime data source
-                  <Select
-                    {...register(`filters.${index}.field`, { required: { value: true, message: 'Required field' } })}
-                    size='sm'
-                    variant='ontime'
-                  >
-                    <option selected hidden disabled value=''>
-                      Event field
+          {fieldFilters.map((field, index) => (
+            <div key={field.id} className={style.filterSection}>
+              <label>
+                Runtime data source
+                <Select
+                  {...register(`filters.${index}.field`, { required: { value: true, message: 'Required field' } })}
+                  size='sm'
+                  variant='ontime'
+                >
+                  <option selected hidden disabled value=''>
+                    Event field
+                  </option>
+                  {fieldList.map(({ value, label }) => (
+                    <option key={value} value={value}>
+                      {label}
                     </option>
-                    {fieldList.map(({ value, label }, localIndex) => {
-                      const key = `filters.${index}.field.${localIndex}`;
-                      return (
-                        <option key={key} value={value}>
-                          {label}
-                        </option>
-                      );
-                    })}
-                  </Select>
-                  <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
-                </label>
-                <label>
-                  Matching condition
-                  <Select
-                    {...register(`filters.${index}.operator`, { required: { value: true, message: 'Required field' } })}
-                    size='sm'
-                    variant='ontime'
-                  >
-                    <option selected hidden disabled value=''>
-                      Operator
-                    </option>
-                    <option value='equals'>equals</option>
-                    <option value='not_equals'>not equals</option>
-                    <option value='contains'>contains</option>
-                    {/* 
+                  ))}
+                </Select>
+                <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
+              </label>
+              <label>
+                Matching condition
+                <Select
+                  {...register(`filters.${index}.operator`, { required: { value: true, message: 'Required field' } })}
+                  size='sm'
+                  variant='ontime'
+                >
+                  <option selected hidden disabled value=''>
+                    Operator
+                  </option>
+                  <option value='equals'>equals</option>
+                  <option value='not_equals'>not equals</option>
+                  <option value='contains'>contains</option>
+                  {/* 
                   We dont currently offer a data source where these operators would make sense
                   <option value='greater_than'>greater than</option>
                   <option value='less_than'>less than</option> 
                   */}
-                  </Select>
-                  <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
-                </label>
-                <label>
-                  Value to match
-                  <Input
-                    {...register(`filters.${index}.value`)}
-                    variant='ontime-filled'
-                    size='sm'
-                    placeholder='<empty / no value>'
-                    autoComplete='off'
-                  />
-                </label>
+                </Select>
+                <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
+              </label>
+              <label>
+                Value to match
+                <Input
+                  {...register(`filters.${index}.value`)}
+                  variant='ontime-filled'
+                  size='sm'
+                  placeholder='<empty / no value>'
+                  autoComplete='off'
+                />
+              </label>
+              <div>
+                <span>&nbsp;</span>
                 <div>
-                  <span>&nbsp;</span>
-                  <div>
-                    <IconButton
-                      aria-label='Delete'
-                      icon={<IoTrash />}
-                      variant='ontime-ghosted'
-                      size='sm'
-                      color='#FA5656' // $red-500
-                      onClick={() => removeFilter(index)}
-                      isDisabled={false}
-                      isLoading={false}
-                    />
-                  </div>
+                  <IconButton
+                    aria-label='Delete'
+                    icon={<IoTrash />}
+                    variant='ontime-ghosted'
+                    size='sm'
+                    color='#FA5656' // $red-500
+                    onClick={() => removeFilter(index)}
+                    isDisabled={false}
+                    isLoading={false}
+                  />
                 </div>
               </div>
-            );
-          })}
+            </div>
+          ))}
           <div>
             <Button
               variant='ontime-subtle'
@@ -316,10 +291,13 @@ export default function AutomationForm(props: AutomationFormProps) {
 
       <div className={style.innerColumn}>
         <h3>Outputs</h3>
-        <Info>
-          Automation outputs can be used to send data from Ontime to external software.
-          <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
-        </Info>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            Automation outputs can be used to send data from Ontime to external software.
+            <ExternalLink href={integrationsDocsUrl}>See the documentation for templates</ExternalLink>
+          </AlertDescription>
+        </Alert>
 
         {fieldOutputs.map((output, index) => {
           if (isOSCOutput(output)) {
@@ -379,13 +357,13 @@ export default function AutomationForm(props: AutomationFormProps) {
                     <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
                   </label>
                   <label>
-                    Arguments
+                    Parameters
                     <TemplateInput
                       {...register(`outputs.${index}.args`)}
-                      value={output.args}
                       variant='ontime-filled'
                       size='sm'
                       placeholder='1'
+                      autoComplete='off'
                     />
                     <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                   </label>
@@ -402,6 +380,8 @@ export default function AutomationForm(props: AutomationFormProps) {
                         size='sm'
                         onClick={() => removeOutput(index)}
                         color='#FA5656' // $red-500
+                        isDisabled={false}
+                        isLoading={false}
                       />
                     </Panel.InlineElements>
                   </div>
@@ -449,6 +429,8 @@ export default function AutomationForm(props: AutomationFormProps) {
                         size='sm'
                         onClick={() => removeOutput(index)}
                         color='#FA5656' // $red-500
+                        isDisabled={false}
+                        isLoading={false}
                       />
                     </Panel.InlineElements>
                   </div>
@@ -456,59 +438,30 @@ export default function AutomationForm(props: AutomationFormProps) {
               </div>
             );
           }
-
-          if (isOntimeAction(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  action?: { message?: string };
-                  time?: { message?: string };
-                  text?: { message?: string };
-                  visible?: { message?: string };
-                  secondarySource?: { message?: string };
-                }
-              | undefined;
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>Ontime action</Tag>
-                <OntimeActionForm
-                  value={output.action}
-                  index={index}
-                  register={register}
-                  rowErrors={rowErrors}
-                  setValue={setValue}
-                >
-                  <span>&nbsp;</span>
-                  <Panel.InlineElements relation='inner'>
-                    <Button size='sm' variant='ontime-ghosted-white' onClick={() => handleTestOntimeAction(index)}>
-                      Test
-                    </Button>
-                    <IconButton
-                      aria-label='Delete'
-                      icon={<IoTrash />}
-                      variant='ontime-ghosted'
-                      size='sm'
-                      onClick={() => removeOutput(index)}
-                      color='#FA5656' // $red-500
-                    />
-                  </Panel.InlineElements>
-                </OntimeActionForm>
-              </div>
-            );
-          }
-
           // there should be no other output types
           return null;
         })}
         <Panel.InlineElements relation='inner'>
-          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddNewOSCOutput}>
+          <Button
+            variant='ontime-subtle'
+            rightIcon={<IoAdd />}
+            size='sm'
+            onClick={handleAddNewOSCOutput}
+            isDisabled={false}
+            isLoading={false}
+          >
             OSC
           </Button>
-          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddNewHTTPOutput}>
+          <Button
+            variant='ontime-subtle'
+            rightIcon={<IoAdd />}
+            size='sm'
+            onClick={handleAddNewHTTPOutput}
+            isDisabled={false}
+            isLoading={false}
+          >
             HTTP
           </Button>
-          <Button variant='ontime-subtle' rightIcon={<IoAdd />} size='sm' onClick={handleAddnewOntimeAction}>
-            Ontime action
-          </Button>
         </Panel.InlineElements>
       </div>
 

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

@@ -1,13 +1,11 @@
 import { Controller, useForm } from 'react-hook-form';
-import { Button, Input, Switch } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button, Input, Switch } from '@chakra-ui/react';
 
 import { editAutomationSettings } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
-import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 
 const oscApiDocsUrl = 'https://docs.getontime.no/api/protocols/osc/';
@@ -77,13 +75,14 @@ export default function AutomationSettingsForm(props: AutomationSettingsProps) {
       <Panel.Divider />
 
       <Panel.Section>
-        <Info>
-          <p>Control Ontime and share its data with external systems in your workflow.</p>
-          <p>- Automations allow Ontime to send its data on lifecycle triggers.</p>
-          <p>- OSC Input tells Ontime to listen to messages on the specific port.</p>
-          <br />
-          <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
-        </Info>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            Control Ontime and share its data with external systems in your workflow. <br />
+            - Automations allow Ontime to send its data on lifecycle triggers. <br />- OSC Input tells Ontime to listen
+            to messages on the specific port. <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
+          </AlertDescription>
+        </Alert>
       </Panel.Section>
 
       <Panel.Section
@@ -113,9 +112,7 @@ export default function AutomationSettingsForm(props: AutomationSettingsProps) {
         </Panel.ListGroup>
 
         <Panel.Title>OSC Input</Panel.Title>
-
         <Panel.ListGroup>
-          {isOntimeCloud && <Info>For security reasons OSC integrations are not available in the cloud service.</Info>}
           <Panel.ListItem>
             <Panel.Field
               title='OSC input'

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

@@ -1,6 +1,8 @@
 import { Fragment, useState } from 'react';
-import { IoAdd, IoPencil, IoTrash } from 'react-icons/io5';
 import { Button, IconButton } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { AutomationDTO, NormalisedAutomation } from 'ontime-types';
 
 import { deleteAutomation } from '../../../../common/api/automation';

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

@@ -1,110 +0,0 @@
-import { PropsWithChildren, useState } from 'react';
-import { UseFormRegister, UseFormSetValue } from 'react-hook-form';
-import { Input, Select } from '@chakra-ui/react';
-import { AutomationDTO, OntimeAction } from 'ontime-types';
-
-import { cx } from '../../../../common/utils/styleUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import style from './AutomationForm.module.scss';
-
-interface OntimeActionFormProps {
-  index: number;
-  register: UseFormRegister<AutomationDTO>;
-  rowErrors?: {
-    action?: { message?: string };
-    time?: { message?: string };
-    text?: { message?: string };
-    visible?: { message?: string };
-    secondarySource?: { message?: string };
-  };
-  value: OntimeAction['action'];
-  setValue: UseFormSetValue<AutomationDTO>;
-}
-
-export default function OntimeActionForm(props: PropsWithChildren<OntimeActionFormProps>) {
-  const { index, register, setValue, rowErrors, value, children } = props;
-  const [selectedAction, setSelectedAction] = useState<OntimeAction['action']>(value || 'aux-start');
-
-  const updateSelectedAction = (value: string) => {
-    setSelectedAction(value as OntimeAction['action']);
-    setValue(`outputs.${index}.action`, value as OntimeAction['action']);
-  };
-
-  return (
-    <div className={cx([style.actionSection, selectedAction && style[selectedAction]])}>
-      <input type='hidden' {...register(`outputs.${index}.action`)} value={selectedAction} />
-      <label>
-        Action
-        <Select
-          variant='ontime'
-          size='sm'
-          value={selectedAction}
-          onChange={(event) => updateSelectedAction(event.target.value)}
-        >
-          <option value='aux-start'>Auxiliary timer: start</option>
-          <option value='aux-pause'>Auxiliary timer: pause</option>
-          <option value='aux-stop'>Auxiliary timer: stop</option>
-          <option value='aux-set'>Auxiliary timer: set</option>
-          <option value='message-set'>Timer: timer message</option>
-          <option value='message-secondary'>Timer: timer secondary</option>
-        </Select>
-        <Panel.Error>{rowErrors?.action?.message}</Panel.Error>
-      </label>
-
-      {selectedAction === 'aux-set' && (
-        <label>
-          New time
-          <Input
-            {...register(`outputs.${index}.time`, {
-              required: { value: true, message: 'Required field' },
-            })}
-            variant='ontime-filled'
-            size='sm'
-            placeholder='eg: 10m5s'
-            autoComplete='off'
-          />
-          <Panel.Error>{rowErrors?.time?.message}</Panel.Error>
-        </label>
-      )}
-
-      {selectedAction === 'message-set' && (
-        <>
-          <label>
-            Text (leave empty for no change)
-            <Input
-              {...register(`outputs.${index}.text`)}
-              variant='ontime-filled'
-              size='sm'
-              placeholder='eg: Timer is finished'
-              autoComplete='off'
-            />
-            <Panel.Error>{rowErrors?.text?.message}</Panel.Error>
-          </label>
-          <label>
-            Visibility
-            <Select variant='ontime' size='sm' {...register(`outputs.${index}.visible`)}>
-              <option value=''>Untouched</option>
-              <option value='true'>Show</option>
-              <option value='false'>Hide</option>
-            </Select>
-            <Panel.Error>{rowErrors?.visible?.message}</Panel.Error>
-          </label>
-        </>
-      )}
-
-      {selectedAction === 'message-secondary' && (
-        <label>
-          Timer secondary source
-          <Select variant='ontime' size='sm' {...register(`outputs.${index}.secondarySource`)}>
-            <option value='aux'>Auxiliary timer</option>
-            <option value='external'>External</option>
-            <option value='null'>None</option>
-          </Select>
-          <Panel.Error>{rowErrors?.secondarySource?.message}</Panel.Error>
-        </label>
-      )}
-      <div className={style.test}>{children}</div>
-    </div>
-  );
-}

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

@@ -1,6 +1,6 @@
 import { Fragment, useMemo, useState } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { NormalisedAutomation, Trigger } from 'ontime-types';
 
 import { deleteTrigger } from '../../../../common/api/automation';
@@ -82,7 +82,7 @@ export default function TriggersList(props: TriggersListProps) {
           <tbody>
             {!showForm && triggers.length === 0 && (
               <Panel.TableEmpty
-                label='Create an automation to attach triggers to'
+                label='Create an automation before to attach triggers to'
                 handleClick={canAdd ? () => setShowForm(true) : undefined}
               />
             )}

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

@@ -1,6 +1,8 @@
 import { useState } from 'react';
-import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { IoWarningOutline } from '@react-icons/all-files/io5/IoWarningOutline';
 import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';
 
 import Tag from '../../../../common/components/tag/Tag';

apps/client/src/features/app-settings/panel/automations-panel/template-input/TemplateInput.tsx

@@ -1,6 +1,6 @@
-import { forwardRef, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { type InputProps, Input } from '@chakra-ui/react';
-import { mergeRefs, useClickOutside } from '@mantine/hooks';
+import { useClickOutside } from '@mantine/hooks';
 
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 
@@ -10,10 +10,10 @@ import style from './TemplateInput.module.scss';
 
 interface TemplateInputProps extends InputProps {}
 
-const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProps, ref) {
+export default function TemplateInput(props: TemplateInputProps) {
   const { value, onChange, ...rest } = props;
   const { data } = useCustomFields();
-  const localRef = useClickOutside(() => setShowSuggestions(false));
+  const ref = useClickOutside(() => setShowSuggestions(false));
 
   const autocompleteList = useMemo(() => {
     return makeAutoCompleteList(data);
@@ -31,13 +31,15 @@ const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProp
   const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setInputValue(event.target.value);
 
-    if (event.target.value.endsWith('{')) {
+    if (event.target.value.endsWith('{{')) {
       setShowSuggestions(true);
-      setSuggestions(updateSuggestions(event.target.value));
     } else if (event.target.value === '' || event.target.value.endsWith('}}')) {
       setShowSuggestions(false);
-    } else if (showSuggestions) {
-      setSuggestions(updateSuggestions(event.target.value));
+    }
+
+    if (showSuggestions) {
+      const suggestions = updateSuggestions(event.target.value);
+      setSuggestions(suggestions);
     }
 
     onChange?.(event);
@@ -52,8 +54,8 @@ const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProp
   };
 
   return (
-    <div className={style.wrapper} ref={mergeRefs(localRef, ref)}>
-      <Input value={inputValue} {...rest} onChange={handleInputChange} autoComplete='off' autoCorrect='off' />
+    <div className={style.wrapper} ref={ref}>
+      <Input {...rest} value={inputValue} onChange={handleInputChange} autoComplete='off' autoCorrect='off' />
       {showSuggestions && suggestions.length > 0 && (
         <ul className={style.suggestions}>
           {suggestions.map((suggestion) => (
@@ -65,6 +67,4 @@ const TemplateInput = forwardRef(function TemplateInput(props: TemplateInputProp
       )}
     </div>
   );
-});
-
-export default TemplateInput;
+}

apps/client/src/features/app-settings/panel/automations-panel/template-input/__tests__/templateInput.utils.test.ts

@@ -6,8 +6,10 @@ describe('matchRemaining()', () => {
     expect(matchRemaining('{{{hum', '{{human}}')).toBe('an}}');
     expect(matchRemaining('send {', '{{human}}')).toBe('{human}}');
 
-    expect(matchRemaining('{', '{{human}}')).toBe('{human}}');
-    expect(matchRemaining('{{', '{{human}}')).toBe('human}}');
+    // we should be able to match the following
+    // however, the current implementation only needs to deal with strings that start with {{
+    // expect(matchRemaining('{', '{{human}}')).toBe('{human}}');
+    // expect(matchRemaining('{{', '{{human}}')).toBe('human}}');
   });
 
   it('should return an empty string if there are no matches or if it is complete', () => {

apps/client/src/features/app-settings/panel/automations-panel/template-input/templateInput.utils.ts

@@ -83,16 +83,6 @@ export function matchRemaining(a: string, b: string) {
     return '';
   }
 
-  // naive match assuming that a template will start with {{
-  if (a.endsWith('{{') && b.startsWith('{{')) {
-    return b.substring(2);
-  }
-
-  // naive match assuming that a template will start with {
-  if (a.endsWith('{') && b.startsWith('{{')) {
-    return b.substring(1);
-  }
-
   for (let i = 0; i < b.length; i++) {
     const searchString = b.substring(0, i + 1);
     if (a.endsWith(searchString)) {

apps/client/src/features/app-settings/panel/client-control-panel/ClientList.tsx

@@ -1,6 +1,5 @@
 import { useState } from 'react';
 import { Badge, Button, useDisclosure } from '@chakra-ui/react';
-import { Client } from 'ontime-types';
 
 import { RedirectClientModal } from '../../../../common/components/client-modal/RedirectClientModal';
 import { RenameClientModal } from '../../../../common/components/client-modal/RenameClientModal';
@@ -32,16 +31,15 @@ export default function ClientList() {
   const ontimeClients = Object.entries(clients).filter(([_, { type }]) => type === 'ontime');
   const otherClients = Object.entries(clients).filter(([_, { type }]) => type !== 'ontime');
 
-  const targetClient: Client | undefined = clients[targetId];
+  const targetClient = clients[targetId];
 
   return (
     <>
-      {isOpenRedirect && targetClient !== undefined && (
+      {isOpenRedirect && (
         <RedirectClientModal
           id={targetId}
-          name={targetClient.name}
-          origin={targetClient.origin}
-          currentPath={targetClient.path}
+          name={targetClient?.name}
+          path={targetClient?.path}
           isOpen={isOpenRedirect}
           onClose={onCloseRedirect}
         />
@@ -54,7 +52,7 @@ export default function ClientList() {
         <Panel.Table>
           <thead>
             <tr>
-              <td className={style.halfWidth}>Client Name</td>
+              <td className={style.halfWidth}>Client Name (Connection ID)</td>
               <td className={style.fullWidth}>Path</td>
               <td />
             </tr>
@@ -66,6 +64,9 @@ export default function ClientList() {
               return (
                 <tr key={key}>
                   <Panel.InlineElements relation='inner' as='td'>
+                    <Badge variant='outline' size='xs'>
+                      {key}
+                    </Badge>
                     {isCurrent && (
                       <Badge variant='outline' colorScheme='yellow' size='xs'>
                         self
@@ -118,7 +119,7 @@ export default function ClientList() {
         <Panel.Table>
           <thead>
             <tr>
-              <td className={style.halfWidthNoWrap}>Client Name</td>
+              <td className={style.halfWidthNoWrap}>Client Name (Connection ID)</td>
               <td className={style.halfWidthNoWrap}>Client type</td>
             </tr>
           </thead>
@@ -128,7 +129,12 @@ export default function ClientList() {
 
               return (
                 <tr key={key}>
-                  <td>{name}</td>
+                  <Panel.InlineElements relation='inner' as='td'>
+                    <Badge variant='outline' size='sx'>
+                      {key}
+                    </Badge>
+                    {name}
+                  </Panel.InlineElements>
                   <td>{type}</td>
                 </tr>
               );

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

@@ -3,13 +3,11 @@ import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 
 import CustomFields from './custom-fields/CustomFields';
-import ReportSettings from './ReportSettings';
 import UrlPresetsForm from './UrlPresetsForm';
 
 export default function FeatureSettingsPanel({ location }: PanelBaseProps) {
   const customFieldsRef = useScrollIntoView<HTMLDivElement>('custom', location);
   const urlPresetsRef = useScrollIntoView<HTMLDivElement>('urlpresets', location);
-  const reportRef = useScrollIntoView<HTMLDivElement>('report', location);
 
   return (
     <>
@@ -21,10 +19,6 @@ export default function FeatureSettingsPanel({ location }: PanelBaseProps) {
       <div ref={urlPresetsRef}>
         <UrlPresetsForm />
       </div>
-
-      <div ref={reportRef}>
-        <ReportSettings />
-      </div>
     </>
   );
 }

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

@@ -1,7 +0,0 @@
-th.over {
-  color: $ontime-delay-text;
-}
-
-th.under {
-  color: $playback-ahead;
-}

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

@@ -1,113 +0,0 @@
-import { useMemo } from 'react';
-import { IoTrashBin } from 'react-icons/io5';
-import { Button } from '@chakra-ui/react';
-
-import { deleteAllReport } from '../../../../common/api/report';
-import { createBlob, downloadBlob } from '../../../../common/api/utils';
-import useReport from '../../../../common/hooks-query/useReport';
-import useRundown from '../../../../common/hooks-query/useRundown';
-import { cx } from '../../../../common/utils/styleUtils';
-import { formatTime } from '../../../../common/utils/time';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import { CombinedReport, getCombinedReport, makeReportCSV } from './reportSettings.utils';
-
-import style from './ReportSettings.module.scss';
-
-export default function ReportSettings() {
-  const { data: reportData } = useReport();
-  const { data } = useRundown();
-
-  const clearReport = async () => await deleteAllReport();
-  const downloadCSV = (combinedReport: CombinedReport[]) => {
-    if (!combinedReport) {
-      return;
-    }
-    const csv = makeReportCSV(combinedReport);
-    const blob = createBlob(csv, 'text/csv;charset=utf-8;');
-    downloadBlob(blob, 'ontime-report.csv');
-  };
-
-  const combinedReport = useMemo(() => {
-    return getCombinedReport(reportData, data.entries, data.order);
-  }, [reportData, data.entries, data.order]);
-
-  return (
-    <Panel.Section>
-      <Panel.Card>
-        <Panel.SubHeader>Report</Panel.SubHeader>
-        <Panel.Divider />
-        <Panel.Section>
-          <Panel.Title>
-            Manage report
-            <Panel.InlineElements>
-              <Button
-                variant='ontime-subtle'
-                leftIcon={<IoTrashBin />}
-                size='sm'
-                onClick={() => downloadCSV(combinedReport)}
-                isDisabled={combinedReport.length === 0}
-              >
-                Export CSV
-              </Button>
-              <Button
-                variant='ontime-subtle'
-                leftIcon={<IoTrashBin />}
-                size='sm'
-                color='#FA5656'
-                onClick={clearReport}
-                isDisabled={combinedReport.length === 0}
-              >
-                Clear All
-              </Button>
-            </Panel.InlineElements>
-          </Panel.Title>
-        </Panel.Section>
-        <Panel.Section>
-          <Panel.Table>
-            <thead>
-              <tr>
-                <th>#</th>
-                <th>Cue</th>
-                <th>Title</th>
-                <th>Scheduled Start</th>
-                <th>Actual Start</th>
-                <th>Scheduled End</th>
-                <th>Actual End</th>
-              </tr>
-            </thead>
-            <tbody>
-              {combinedReport.length === 0 && (
-                <Panel.TableEmpty label='Reports are generated when running through the show.' />
-              )}
-
-              {combinedReport.map((entry) => {
-                const start = (() => {
-                  if (entry.actualStart === null) return null;
-                  if (entry.actualStart <= entry.scheduledStart) return 'under';
-                  return 'over';
-                })();
-                const end = (() => {
-                  if (entry.actualEnd === null) return null;
-                  if (entry.actualEnd <= entry.scheduledEnd) return 'under';
-                  return 'over';
-                })();
-                return (
-                  <tr key={entry.index}>
-                    <th>{entry.index}</th>
-                    <th>{entry.cue}</th>
-                    <th>{entry.title}</th>
-                    <th className={cx([start && style[start]])}>{formatTime(entry.scheduledStart)}</th>
-                    <th className={cx([start && style[start]])}>{formatTime(entry.actualStart)}</th>
-                    <th className={cx([end && style[end]])}>{formatTime(entry.scheduledEnd)}</th>
-                    <th className={cx([end && style[end]])}>{formatTime(entry.actualEnd)}</th>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </Panel.Table>
-        </Panel.Section>
-      </Panel.Card>
-    </Panel.Section>
-  );
-}

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

@@ -1,14 +1,15 @@
 import { useEffect } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoOpenOutline, IoTrash } from 'react-icons/io5';
-import { Button, IconButton, Input, Switch } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button, IconButton, Input, Switch } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { URLPreset } from 'ontime-types';
 
 import { postUrlPresets } from '../../../../common/api/urlPresets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { handleLinks } from '../../../../common/utils/linkUtils';
@@ -107,29 +108,32 @@ export default function UrlPresetsForm() {
           </Panel.InlineElements>
         </Panel.SubHeader>
         <Panel.Divider />
-        <Info>
-          URL presets are user defined aliases to Ontime URLs
-          <br />
-          <br />
-          <b>Preset Name</b> <br />
-          The alias for the URL. This will be the URL you will be calling. eg: <br />
-          <Panel.BlockQuote>
-            Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
-            <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
-          </Panel.BlockQuote>
-          <br />
-          <b>URL Segment</b> <br />
-          The corresponding alias path and configuration parameters. eg: <br />
-          <Panel.BlockQuote>
-            URL segment <Panel.Highlight>backstage?hidePast=true&stopCycle=true</Panel.Highlight> corresponds to
-            complete URL
-            <Panel.Highlight>http://localhost:4001/backstage?hidePast=true&stopCycle=true</Panel.Highlight>
-          </Panel.BlockQuote>
-          <br />
-          You will need to save the changes before the presets are functional.
-          <br />
-          <ExternalLink href={urlPresetsDocs}>See the docs</ExternalLink>
-        </Info>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            URL presets are user defined aliases to Ontime URLs
+            <br />
+            <br />
+            <b>Preset Name</b> <br />
+            The alias for the URL. This will be the URL you will be calling. eg: <br />
+            <Panel.BlockQuote>
+              Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
+              <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
+            </Panel.BlockQuote>
+            <br />
+            <b>URL Segment</b> <br />
+            The corresponding alias path and configuration parameters. eg: <br />
+            <Panel.BlockQuote>
+              URL segment <Panel.Highlight>backstage?hidePast=true&stopCycle=true</Panel.Highlight> corresponds to
+              complete URL
+              <Panel.Highlight>http://localhost:4001/backstage?hidePast=true&stopCycle=true</Panel.Highlight>
+            </Panel.BlockQuote>
+            <br />
+            You will need to save the changes before the presets are functional.
+            <br />
+            <ExternalLink href={urlPresetsDocs}>See the docs</ExternalLink>
+          </AlertDescription>
+        </Alert>
         <Panel.Section>
           <Panel.Loader isLoading={isLoading} />
           <Panel.Title>

apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFieldEntry.tsx

@@ -1,11 +1,11 @@
 import { useState } from 'react';
-import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { CustomField, CustomFieldLabel } from 'ontime-types';
 
 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
-import Tag from '../../../../../common/components/tag/Tag';
 import * as Panel from '../../../panel-utils/PanelUtils';
 
 import CustomFieldForm from './CustomFieldForm';
@@ -13,20 +13,19 @@ import CustomFieldForm from './CustomFieldForm';
 import style from '../FeatureSettings.module.scss';
 
 interface CustomFieldEntryProps {
+  field: string;
   colour: string;
   label: string;
-  fieldKey: string;
-  type: 'string' | 'image';
   onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
   onDelete: (label: CustomFieldLabel) => Promise<void>;
 }
 
 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
-  const { colour, label, fieldKey, type, onEdit, onDelete } = props;
+  const { colour, label, onEdit, onDelete, field } = props;
   const [isEditing, setIsEditing] = useState(false);
 
   const handleEdit = async (patch: CustomField) => {
-    await onEdit(fieldKey, patch);
+    await onEdit(field, patch);
     setIsEditing(false);
   };
 
@@ -39,7 +38,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
             onSubmit={handleEdit}
             initialColour={colour}
             initialLabel={label}
-            initialKey={fieldKey}
+            initialKey={field}
           />
         </td>
       </tr>
@@ -51,13 +50,10 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
       <td>
         <Swatch color={colour} />
       </td>
-      <td>
-        <Tag>{type}</Tag>
-      </td>
       <td className={style.halfWidth}>{label}</td>
       <td className={style.fullWidth}>
-        <CopyTag label='Copy key to use in integrations' copyValue={fieldKey}>
-          {fieldKey}
+        <CopyTag label='Copy key to use in integrations' copyValue={field}>
+          {field}
         </CopyTag>
       </td>
       <Panel.InlineElements relation='inner' as='td'>
@@ -75,7 +71,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
           color='#FA5656' // $red-500
           icon={<IoTrash />}
           aria-label='Delete entry'
-          onClick={() => onDelete(fieldKey)}
+          onClick={() => onDelete(field)}
         />
       </Panel.InlineElements>
     </tr>