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

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@getontime/cli",
-    "version": "3.14.0",
+    "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,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "3.14.0",
+  "version": "3.11.1-beta.1",
   "private": true,
   "type": "module",
   "dependencies": {
@@ -15,7 +15,6 @@
     "@mantine/hooks": "^7.13.3",
     "@react-icons/all-files": "^4.1.0",
     "@sentry/react": "^8.43.0",
-    "@table-nav/react": "^0.0.7",
     "@tanstack/react-query": "^5.62.7",
     "@tanstack/react-query-devtools": "^5.62.7",
     "@tanstack/react-table": "^8.20.5",
@@ -32,7 +31,7 @@
     "react-qr-code": "^2.0.12",
     "react-router-dom": "^6.3.0",
     "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",

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/constants.ts

@@ -14,7 +14,6 @@ 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`;

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 { makeCSVFromArrayOfArrays } from '../utils/csv';
+import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
 
 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -43,7 +42,7 @@ export async function downloadCSV(fileName: string = 'rundown') {
     const { project, rundown, customFields } = data;
 
     const sheetData = makeTable(project, rundown, customFields);
-    const fileContent = makeCSVFromArrayOfArrays(sheetData);
+    const fileContent = makeCSV(sheetData);
 
     const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
     downloadBlob(blob, `${name}.csv`);

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/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 {
-  IconButton,
+  Button,
   Input,
+  InputGroup,
+  InputLeftAddon,
   Modal,
   ModalBody,
   ModalCloseButton,
   ModalContent,
+  ModalFooter,
   ModalHeader,
   ModalOverlay,
-  Select,
 } from '@chakra-ui/react';
-import { IoArrowForward } from '@react-icons/all-files/io5/IoArrowForward';
 
-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/external-link/ExternalLink.tsx

@@ -1,8 +1,8 @@
 import { MouseEvent, ReactNode } from 'react';
 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/all-files/io5/IoAlertCircle';
 
-import { cx } from '../../utils/styleUtils';
-
 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/SwatchPicker.tsx

@@ -3,9 +3,9 @@ import { useController, UseControllerProps } from 'react-hook-form';
 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/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,10 +0,0 @@
-.link {
-  color: $label-gray;
-  font-size: $text-body-size;
-  text-decoration: underline;
-  text-underline-offset: 2px;
-
-  &:hover {
-    color: $blue-400;
-  }
-}

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/navigation-menu/FloatingNavigation.tsx

@@ -1,7 +1,7 @@
 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/ViewLockedIcon.tsx

@@ -1,6 +1,6 @@
 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/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/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

@@ -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/__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: Record<string, string> = {},
-  filterImageType = true,
 ) => {
-  const options = structuredClone(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;
 };
 
-export 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/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/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

@@ -55,17 +55,6 @@ export const useEventAction = () => {
     defaultEndAction,
   } = useEditorSettings();
 
-  const getEventById = useCallback(
-    (eventId: string) => {
-      const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
-      if (!cachedRundown?.rundown) {
-        return;
-      }
-      return cachedRundown.rundown[eventId];
-    },
-    [queryClient],
-  );
-
   /**
    * Calls mutation to add new event
    * @private
@@ -626,7 +615,6 @@ export const useEventAction = () => {
     batchUpdateEvents,
     deleteEvent,
     deleteAllEvents,
-    getEventById,
     reorderEvent,
     swapEvents,
     updateEvent,

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/useSocket.ts

@@ -3,54 +3,73 @@ import { RuntimeStore, SimpleDirection, SimplePlayback, TimerMessage } from 'ont
 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,20 +114,32 @@ export const setPlayback = {
   },
 };
 
-export const useInfoPanel = createSelector((state: RuntimeStore) => ({
-  eventNow: state.eventNow,
-  eventNext: state.eventNext,
-  playback: state.timer.playback,
-  selectedEventIndex: state.runtime.selectedEventIndex,
-  numEvents: state.runtime.numEvents,
-}));
+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 useAuxTimerTime = createSelector((state: RuntimeStore) => state.auxtimer1.current);
+  return useRuntimeStore(featureSelector);
+};
 
-export const useAuxTimerControl = createSelector((state: RuntimeStore) => ({
-  playback: state.auxtimer1.playback,
-  direction: state.auxtimer1.direction,
-}));
+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 }),
@@ -114,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 }),
@@ -129,63 +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 setClientName = (newName: string) => socketSendJson('set-client-name', newName);
-
-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.offset,
-
-  currentBlock: state.currentBlock,
-}));
-
-export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
-  clock: state.clock,
-  offset: state.runtime.offset,
-}));
-
-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 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/utils/__tests__/csv.test.ts

@@ -1,13 +0,0 @@
-import { 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
-"
-`);
-  });
-});

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

@@ -1,10 +0,0 @@
-import { stringify } from 'csv-stringify/browser/esm/sync';
-
-/**
- * @description Converts an array of arrays to a CSV file
- * @param {string[][]} arrayOfArrays
- * @return {string}
- */
-export function makeCSVFromArrayOfArrays(arrayOfArrays: string[][]): string {
-  return stringify(arrayOfArrays);
-}

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/socket.ts

@@ -1,7 +1,7 @@
 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 {
@@ -34,16 +34,12 @@ 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 = () => {
@@ -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;
         }
@@ -198,23 +196,19 @@ export const connectSocket = () => {
         }
         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<RundownCached>(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;
         }
         case 'ontime-flush': {
-          flushBatchUpdates();
+          flushBatchUpdates()
           break;
         }
       }

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 {

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

@@ -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>
   );

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,23 +1,23 @@
 import { useEffect, useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { Button, IconButton, Input, Radio, RadioGroup, Select } from '@chakra-ui/react';
+import {
+  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,
-  isOntimeAction,
-  isOSCOutput,
-  OntimeAction,
-  OSCOutput,
-} from 'ontime-types';
+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';
@@ -27,7 +27,6 @@ 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';
 
@@ -52,7 +51,6 @@ export default function AutomationForm(props: AutomationFormProps) {
     register,
     setError,
     setFocus,
-    setValue,
     formState: { errors, isSubmitting, isDirty, isValid },
   } = useForm<AutomationDTO>({
     mode: 'onChange',
@@ -103,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;
@@ -141,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 });
@@ -210,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
@@ -225,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'
@@ -317,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)) {
@@ -380,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>
@@ -403,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>
@@ -450,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>
@@ -457,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/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

@@ -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/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 { Button } from '@chakra-ui/react';
-import { IoTrashBin } from '@react-icons/all-files/io5/IoTrashBin';
-
-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.rundown, data.order);
-  }, [reportData, data.rundown, 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,6 +1,6 @@
 import { useEffect } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-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';
@@ -9,8 +9,7 @@ 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';
@@ -109,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

@@ -6,7 +6,6 @@ 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';
@@ -14,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);
   };
 
@@ -40,7 +38,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
             onSubmit={handleEdit}
             initialColour={colour}
             initialLabel={label}
-            initialKey={fieldKey}
+            initialKey={field}
           />
         </td>
       </tr>
@@ -52,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'>
@@ -76,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>

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

@@ -1,11 +1,10 @@
 import { useEffect, useState } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { Button, Input, Radio, RadioGroup } from '@chakra-ui/react';
+import { useForm } from 'react-hook-form';
+import { Button, Input } from '@chakra-ui/react';
 import { CustomField } from 'ontime-types';
 import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';
 
 import { maybeAxiosError } from '../../../../../common/api/utils';
-import Info from '../../../../../common/components/info/Info';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { preventEscape } from '../../../../../common/utils/keyEvent';
@@ -21,8 +20,6 @@ interface CustomFieldsFormProps {
   initialKey?: string;
 }
 
-type CustomFieldFormData = CustomField & { key: string };
-
 export default function CustomFieldForm(props: CustomFieldsFormProps) {
   const { onSubmit, onCancel, initialColour, initialLabel, initialKey } = props;
   const { data } = useCustomFields();
@@ -31,7 +28,6 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
   const [_, setColour] = useState(initialColour || '');
 
   const {
-    control,
     handleSubmit,
     register,
     setFocus,
@@ -39,17 +35,17 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
     setValue,
     getValues,
     formState: { errors, isSubmitting, isValid, isDirty },
-  } = useForm<CustomFieldFormData>({
-    defaultValues: { type: 'string', label: initialLabel || '', colour: initialColour || '' },
+  } = useForm({
+    defaultValues: { label: initialLabel || '', colour: initialColour || '', key: initialKey || '' },
     resetOptions: {
       keepDirtyValues: true,
     },
   });
 
-  const setupSubmit = async (values: CustomFieldFormData) => {
-    const { type, label, colour } = values;
+  const setupSubmit = async (values: { label: string; colour: string }) => {
+    const { label, colour } = values;
     const newField: CustomField = {
-      type,
+      type: 'string', // type is not user definable yet
       colour,
       label,
     };
@@ -81,26 +77,6 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
       className={style.fieldForm}
       onKeyDown={(event) => preventEscape(event, onCancel)}
     >
-      <Info>
-        Please note that images can quickly deteriorate your app&apos;s performance.
-        <br />
-        Prefer using small, and compressed images.
-      </Info>
-      <div>
-        <Panel.Description>Type</Panel.Description>
-        <Controller
-          name='type'
-          control={control}
-          render={({ field }) => (
-            <RadioGroup {...field} size='sm' isDisabled={isEditMode} variant='ontime'>
-              <Panel.InlineElements relation='component'>
-                <Radio value='string'>Text</Radio>
-                <Radio value='image'>Image</Radio>
-              </Panel.InlineElements>
-            </RadioGroup>
-          )}
-        />
-      </div>
       <div className={style.twoCols}>
         <div>
           <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
@@ -129,10 +105,12 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
           <Input {...register('key')} disabled size='sm' variant='ontime-filled' autoComplete='off' />
         </div>
       </div>
+
       <div>
         <Panel.Description>Colour</Panel.Description>
         <SwatchSelect name='colour' value={colour} handleChange={(_field, value) => handleSelectColour(value)} />
       </div>
+
       {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
       <Panel.InlineElements relation='inner' align='end'>
         <Button size='sm' variant='ontime-ghosted' onClick={onCancel}>

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

@@ -1,11 +1,10 @@
 import { useState } from 'react';
-import { Button } from '@chakra-ui/react';
+import { Alert, AlertDescription, AlertIcon, Button } from '@chakra-ui/react';
 import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { CustomField, CustomFieldLabel } from 'ontime-types';
 
 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
-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 useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { customFieldsDocsUrl } from '../../../../../externals';
 import * as Panel from '../../../panel-utils/PanelUtils';
@@ -56,17 +55,20 @@ export default function CustomFields() {
         </Panel.SubHeader>
         <Panel.Divider />
         <Panel.Section>
-          <Info>
-            Custom fields allow for additional information to be added to an event.
-            <br />
-            <br />
-            This data is not used by Ontime, but provides place for cueing or department specific information (eg.
-            light, sound, camera).
-            <br />
-            <br />
-            Custom fields can be used width the Integrations feature using the generated key.
-            <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
-          </Info>
+          <Alert status='info' variant='ontime-on-dark-info'>
+            <AlertIcon />
+            <AlertDescription>
+              Custom fields allow for additional information to be added to an event.
+              <br />
+              <br />
+              This data is not used by Ontime, but provides place for cueing or department specific information (eg.
+              light, sound, camera).
+              <br />
+              <br />
+              Custom fields can be used width the Integrations feature using the generated key.
+              <ExternalLink href={customFieldsDocsUrl}>See the docs</ExternalLink>
+            </AlertDescription>
+          </Alert>
         </Panel.Section>
         <Panel.Section>
           {isAdding && <CustomFieldForm onSubmit={handleCreate} onCancel={handleCancel} />}
@@ -74,21 +76,19 @@ export default function CustomFields() {
             <thead>
               <tr>
                 <th>Colour</th>
-                <th>Type</th>
                 <th>Name</th>
                 <th>Key (used in Integrations)</th>
                 <th />
               </tr>
             </thead>
             <tbody>
-              {Object.entries(data).map(([key, { colour, label, type }]) => {
+              {Object.entries(data).map(([key, { colour, label }]) => {
                 return (
                   <CustomFieldEntry
                     key={key}
-                    fieldKey={key}
+                    field={key}
                     colour={colour}
                     label={label}
-                    type={type}
                     onEdit={handleEditField}
                     onDelete={handleDelete}
                   />

apps/client/src/features/app-settings/panel/feature-settings-panel/reportSettings.utils.ts

@@ -1,64 +0,0 @@
-import { isOntimeEvent, MaybeNumber, NormalisedRundown, OntimeReport } from 'ontime-types';
-
-import { makeCSVFromArrayOfArrays } from '../../../../common/utils/csv';
-import { formatTime } from '../../../../common/utils/time';
-
-export type CombinedReport = {
-  index: number;
-  title: string;
-  cue: string;
-  scheduledStart: number;
-  actualStart: MaybeNumber;
-  scheduledEnd: number;
-  actualEnd: MaybeNumber;
-};
-
-/**
- * Creates a combined report with the rundown data
- */
-export function getCombinedReport(report: OntimeReport, rundown: NormalisedRundown, order: string[]): CombinedReport[] {
-  if (Object.keys(report).length === 0) return [];
-  if (order.length === 0) return [];
-
-  const combinedReport: CombinedReport[] = [];
-
-  for (const [key, value] of Object.entries(report)) {
-    if (!rundown[key] || !isOntimeEvent(rundown[key])) continue;
-
-    combinedReport.push({
-      index: order.findIndex((id) => id === key),
-      title: rundown[key].title,
-      cue: rundown[key].cue,
-      scheduledStart: rundown[key].timeStart,
-      actualEnd: value.endedAt,
-      scheduledEnd: rundown[key].timeEnd,
-      actualStart: value.startedAt,
-    });
-  }
-
-  return combinedReport;
-}
-
-const csvHeader = ['Index', 'Title', 'Cue', 'Scheduled Start', 'Actual Start', 'Scheduled End', 'Actual End'];
-
-/**
- * Transforms a CombinedReport into a CSV string
- */
-export function makeReportCSV(combinedReport: CombinedReport[]) {
-  const csv: string[][] = [];
-  csv.push(csvHeader);
-
-  for (const entry of combinedReport) {
-    csv.push([
-      String(entry.index),
-      entry.title,
-      entry.cue,
-      formatTime(entry.scheduledStart),
-      formatTime(entry.actualStart),
-      formatTime(entry.scheduledEnd),
-      formatTime(entry.actualEnd),
-    ]);
-  }
-
-  return makeCSVFromArrayOfArrays(csv);
-}

apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx

@@ -1,17 +1,15 @@
 import { useEffect } from 'react';
 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 { ViewSettings } from 'ontime-types';
 
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { postViewSettings } from '../../../../common/api/viewSettings';
-import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import { SwatchPickerRHF } from '../../../../common/components/input/colour-input/SwatchPicker';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
 import { preventEscape } from '../../../../common/utils/keyEvent';
-import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 
 const cssOverrideDocsUrl = 'https://docs.getontime.no/features/custom-styling/';
@@ -87,19 +85,16 @@ export default function ViewSettingsForm() {
           </Panel.InlineElements>
         </Panel.SubHeader>
         <Panel.Divider />
-        <Info>
-          You can the Ontime views or customise its styles by modifying the provided CSS file.
-          <br />
-          {!isOntimeCloud && (
-            <>
-              <br />
-              The loaded CSS file is in the user directory at{' '}
-              <Panel.BlockQuote>{`${info.publicDir}/user/styles/override.css`}</Panel.BlockQuote>
-              <br />
-            </>
-          )}
-          <ExternalLink href={cssOverrideDocsUrl}>See the docs</ExternalLink>
-        </Info>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            You can the Ontime views or customise its styles by modifying the provided CSS file. <br />
+            The CSS file is in the user directory at {`${info.publicDir}/user/styles/override.css`}
+            <br />
+            <br />
+            <ExternalLink href={cssOverrideDocsUrl}>See the docs</ExternalLink>
+          </AlertDescription>
+        </Alert>
         <Panel.Section>
           <Panel.Loader isLoading={isLoading} />
           <Panel.ListGroup>

apps/client/src/features/app-settings/panel/interface-panel/InterfacePanel.tsx

@@ -0,0 +1,27 @@
+import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';
+
+import * as Panel from '../../panel-utils/PanelUtils';
+
+import EditorSettingsForm from './EditorSettingsForm';
+
+export default function InterfacePanel() {
+  return (
+    <>
+      <Panel.Header>Interface</Panel.Header>
+      <Panel.Section>
+        <Alert status='info' variant='ontime-on-dark-info'>
+          <AlertIcon />
+          <AlertDescription>
+            Interface settings
+            <br />
+            <br />
+            These concern settings that are applied to this user in this browser.
+            <br />
+            It will not affect other users or other browsers.
+          </AlertDescription>
+        </Alert>
+      </Panel.Section>
+      <EditorSettingsForm />
+    </>
+  );
+}

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

@@ -5,8 +5,8 @@ import { Button, Select, Switch } from '@chakra-ui/react';
 
 import { generateUrl } from '../../../../common/api/session';
 import { maybeAxiosError } from '../../../../common/api/utils';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import copyToClipboard from '../../../../common/utils/copyToClipboard';

apps/client/src/features/app-settings/panel/project-panel/ProjectList.tsx

@@ -31,7 +31,7 @@ export default function ProjectList() {
     <Panel.Table>
       <thead>
         <tr>
-          <th className={style.containCell}>File Name</th>
+          <th className={style.containCell}>Project Name</th>
           <th>Last Used</th>
           <th />
         </tr>

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

@@ -1,18 +1,21 @@
-import Info from '../../../../common/components/info/Info';
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';
 
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 const googleSheetDocsUrl = 'https://docs.getontime.no/features/import-spreadsheet-gsheet/';
 
 export default function GSheetInfo() {
   return (
-    <Info>
-      Ontime allows you to synchronize your rundown with a Google Sheet.
-      <br />
-      <br />
-      To enable this feature, you will need to generate tokens in your Google account and provide them to Ontime.
-      <br />
-      Once set up, you will be able to synchronize data between Ontime and your Google Sheet. <br />
-      <ExternalLink href={googleSheetDocsUrl}>See the docs</ExternalLink>
-    </Info>
+    <Alert status='info' variant='ontime-on-dark-info'>
+      <AlertIcon />
+      <AlertDescription>
+        Ontime allows you to synchronize your rundown with a Google Sheet.
+        <br />
+        <br />
+        To enable this feature, you will need to generate tokens in your Google account and provide them to Ontime.
+        <br />
+        Once set up, you will be able to synchronize data between Ontime and your Google Sheet. <br />
+        <ExternalLink href={googleSheetDocsUrl}>See the docs</ExternalLink>
+      </AlertDescription>
+    </Alert>
   );
 }

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

@@ -55,14 +55,15 @@ export default function GSheetSetup(props: GSheetSetupProps) {
     setLoading('');
   };
 
-  const handleCancelFlow = () => {
+  const handleCancelFlow = async () => {
     onCancel();
   };
 
   /**
    * Gets file from input
+   * @param event
    */
-  const handleClientSecret = (event: ChangeEvent<HTMLInputElement>) => {
+  const handleClientSecret = async (event: ChangeEvent<HTMLInputElement>) => {
     if (!event.target.files?.length) {
       return;
     }

apps/client/src/features/app-settings/panel/sources-panel/import-map/importMapUtils.ts

@@ -20,7 +20,6 @@ export const namedImportMap = {
   'Timer type': 'timer type',
   'Time warning': 'warning time',
   'Time danger': 'danger time',
-  ID: 'id',
   custom: [] as ImportCustom[],
 };
 
@@ -59,7 +58,6 @@ export function convertToImportMap(namedImportMap: NamedImportMap): ImportMap {
     timeWarning: namedImportMap['Time warning'],
     timeDanger: namedImportMap['Time danger'],
     custom,
-    entryId: namedImportMap.ID,
   };
 }
 

apps/client/src/features/app-settings/panel/sources-panel/preview/PreviewRundown.tsx

@@ -49,7 +49,6 @@ export default function PreviewRundown(props: PreviewRundownProps) {
           {fieldLabels.map((label) => (
             <th key={label}>{label}</th>
           ))}
-          <th>ID</th>
         </tr>
       </thead>
       <tbody>
@@ -114,9 +113,6 @@ export default function PreviewRundown(props: PreviewRundownProps) {
                     }
                     return <td key={field}>{value}</td>;
                   })}
-                <td className={style.center}>
-                  <Tag>{event.id}</Tag>
-                </td>
               </tr>
               {event.note && (
                 <tr>

apps/client/src/features/app-settings/useAppSettingsMenu.tsx

@@ -35,7 +35,6 @@ const staticOptions = [
     secondary: [
       { id: 'feature_settings__custom', label: 'Custom fields' },
       { id: 'feature_settings__urlpresets', label: 'URL Presets' },
-      { id: 'feature_settings__report', label: 'Report' },
     ],
   },
   {

apps/client/src/features/control/playback/playback-buttons/PlaybackButtons.tsx

@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import { Tooltip } from '@chakra-ui/react';
 import { IoPause } from '@react-icons/all-files/io5/IoPause';
 import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
@@ -35,7 +34,7 @@ export default function PlaybackButtons(props: PlaybackButtonsProps) {
   const isLast = selectedEventIndex === numEvents - 1;
   const noEvents = numEvents === 0;
 
-  const disableGo = isRolling || noEvents;
+  const disableGo = isRolling || noEvents || (isLast && !isArmed);
   const disableNext = isRolling || noEvents || isLast;
   const disablePrev = isRolling || noEvents || isFirst;
 
@@ -46,16 +45,14 @@ export default function PlaybackButtons(props: PlaybackButtonsProps) {
   const disableStop = !playbackCan.stop;
   const disableReload = !playbackCan.reload;
 
-  const [goModeAction, goModeText] = useMemo(() => {
+  const goModeText = selectedEventIndex === null || isArmed ? 'Start' : 'Next';
+  const goModeAction = () => {
     if (isArmed) {
-      return [setPlayback.start, 'Start'];
-    } else if (isLast) {
-      return [setPlayback.stop, 'Finish'];
-    } else if (selectedEventIndex === null) {
-      return [setPlayback.startNext, 'Start'];
+      setPlayback.start();
+    } else {
+      setPlayback.startNext();
     }
-    return [setPlayback.startNext, 'Next'];
-  }, [isArmed, isLast, selectedEventIndex]);
+  };
 
   return (
     <div className={style.buttonContainer}>

apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx

@@ -1,11 +1,9 @@
 import { PropsWithChildren } from 'react';
 import { Tooltip } from '@chakra-ui/react';
-import { MaybeNumber, Playback, TimerPhase } from 'ontime-types';
+import { Playback, TimerPhase } from 'ontime-types';
 import { dayInMs, millisToString } from 'ontime-utils';
 
-import AppLink from '../../../../common/components/link/app-link/AppLink';
 import { useTimer } from '../../../../common/hooks/useSocket';
-import useReport from '../../../../common/hooks-query/useReport';
 import { formatDuration } from '../../../../common/utils/time';
 import TimerDisplay from '../timer-display/TimerDisplay';
 
@@ -31,6 +29,10 @@ export default function PlaybackTimer(props: PropsWithChildren<PlaybackTimerProp
   const { playback, children } = props;
   const timer = useTimer();
 
+  const started = millisToString(timer.startedAt);
+  const expectedFinish = timer.expectedFinish !== null ? timer.expectedFinish % dayInMs : null;
+  const finish = millisToString(expectedFinish);
+
   const isRolling = playback === Playback.Roll;
   const isWaiting = timer.phase === TimerPhase.Pending;
   const isOvertime = timer.phase === TimerPhase.Overtime;
@@ -56,51 +58,19 @@ export default function PlaybackTimer(props: PropsWithChildren<PlaybackTimerProp
         {isWaiting ? (
           <span className={style.rolltag}>Roll: Countdown to start</span>
         ) : (
-          <RunningStatus startedAt={timer.startedAt} expectedFinish={timer.expectedFinish} playback={playback} />
+          <>
+            <span className={style.start}>
+              <span className={style.tag}>Started at</span>
+              <span className={style.time}>{started}</span>
+            </span>
+            <span className={style.finish}>
+              <span className={style.tag}>Expect end</span>
+              <span className={style.time}>{finish}</span>
+            </span>
+          </>
         )}
       </div>
       {children}
     </div>
   );
 }
-
-interface RunningStatusProps {
-  startedAt: MaybeNumber;
-  expectedFinish: MaybeNumber;
-  playback: Playback;
-}
-function RunningStatus(props: RunningStatusProps) {
-  const { startedAt, expectedFinish, playback } = props;
-
-  if (playback === Playback.Stop) {
-    return <StoppedStatus />;
-  }
-
-  const started = millisToString(startedAt);
-  const finishedMs = expectedFinish !== null ? expectedFinish % dayInMs : null;
-  const finish = millisToString(finishedMs);
-
-  return (
-    <>
-      <span className={style.start}>
-        <span className={style.tag}>Started at</span>
-        <span className={style.time}>{started}</span>
-      </span>
-      <span className={style.finish}>
-        <span className={style.tag}>Expect end</span>
-        <span className={style.time}>{finish}</span>
-      </span>
-    </>
-  );
-}
-
-function StoppedStatus() {
-  const { data } = useReport();
-  const hasReport = Object.keys(data).length > 0;
-
-  if (hasReport) {
-    return <AppLink search='settings=feature_settings__report'>Go to report management</AppLink>;
-  }
-
-  return null;
-}

apps/client/src/features/editors/welcome/Welcome.tsx

@@ -4,7 +4,7 @@ import { Button, Checkbox, Modal, ModalBody, ModalCloseButton, ModalContent, Mod
 import { loadDemo, loadProject } from '../../../common/api/db';
 import { postShowWelcomeDialog } from '../../../common/api/settings';
 import { invalidateAllCaches } from '../../../common/api/utils';
-import ExternalLink from '../../../common/components/link/external-link/ExternalLink';
+import ExternalLink from '../../../common/components/external-link/ExternalLink';
 import { appVersion, discordUrl, documentationUrl, websiteUrl } from '../../../externals';
 import * as Editor from '../editor-utils/EditorUtils';
 
@@ -75,7 +75,7 @@ export default function Welcome(props: WelcomeProps) {
                 <table className={style.table}>
                   <thead>
                     <tr>
-                      <th>File Name</th>
+                      <th>Project Name</th>
                       <th>Last Used</th>
                     </tr>
                   </thead>

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

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

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

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

apps/client/src/features/overview/Overview.module.scss

@@ -46,7 +46,7 @@
 }
 
 .ahead {
-  color: $playback-ahead;
+  color: $green-500;
 }
 
 .behind {

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

@@ -7,7 +7,6 @@ import {
   isOntimeEvent,
   isPlayableEvent,
   MaybeString,
-  OntimeEvent,
   PlayableEvent,
   Playback,
   RundownCached,
@@ -270,9 +269,8 @@ export default function Rundown({ data }: RundownProps) {
   // all events before the current selected are in the past
   let isPast = Boolean(featureData?.selectedEventId);
   let isNextDay = false;
-  let totalGap = 0;
   const isEditMode = appMode === AppMode.Edit;
-  let currentDay = 0;
+
   return (
     <div className={style.rundownContainer} ref={scrollRef} data-testid='rundown'>
       <DndContext onDragEnd={handleOnDragEnd} sensors={sensors} collisionDetection={closestCenter}>
@@ -299,7 +297,6 @@ export default function Rundown({ data }: RundownProps) {
 
                 if (isPlayableEvent(entry)) {
                   isNextDay = checkIsNextDay(entry, lastEvent);
-                  totalGap += !isPast ? entry.gap : 0;
                   if (isNewLatest(entry, lastEvent)) {
                     // populate previous entry
                     thisEvent = entry;
@@ -313,7 +310,6 @@ export default function Rundown({ data }: RundownProps) {
               const hasCursor = entry.id === cursor;
               if (isLoaded) {
                 isPast = false;
-                currentDay = (entry as OntimeEvent).dayOffset;
               }
 
               return (
@@ -335,8 +331,6 @@ export default function Rundown({ data }: RundownProps) {
                         playback={isLoaded ? featureData.playback : undefined}
                         isRolling={featureData.playback === Playback.Roll}
                         isNextDay={isNextDay}
-                        totalGap={totalGap}
-                        currentDay={currentDay}
                       />
                     </div>
                   </div>

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

@@ -22,8 +22,7 @@ export type EventItemActions =
   | 'delete'
   | 'clone'
   | 'update'
-  | 'swap'
-  | 'clear-report';
+  | 'swap';
 
 interface RundownEntryProps {
   type: SupportedEvent;
@@ -38,8 +37,6 @@ interface RundownEntryProps {
   previousEventId?: string;
   playback?: Playback; // we only care about this if this event is playing
   isRolling: boolean; // we need to know even if not related to this event
-  totalGap: number;
-  currentDay: number;
 }
 
 export default function RundownEntry(props: RundownEntryProps) {
@@ -55,8 +52,6 @@ export default function RundownEntry(props: RundownEntryProps) {
     isRolling,
     eventIndex,
     isNextDay,
-    totalGap,
-    currentDay,
   } = props;
   const { emitError } = useEmitLog();
   const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
@@ -178,8 +173,6 @@ export default function RundownEntry(props: RundownEntryProps) {
         isRolling={isRolling}
         gap={data.gap}
         isNextDay={isNextDay}
-        dayOffset={data.dayOffset - currentDay}
-        totalGap={totalGap}
         actionHandler={actionHandler}
       />
     );

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

@@ -9,7 +9,7 @@ $skip-opacity: 0.2;
   display: grid;
   grid-template-areas:
     'binder ...        ...     ...'
-    'binder pb-actions times   chip'
+    'binder pb-actions times   ...'
     'binder pb-actions title   title'
     'binder pb-actions estatus estatus'
     'binder ...        ...     ...';
@@ -131,10 +131,6 @@ $skip-opacity: 0.2;
   height: 100%;
 }
 
-.chipSection {
-  grid-area: chip;
-}
-
 .titleSection {
   grid-area: title;
   display: flex;

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

@@ -49,8 +49,6 @@ interface EventBlockProps {
   isRolling: boolean;
   gap: number;
   isNextDay: boolean;
-  dayOffset: number;
-  totalGap: number;
   actionHandler: (
     action: EventItemActions,
     payload?:
@@ -89,8 +87,6 @@ export default function EventBlock(props: EventBlockProps) {
     isRolling,
     gap,
     isNextDay,
-    dayOffset,
-    totalGap,
     actionHandler,
   } = props;
   const { selectedEventId, setSelectedEventId, clearSelectedEventId } = useEventIdSwapping();
@@ -175,7 +171,7 @@ export default function EventBlock(props: EventBlockProps) {
             },
             isDisabled: selectedEventId == null || selectedEventId === eventId,
           },
-          { withDivider: false, label: 'Clone', icon: IoDuplicateOutline, onClick: () => actionHandler('clone') },
+          { withDivider: true, label: 'Clone', icon: IoDuplicateOutline, onClick: () => actionHandler('clone') },
           { withDivider: true, label: 'Delete', icon: IoTrash, onClick: () => actionHandler('delete') },
         ],
   );
@@ -307,9 +303,6 @@ export default function EventBlock(props: EventBlockProps) {
           loaded={loaded}
           playback={playback}
           isRolling={isRolling}
-          dayOffset={dayOffset}
-          isPast={isPast}
-          totalGap={totalGap}
         />
       )}
     </div>

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

@@ -11,14 +11,12 @@ import { IoPlaySkipForward } from '@react-icons/all-files/io5/IoPlaySkipForward'
 import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { EndAction, MaybeString, Playback, TimerType, TimeStrategy } from 'ontime-types';
-import { dayInMs } from 'ontime-utils';
 
 import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';
 import EditableBlockTitle from '../common/EditableBlockTitle';
 import TimeInputFlow from '../time-input-flow/TimeInputFlow';
 
-import EventBlockChip from './composite/EventBlockChip';
 import EventBlockPlayback from './composite/EventBlockPlayback';
 import EventBlockProgressBar from './composite/EventBlockProgressBar';
 
@@ -44,9 +42,6 @@ interface EventBlockInnerProps {
   loaded: boolean;
   playback?: Playback;
   isRolling: boolean;
-  dayOffset: number;
-  isPast: boolean;
-  totalGap: number;
 }
 
 function EventBlockInner(props: EventBlockInnerProps) {
@@ -69,9 +64,6 @@ function EventBlockInner(props: EventBlockInnerProps) {
     loaded,
     playback,
     isRolling,
-    dayOffset,
-    isPast,
-    totalGap,
   } = props;
 
   const [renderInner, setRenderInner] = useState(false);
@@ -116,18 +108,6 @@ function EventBlockInner(props: EventBlockInnerProps) {
         loaded={loaded}
         disablePlayback={skip || isRolling}
       />
-      {!skip && (
-        <EventBlockChip
-          className={style.chipSection}
-          id={eventId}
-          trueTimeStart={timeStart + dayOffset * dayInMs}
-          isPast={isPast}
-          isLoaded={loaded}
-          totalGap={totalGap}
-          isLinkedAndNext={isNext && linkStart !== null}
-          duration={duration}
-        />
-      )}
       <div className={style.statusElements} id='block-status' data-ispublic={isPublic}>
         <span className={style.eventNote}>{note}</span>
         <div className={loaded ? style.progressBg : `${style.progressBg} ${style.hidden}`}>

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

@@ -1,21 +0,0 @@
-.chip {
-  background-color: $gray-1100;
-  white-space: nowrap;
-
-  font-size: calc(1rem - 3px);
-  color: $label-gray;
-  padding: 0.125rem 0.5rem;
-  border-radius: 2px;
-
-  &.over {
-    color: $ontime-delay-text;
-  }
-
-  &.under {
-    color: $playback-ahead;
-  }
-
-  &.due {
-    color: $warning-orange;
-  }
-}

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

@@ -1,123 +0,0 @@
-import { useMemo } from 'react';
-import { Tooltip } from '@chakra-ui/react';
-import { IoCheckmarkCircle } from '@react-icons/all-files/io5/IoCheckmarkCircle';
-import { isPlaybackActive, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
-
-import { usePlayback, useTimelineStatus } from '../../../../common/hooks/useSocket';
-import useReport from '../../../../common/hooks-query/useReport';
-import { cx } from '../../../../common/utils/styleUtils';
-import { formatDuration, formatTime } from '../../../../common/utils/time';
-import { tooltipDelayFast } from '../../../../ontimeConfig';
-
-import style from './EventBlockChip.module.scss';
-
-interface EventBlockChipProps {
-  id: string;
-  trueTimeStart: number;
-  isPast: boolean;
-  isLoaded: boolean;
-  className: string;
-  totalGap: number;
-  isLinkedAndNext: boolean;
-  duration: number;
-}
-
-export default function EventBlockChip(props: EventBlockChipProps) {
-  const { trueTimeStart, isPast, isLoaded, className, totalGap, isLinkedAndNext, id, duration } = props;
-  const { playback } = usePlayback();
-
-  if (isLoaded) {
-    return null; //TODO: the is a small flash of 'DUE' on the loaded event as clock data arrives before isLoaded propagates
-  }
-
-  const playbackActive = isPlaybackActive(playback);
-
-  if (!playbackActive || isPast) {
-    return <EventReport className={className} id={id} duration={duration} />;
-  }
-
-  if (playbackActive) {
-    // we extracted the component to avoid unnecessary calculations and re-renders
-    return (
-      <Tooltip label='Expected time until start' openDelay={tooltipDelayFast}>
-        <div className={className}>
-          <EventUntil trueTimeStart={trueTimeStart} totalGap={totalGap} isLinkedAndNext={isLinkedAndNext} />
-        </div>
-      </Tooltip>
-    );
-  }
-
-  return null;
-}
-
-interface EventUntilProps {
-  trueTimeStart: number;
-  totalGap: number;
-  isLinkedAndNext: boolean;
-}
-
-function EventUntil(props: EventUntilProps) {
-  const { trueTimeStart, totalGap, isLinkedAndNext } = props;
-  const { clock, offset } = useTimelineStatus();
-
-  const consumedOffset = isLinkedAndNext ? offset : Math.min(offset + totalGap, 0);
-  const offsetTimestart = trueTimeStart - consumedOffset;
-  const timeUntil = offsetTimestart - clock;
-  const isDue = timeUntil < MILLIS_PER_SECOND;
-
-  const timeUntilString = isDue ? 'DUE' : `${formatDuration(Math.abs(timeUntil), timeUntil > 2 * MILLIS_PER_MINUTE)}`;
-
-  return <div className={cx([style.chip, isDue && style.due])}>{timeUntilString}</div>;
-}
-
-interface EventReportProps {
-  className: string;
-  id: string;
-  duration: number;
-}
-
-function EventReport(props: EventReportProps) {
-  const { className, id, duration } = props;
-  const { data } = useReport();
-  const currentReport = data[id];
-
-  const [value, overUnderStyle, tooltip] = useMemo(() => {
-    if (!currentReport) {
-      return [null, 'none', ''];
-    }
-
-    const { startedAt, endedAt } = currentReport;
-    if (!startedAt || !endedAt) {
-      return [null, 'none', ''];
-    }
-
-    const actualDuration = endedAt - startedAt;
-    const difference = actualDuration - duration;
-    const absDifference = Math.abs(difference);
-
-    if (absDifference < MILLIS_PER_SECOND) {
-      return ['ontime', 'ontime', 'Event finished ontime'];
-    }
-
-    const isOver = difference > 0;
-
-    const fullTimeValue = formatTime(absDifference);
-
-    const tooltip = `Event ran ${isOver ? 'over' : 'under'} time by ${fullTimeValue}`;
-
-    const value = `${isOver ? '+' : '-'}${formatDuration(absDifference, absDifference > 2 * MILLIS_PER_MINUTE)}`;
-    return [value, isOver ? 'over' : 'under', tooltip];
-  }, [currentReport, duration]);
-
-  if (!value) {
-    return null;
-  }
-
-  return (
-    <Tooltip label={tooltip} openDelay={tooltipDelayFast}>
-      <div className={cx([style.chip, style[overUnderStyle], className])}>
-        {value === 'ontime' ? <IoCheckmarkCircle size='1.1rem' /> : value}
-      </div>
-    </Tooltip>
-  );
-}

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

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

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

@@ -1,16 +1,15 @@
 .eventEditor {
   max-height: 100%;
+  overflow-y: auto;
+  padding-inline: 0.5rem;
+
   display: flex;
   flex-direction: column;
   overflow-x: auto;
-
-  &.inModal {
-    max-height: 80vh;
-  }
 }
 
 .content {
-  padding-inline: 0.5rem 1.5rem;
+  padding-right: 4px;
   padding-bottom: 4rem;
 
   flex: 1;
@@ -82,9 +81,3 @@
   font-size: 1.25em;
   margin-left: 0.25em;
 }
-
-.customImage {
-  display: grid;
-  grid-template-columns: 1fr 72px;
-  gap: 1rem;
-}

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

@@ -1,17 +1,16 @@
 import { CSSProperties, useCallback } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { Button } from '@chakra-ui/react';
 import { CustomFieldLabel, OntimeEvent } from 'ontime-types';
 
-import AppLink from '../../../common/components/link/app-link/AppLink';
 import { useEventAction } from '../../../common/hooks/useEventAction';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import * as Editor from '../../editors/editor-utils/EditorUtils';
 
-import EventEditorImage from './composite/EventEditorImage';
 import EventEditorTimes from './composite/EventEditorTimes';
 import EventEditorTitles from './composite/EventEditorTitles';
 import EventTextArea from './composite/EventTextArea';
-import EventTextInput from './composite/EventTextInput';
 import EventEditorEmpty from './EventEditorEmpty';
 
 import style from './EventEditor.module.scss';
@@ -28,6 +27,7 @@ export default function EventEditor(props: EventEditorProps) {
   const { event } = props;
   const { data: customFields } = useCustomFields();
   const { updateEvent } = useEventAction();
+  const [_searchParams, setSearchParams] = useSearchParams();
 
   const isEditor = window.location.pathname.includes('editor');
 
@@ -43,6 +43,10 @@ export default function EventEditor(props: EventEditorProps) {
     [event?.id, updateEvent],
   );
 
+  const handleOpenCustomManager = () => {
+    setSearchParams({ settings: 'feature_settings__custom' });
+  };
+
   if (!event) {
     return <EventEditorEmpty />;
   }
@@ -77,9 +81,12 @@ export default function EventEditor(props: EventEditorProps) {
       <div className={style.column}>
         <Editor.Title>
           Custom Fields
-          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage</AppLink>}
+          {isEditor && (
+            <Button variant='ontime-subtle' size='sm' onClick={handleOpenCustomManager}>
+              Manage
+            </Button>
+          )}
         </Editor.Title>
-
         {Object.keys(customFields).map((fieldKey) => {
           const key = `${event.id}-${fieldKey}`;
           const fieldName = `custom-${fieldKey}`;
@@ -87,41 +94,17 @@ export default function EventEditor(props: EventEditorProps) {
           const { backgroundColor, color } = getAccessibleColour(customFields[fieldKey].colour);
           const labelText = customFields[fieldKey].label;
 
-          if (customFields[fieldKey].type === 'string') {
-            return (
-              <EventTextArea
-                key={key}
-                field={fieldName}
-                label={labelText}
-                initialValue={initialValue}
-                submitHandler={handleSubmit}
-                className={style.decorated}
-                style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
-              />
-            );
-          }
-
-          if (customFields[fieldKey].type === 'image') {
-            return (
-              <div key={key} className={style.customImage}>
-                <EventTextInput
-                  key={key}
-                  field={fieldName}
-                  label={labelText}
-                  initialValue={initialValue}
-                  placeholder='Paste image URL'
-                  submitHandler={handleSubmit}
-                  className={style.decorated}
-                  maxLength={255}
-                  style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
-                />
-                <EventEditorImage src={initialValue} />
-              </div>
-            );
-          }
-
-          // we should have exhausted all types by now
-          return null;
+          return (
+            <EventTextArea
+              key={key}
+              field={fieldName}
+              label={labelText}
+              initialValue={initialValue}
+              submitHandler={handleSubmit}
+              className={style.decorated}
+              style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
+            />
+          );
         })}
       </div>
     </div>

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

@@ -1,12 +0,0 @@
-.imageContainer {
-  width: 100%;
-  height: 100%;
-  background-color: $gray-1250;
-  display: grid;
-  place-content: center;
-}
-
-.imageOverlay {
-  width: 100%;
-  height: 100%;
-}

apps/client/src/features/rundown/event-editor/composite/EventEditorImage.tsx

@@ -1,16 +0,0 @@
-import style from './EventEditorImage.module.scss';
-
-interface EventEditorImageProps {
-  src: string;
-}
-
-export default function EventEditorImage(props: EventEditorImageProps) {
-  const { src } = props;
-
-  return (
-    <div className={style.imageContainer}>
-      <img loading='lazy' src={src} />
-      <div className={style.imageOverlay} />
-    </div>
-  );
-}

apps/client/src/features/rundown/event-editor/composite/EventTextInput.tsx

@@ -9,12 +9,11 @@ interface EventTextInputProps extends InputProps {
   field: EditorUpdateFields;
   label: string;
   initialValue: string;
-  placeholder?: string;
   submitHandler: (field: EditorUpdateFields, value: string) => void;
 }
 
 export default function EventTextInput(props: EventTextInputProps) {
-  const { className, field, label, initialValue, style: givenStyles, submitHandler, maxLength, placeholder } = props;
+  const { field, label, initialValue, submitHandler, maxLength } = props;
   const ref = useRef<HTMLInputElement | null>(null);
   const submitCallback = useCallback((newValue: string) => submitHandler(field, newValue), [field, submitHandler]);
 
@@ -24,9 +23,7 @@ export default function EventTextInput(props: EventTextInputProps) {
 
   return (
     <div>
-      <Editor.Label className={className} htmlFor={field} style={givenStyles}>
-        {label}
-      </Editor.Label>
+      <Editor.Label htmlFor={field}>{label}</Editor.Label>
       <Input
         id={field}
         ref={ref}
@@ -35,7 +32,6 @@ export default function EventTextInput(props: EventTextInputProps) {
         data-testid='input-textfield'
         value={value}
         maxLength={maxLength || 100}
-        placeholder={placeholder}
         onChange={onChange}
         onBlur={onBlur}
         onKeyDown={onKeyDown}

apps/client/src/features/viewers/clock/Clock.scss

@@ -25,14 +25,6 @@
     top: 2vw;
     left: 2vw;
     max-width: min(200px, 20vw);
-  }
-}
-
-/* =================== MOBILE ===================*/
-@media screen and (max-width: 768px) {
-  .clock-view {
-    .logo img {
-      height: min(50px, 10vh);
-    }
+    max-height: min(100px, 20vh);
   }
 }

apps/client/src/features/viewers/countdown/Countdown.scss

@@ -38,6 +38,7 @@
     top: 2vw;
     left: 2vw;
     max-width: min(200px, 20vw);
+    max-height: min(100px, 20vh);
   }
 
   /* =================== MAIN - EVENT CONTAINER ===================*/
@@ -174,13 +175,3 @@
     }
   }
 }
-
-
-/* =================== MOBILE ===================*/
-@media screen and (max-width: 768px) {
-  .countdown {
-    .logo img {
-      height: min(50px, 10vh);
-    }
-  }
-}

apps/client/src/features/viewers/minimal-timer/MinimalTimer.scss

@@ -56,15 +56,6 @@
     top: 2vw;
     left: 2vw;
     max-width: min(200px, 20vw);
-  }
-}
-
-
-/* =================== MOBILE ===================*/
-@media screen and (max-width: 768px) {
-  .minimal-timer {
-    .logo img {
-      height: min(50px, 10vh);
-    }
+    max-height: min(100px, 20vh);
   }
 }

apps/client/src/theme/_ontimeColours.scss

@@ -12,7 +12,6 @@ $white-60: rgba(255, 255, 255, 0.60);
 $white-90: rgba(255, 255, 255, 0.90);
 
 $black-10: rgba(0, 0, 0, 0.10);
-$black-60: rgba(0, 0, 0, 0.60);
 
 $gray-50: #f6f6f6;
 $gray-100: #ececec;

apps/client/src/theme/_ontimeStyles.scss

@@ -25,7 +25,6 @@ $ontime-delay-text: #E69056;
 $ontime-paused: #c05621;
 $ontime-stop: #E4281E;
 $playback-negative: $red-500;
-$playback-ahead: $green-500;
 $active-indicator: #8bb33d;
 $text-black: $gray-1350;
 

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

@@ -24,10 +24,4 @@ export const langDe: TranslationObject = {
   'timeline.done': 'Beendet',
   'timeline.due': 'fällig',
   'timeline.followedby': 'Gefolgt von',
-  'project.title': 'Titel',
-  'project.description': 'Beschreibung',
-  'project.backstage_info': 'Backstage-Informationen',
-  'project.backstage_url': 'Backstage-URL',
-  'project.public_info': 'Öffentliche Informationen',
-  'project.public_url': 'Öffentliche URL',
 };

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

@@ -22,12 +22,6 @@ export const langEn = {
   'timeline.done': 'done',
   'timeline.due': 'due',
   'timeline.followedby': 'Followed by',
-  'project.title': 'Title',
-  'project.description': 'Description',
-  'project.backstage_info': 'Backstage Info',
-  'project.backstage_url': 'Backstage URL',
-  'project.public_info': 'Public Info',
-  'project.public_url': 'Public URL',
 };
 
 export type TranslationObject = Record<keyof typeof langEn, string>;

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

@@ -24,10 +24,4 @@ export const langEs: TranslationObject = {
   'timeline.done': 'Terminado',
   'timeline.due': 'pendiente',
   'timeline.followedby': 'Seguido por',
-  'project.title': 'Título',
-  'project.description': 'Descripción',
-  'project.backstage_info': 'Información de backstage',
-  'project.backstage_url': 'URL de backstage',
-  'project.public_info': 'Información pública',
-  'project.public_url': 'URL pública',
 };

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

@@ -24,10 +24,4 @@ export const langFr: TranslationObject = {
   'timeline.done': 'Terminé',
   'timeline.due': 'dû',
   'timeline.followedby': 'Suivi de',
-  'project.title': 'Titre',
-  'project.description': 'Description',
-  'project.backstage_info': 'Informations des coulisses',
-  'project.backstage_url': 'URL des coulisses',
-  'project.public_info': 'Informations publiques',
-  'project.public_url': 'URL publique',
 };