refactor: small tweaks and fixes

README.md

@@ -1,5 +1,5 @@
 [![Ontime build v2](https://github.com/cpvalente/ontime/actions/workflows/build_v2.yml/badge.svg)](https://github.com/cpvalente/ontime/actions/workflows/build_v2.yml)
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Documentation in Gitbook](https://badges.aleen42.com/src/gitbook_2.svg)](https://ontime.gitbook.io)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0) 
 
 ## Download the latest releases here
 
@@ -24,6 +24,8 @@ outputs.
 
 ![Views](https://github.com/cpvalente/ontime/blob/master/.github/aux-images/overview.png)
 
+[Read the docs to learn more](https://docs.getontime.no)
+
 ## Using Ontime
 
 Once installed and running, Ontime starts a background server that is the heart of all processes.
@@ -59,7 +61,7 @@ IP.ADDRESS:4001/editor    > the control interface, same as the app
 IP.ADDRESS:4001/cuesheet  > realtime cuesheets for collaboration
 ```
 
-More documentation is available [in our docs](https://ontime.gitbook.io)
+More documentation is available [in our docs](https://docs.getontime.no)
 
 ## Feature List (in no specific order)
 
@@ -84,7 +86,7 @@ More documentation is available [in our docs](https://ontime.gitbook.io)
   - WebSockets
 - [x] Roll mode: run standalone using the system clock
 - [x] [Headless run](#headless-run): run server in a separate machine, configure from a browser locally
-- [x] [Countdown to anything!](https://ontime.gitbook.io/v2/views/countdown): have
+- [x] [Countdown to anything!](https://docs.getontime.no/features/count-to-anything/): have
       a countdown to any scheduled event
 - [x] Multi-platform (available on Windows, MacOS and Linux)
 - [x] [Companion integration](https://bitfocus.io/connections/getontime-ontime)
@@ -120,9 +122,14 @@ Ontime broadcasts its data over WebSockets. This allows you to consume its data
 Writing a new view for the browser can be done with basic knowledge of HTML + CSS + Javascript (or any other language
 that can run in the browser).
 <br />
-See [this repository](https://github.com/cpvalente/ontime-viewer-template-v2) with a small template on
+We have prepared a few resources to help here:
-how to get you started and read the docs about
+- Shipped with Ontime there is a small clock to get you started, it is available at `http://localhost:4001/external/demo` and the [code can be found here](https://github.com/cpvalente/ontime/tree/master/apps/server/src/external/demo)
-the [Websocket API](https://ontime.gitbook.io/v2/control-and-feedback/ontime-apis#osc-and-websocket-api)
+- See [this repository](https://github.com/cpvalente/ontime-viewer-template-v2) with a template on
+how to get you started
+- See information about the [Websocket API](https://docs.getontime.no/api/osc-and-ws/)
+<br />
+More information [in the docs](https://docs.getontime.no/features/custom-views/)
+
 
 ### Headless run️
 
@@ -130,7 +137,7 @@ You can self-host and run Ontime in a docker image.
 
 The docker image along with documentation is [available Docker Hub at getontime/ontime](https://hub.docker.com/r/getontime/ontime)
 
-If you want to run this image in a Raspberry Pi, please see [the docs](https://ontime.gitbook.io/v2/additional-notes/use-in-raspberry-pi)
+If you want to run this image in a Raspberry Pi, please see [the docs](https://docs.getontime.no/additional-notes/use-with-rpi/)
 
 ## Roadmap
 
@@ -192,7 +199,7 @@ Information about the project setup can be found in the [development documentati
 
 # Help
 
-Help is underway! ... and can be found [here](https://ontime.gitbook.io)
+Help is underway! ... and can be found [here](https://docs.getontime.no)
 
 # License
 

apps/client/src/common/components/input/time-input/TimeInput.tsx

@@ -91,9 +91,6 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
     (event: KeyboardEvent<HTMLInputElement>) => {
       if (event.key === 'Enter') {
         inputRef.current?.blur();
-        validateAndSubmit((event.target as HTMLInputElement).value);
-      } else if (event.key === 'Tab') {
-        validateAndSubmit((event.target as HTMLInputElement).value);
       }
       if (event.key === 'Escape') {
         ignoreChange.current = true;
@@ -101,7 +98,7 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
         resetValue();
       }
     },
-    [resetValue, validateAndSubmit],
+    [resetValue],
   );
 
   const onBlurHandler = useCallback(

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

@@ -1,7 +1,7 @@
 .emptyContainer {
   width: 100%;
   text-align: center;
-  color: $gray-1350;
+  color: $white-10;
 
   .empty {
     width: 100%;

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

@@ -5,7 +5,7 @@ import EmptyImage from '../../../assets/images/empty.svg?react';
 import style from './Empty.module.scss';
 
 interface EmptyProps {
-  text: string;
+  text?: string;
   style?: CSSProperties;
 }
 
@@ -14,7 +14,7 @@ export default function Empty(props: EmptyProps) {
   return (
     <div className={style.emptyContainer} {...rest}>
       <EmptyImage className={style.empty} />
-      <span className={style.text}>{text}</span>
+      {text && <span className={style.text}>{text}</span>}
     </div>
   );
 }

apps/client/src/common/utils/__tests__/dateConfig.test.js

@@ -14,6 +14,7 @@ describe('test forgivingStringToMillis()', () => {
       { value: '1h0m0s', expect: 1000 * 60 * 60 },
       { value: '23h0m0s', expect: 1000 * 60 * 60 * 23 },
       { value: '12h12m12s', expect: 12 * 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 },
+      { value: '12H12M12S', expect: 12 * 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 },
       { value: '2m', expect: 2 * 60 * 1000 },
       { value: '1h5s', expect: 1000 * 60 * 60 + 1000 * 5 },
       { value: '1h2m', expect: 1000 * 60 * 60 + 1000 * 60 * 2 },

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

@@ -46,13 +46,13 @@ function checkAmPm(value: string) {
  * @param {string} value
  */
 function checkMatchers(value: string) {
-  const hoursMatch = /(\d+)h/.exec(value);
+  const hoursMatch = /(\d+)h/i.exec(value);
   const hoursMatchValue = hoursMatch ? parse(hoursMatch[1]) : 0;
 
-  const minutesMatch = /(\d+)m/.exec(value);
+  const minutesMatch = /(\d+)m/i.exec(value);
   const minutesMatchValue = minutesMatch ? parse(minutesMatch[1]) : 0;
 
-  const secondsMatch = /(\d+)s/.exec(value);
+  const secondsMatch = /(\d+)s/i.exec(value);
   const secondsMatchValue = secondsMatch ? parse(secondsMatch[1]) : 0;
 
   if (hoursMatchValue > 0 || minutesMatchValue > 0 || secondsMatchValue > 0) {

apps/client/src/externals.ts

@@ -2,4 +2,4 @@ export const githubUrl = 'https://www.github.com/cpvalente/ontime';
 export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/releases/latest';
 export const websiteUrl = 'https://www.getontime.no';
 
-export const gitbookUrl = 'https://ontime.gitbook.io';
+export const documentationUrl = 'https://docs.getontime.no';

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

@@ -1,6 +1,6 @@
 import { version } from '../../../../../package.json';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { gitbookUrl, githubUrl, websiteUrl } from '../../../../externals';
+import { documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
 import * as Panel from '../PanelUtils';
 
 import CheckUpdatesButton from './CheckUpdatesButton';
@@ -18,7 +18,7 @@ export default function AboutPanel() {
       </Panel.Section>
       <Panel.Section>
         <Panel.SubHeader>Links</Panel.SubHeader>
-        <ExternalLink href={gitbookUrl}>Read the docs over at GitBook</ExternalLink>
+        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
         <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
       </Panel.Section>
       <Panel.Section>

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

@@ -13,7 +13,7 @@ import * as Panel from '../PanelUtils';
 
 import style from './GeneralPanel.module.scss';
 
-const cssOverrideDocsUrl = 'https://ontime.gitbook.io/v2/features/custom-styling';
+const cssOverrideDocsUrl = 'https://docs.getontime.no/features/custom-styling/';
 
 export default function ViewSettingsForm() {
   const { data, status, refetch, isFetching } = useViewSettings();

apps/client/src/features/app-settings/panel/integrations-panel/IntegrationsPanel.tsx

@@ -6,7 +6,7 @@ import * as Panel from '../PanelUtils';
 import HttpIntegrations from './HttpIntegrations';
 import OscIntegrations from './OscIntegrations';
 
-const integrationDocsUrl = 'https://ontime.gitbook.io/v2/control-and-feedback/integrations';
+const integrationDocsUrl = 'https://docs.getontime.no/api/integrations/';
 
 export default function IntegrationsPanel() {
   return (

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

@@ -147,7 +147,7 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
           <Input
             variant='ontime-filled'
             size='sm'
-            placeholder='www.ontime.gitbook.io'
+            placeholder='http://docs.getontime.no'
             autoComplete='off'
             {...register('backstageUrl')}
           />

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

@@ -142,7 +142,7 @@ export default function ProjectData() {
               <Input
                 variant='ontime-filled'
                 size='sm'
-                placeholder='www.ontime.gitbook.io'
+                placeholder='http://docs.getontime.no'
                 autoComplete='off'
                 {...register('backstageUrl')}
               />

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

@@ -11,7 +11,7 @@ import * as Panel from '../PanelUtils';
 import CustomFieldEntry from './CustomFieldEntry';
 import CustomFieldForm from './CustomFieldForm';
 
-const customFieldsDocsUrl = 'https://ontime.gitbook.io/v2/features/user-fields';
+const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
 
 export default function ProjectSettingsPanel() {
   const { data, refetch } = useCustomFields();

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

@@ -1,7 +1,7 @@
 import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';
 
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-const googleSheetDocsUrl = 'https://ontime.gitbook.io/v2/features/google-sheet';
+const googleSheetDocsUrl = 'https://docs.getontime.no/features/import-spreadsheet-gsheet/';
 
 export default function GSheetInfo() {
   return (

apps/client/src/features/control/playback/timer-display/TimerDisplay.module.scss

@@ -4,7 +4,7 @@
   grid-area: clk;
   white-space: nowrap;
   max-width: 18.75rem;
-
+  min-width: 5em;
 
   font-family: var(--font-family-override, $viewer-font-family);
   color: var(--timer-color-override, $timer-color);

apps/client/src/features/control/playback/timer-display/TimerDisplay.tsx

@@ -11,7 +11,7 @@ interface TimerDisplayProps {
 
 /**
  * Displays time in ms in formatted timetag
- * Typically used in production views
+ * Used in editor
  */
 export default function TimerDisplay(props: TimerDisplayProps) {
   const { time } = props;

apps/client/src/features/editors/Editor.module.scss

@@ -48,8 +48,7 @@ $panel-gap: 0.5rem;
 }
 
 .left {
-  flex-grow: 1;
+  flex: 1 2 auto; /* flex-grow: 1, flex-shrink: 2, flex-basis: auto */
-  flex-shrink: 1;
   min-width: $min-playback-width;
   max-width: $max-playback-width;
   display: flex;

apps/client/src/features/modals/settings-modal/AliasesForm.tsx

@@ -18,7 +18,7 @@ import OntimeModalFooter from '../OntimeModalFooter';
 
 import style from './SettingsModal.module.scss';
 
-const aliasesDocsUrl = 'https://ontime.gitbook.io/v2/features/url-aliases';
+const aliasesDocsUrl = 'https://docs.getontime.no/features/url-presets/';
 
 // we wrap the array in an object to be simplify react-hook-form
 type Aliases = {

apps/client/src/features/modals/settings-modal/ProjectDataForm.tsx

@@ -122,7 +122,7 @@ export default function ProjectDataForm() {
           {...inputProps}
           variant='ontime-filled-on-light'
           size='sm'
-          placeholder='www.ontime.gitbook.io'
+          placeholder='https://docs.getontime.no'
           isDisabled={disableInputs}
           {...register('backstageUrl')}
         />

apps/client/src/features/overview/Overview.tsx

@@ -15,7 +15,7 @@ import style from './Overview.module.scss';
  * @param time
  * @returns
  */
-function formattedTime(time: MaybeNumber) {
+function formatedTime(time: MaybeNumber) {
   return millisToString(time, { fallback: timerPlaceholder });
 }
 
@@ -27,13 +27,13 @@ export default function Overview() {
       <ErrorBoundary>
         <TitlesOverview />
         <div className={style.column}>
-          <TimeRow label='Planned start' value={formattedTime(plannedStart)} className={style.start} />
+          <TimeRow label='Planned start' value={formatedTime(plannedStart)} className={style.start} />
-          <TimeRow label='Actual start' value={formattedTime(actualStart)} className={style.start} />
+          <TimeRow label='Actual start' value={formatedTime(actualStart)} className={style.start} />
         </div>
         <RuntimeOverview />
         <div className={style.column}>
-          <TimeRow label='Planned end' value={formattedTime(plannedEnd)} className={style.end} />
+          <TimeRow label='Planned end' value={formatedTime(plannedEnd)} className={style.end} />
-          <TimeRow label='Expected end' value={formattedTime(expectedEnd)} className={style.end} />
+          <TimeRow label='Expected end' value={formatedTime(expectedEnd)} className={style.end} />
         </div>
       </ErrorBoundary>
     </div>
@@ -51,24 +51,32 @@ function TitlesOverview() {
   );
 }
 
+function getOffsetText(offset: MaybeNumber): string {
+  if (offset === null) {
+    return enDash;
+  }
+  const isAhead = offset <= 0;
+  let offsetText = millisToString(Math.abs(offset), { fallback: enDash });
+  if (offsetText !== enDash) {
+    offsetText = isAhead ? `+${offsetText}` : `${enDash}${offsetText}`;
+  }
+  return offsetText;
+}
+
 function RuntimeOverview() {
   const { clock, numEvents, selectedEventIndex, offset } = useRuntimePlaybackOverview();
 
   const current = selectedEventIndex !== null ? selectedEventIndex + 1 : enDash;
   const ofTotal = numEvents || enDash;
   const progressText = numEvents ? `${current} of ${ofTotal}` : '-';
-
+  const offsetText = getOffsetText(offset);
-  const isAhead = offset <= 0;
+  const offsetClasses = offset === null ? undefined : offset > 0 ? style.behind : style.ahead;
-  let offsetText = millisToString(Math.abs(offset), { fallback: enDash });
-  if (offsetText !== enDash) {
-    offsetText = isAhead ? `+${offsetText}` : `${enDash}${offsetText}`;
-  }
 
   return (
     <>
       <TimeColumn label='Progress' value={progressText} />
-      <TimeColumn label='Offset' value={offsetText} className={isAhead ? style.ahead : style.behind} />
+      <TimeColumn label='Offset' value={offsetText} className={offsetClasses} />
-      <TimeColumn label='Time now' value={formattedTime(clock)} />
+      <TimeColumn label='Time now' value={formatedTime(clock)} />
     </>
   );
 }

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

@@ -254,7 +254,7 @@ export default function Rundown({ data }: RundownProps) {
                         data={event}
                         loaded={isLoaded}
                         hasCursor={hasCursor}
-                        next={isNext}
+                        isNext={isNext}
                         previousEnd={previousEnd}
                         previousEventId={previousEventId}
                         playback={isLoaded ? featureData.playback : undefined}

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

@@ -14,7 +14,7 @@ export default function RundownEmpty(props: RundownEmptyProps) {
 
   return (
     <div className={style.alignCenter}>
-      <Empty text='No data yet' style={{ marginTop: '7vh' }} />
+      <Empty style={{ marginTop: '7vh' }} />
       <Button onClick={handleAddNew} variant='ontime-filled' className={style.spaceTop} leftIcon={<IoAdd />}>
         Create Event
       </Button>

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

@@ -22,7 +22,7 @@ interface RundownEntryProps {
   loaded: boolean;
   eventIndex: number;
   hasCursor: boolean;
-  next: boolean;
+  isNext: boolean;
   previousEnd: MaybeNumber;
   previousEventId?: string;
   playback?: Playback; // we only care about this if this event is playing
@@ -30,7 +30,7 @@ interface RundownEntryProps {
 }
 
 export default function RundownEntry(props: RundownEntryProps) {
-  const { isPast, data, loaded, hasCursor, next, previousEnd, previousEventId, playback, isRolling, eventIndex } =
+  const { isPast, data, loaded, hasCursor, isNext, previousEnd, previousEventId, playback, isRolling, eventIndex } =
     props;
   const { emitError } = useEmitLog();
   const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
@@ -138,7 +138,7 @@ export default function RundownEntry(props: RundownEntryProps) {
         previousEnd={previousEnd}
         colour={data.colour}
         isPast={isPast}
-        next={next}
+        isNext={isNext}
         skip={data.skip}
         loaded={loaded}
         hasCursor={hasCursor}

apps/client/src/features/rundown/RundownExport.module.scss

@@ -1,8 +1,8 @@
-@use '../editors//EditorMixin' as editor;
+@use '../editors/EditorMixin' as editor;
 
 .rundownExport {
   height: 100%;
-  flex: 1;
+  flex: 1 1 auto; /* flex-grow: 1, flex-shrink: 1, flex-basis: auto */
 
   &.extracted {
     .list {
@@ -34,8 +34,7 @@
   padding-left: 0;
   box-shadow: $box-shadow-right;
 
-  flex-grow: 1;
+  flex: 1 2 auto; /* flex-grow: 1, flex-shrink: 2, flex-basis: auto */
-  flex-shrink: 1;
   min-width: 38rem;
   max-width: 45rem;
 }
@@ -49,8 +48,7 @@
   background-color: $gray-1325;
   border-radius: 0 8px 8px 0;
 
-  flex-grow: 1;
+  flex: 1 1 auto; /* flex-grow: 1, flex-shrink: 1, flex-basis: auto */
-  flex-shrink: 1;
   min-width: 30rem;
   max-width: 45rem;
 }

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

@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback } from 'react';
-import { Editable, EditableInput, EditablePreview } from '@chakra-ui/react';
+import { Input } from '@chakra-ui/react';
 
+import useReactiveTextInput from '../../../common/components/input/text-input/useReactiveTextInput';
 import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';
 
@@ -15,39 +16,40 @@ interface TitleEditorProps {
 
 export default function EditableBlockTitle(props: TitleEditorProps) {
   const { title, eventId, placeholder, className } = props;
-  const [blockTitle, setBlockTitle] = useState<string>(title || '');
   const { updateEvent } = useEventAction();
 
-  useEffect(() => {
+  const submitCallback = useCallback(
-    setBlockTitle(title);
-  }, [title]);
-
-  const handleTitle = useCallback(
     (text: string) => {
       if (text === title) {
         return;
       }
 
       const cleanVal = text.trim();
-      setBlockTitle(cleanVal);
-
       updateEvent({ id: eventId, title: cleanVal });
     },
     [title, updateEvent, eventId],
   );
 
-  const classes = cx([className, style.eventTitle, !blockTitle ? style.noTitle : null]);
+  const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(title, submitCallback, {
+    submitOnEnter: true,
+  });
+
+  const classes = cx([className, style.eventTitle, !value ? style.noTitle : null]);
+
   return (
-    <Editable
+    <Input
-      variant='ontime'
+      data-testid='block__title'
-      value={blockTitle}
+      variant='ontime-ghosted'
+      value={value}
       className={classes}
       placeholder={placeholder}
-      onChange={(value) => setBlockTitle(value)}
+      onChange={onChange}
-      onSubmit={(value) => handleTitle(value)}
+      onBlur={onBlur}
-    >
+      onKeyDown={onKeyDown}
-      <EditablePreview className={style.preview} />
+      autoComplete='off'
-      <EditableInput />
+      fontWeight='600'
-    </Editable>
+      letterSpacing='0.25px'
+      paddingLeft='0'
+    />
   );
 }

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

@@ -10,7 +10,7 @@ $skip-opacity: 0.1;
   grid-template-areas:
     'binder ...        ...     ...'
     'binder pb-actions times   actions'
-    'binder pb-actions title   next'
+    'binder pb-actions title   title'
     'binder pb-actions estatus estatus'
     'binder ...        ...     ...';
 
@@ -127,15 +127,30 @@ $skip-opacity: 0.1;
 .eventTimers {
   grid-area: times;
   display: flex;
+  align-items: center;
   gap: $block-clearance;
   height: 100%;
 }
 
-.eventTitle {
+.titleSection {
   grid-area: title;
-  overflow: hidden;
+  display: flex;
-  max-height: calc(2.5em + 2px);
+  align-items: center;
-  line-height: 1.25em;
+  justify-content: space-between;
+
+  .nextTag {
+    font-size: 1rem;
+    color: $orange-500;
+    letter-spacing: 0.03px;
+    font-weight: 600;
+  }
+
+  .eventTitle {
+    overflow: hidden;
+    max-height: calc(2.5em + 2px);
+    line-height: 1.25em;
+    flex: 1;
+  }
 }
 
 .eventActions {
@@ -146,10 +161,11 @@ $skip-opacity: 0.1;
 
 .progressBg {
   grid-area: progb;
-  border-radius: 2px;
+  border-radius: 1px;
   background-color: $gray-1100;
   opacity: 1;
   height: 100%;
+  overflow: hidden; /* clip foreground border radius*/
 }
 
 .progressBg.hidden {
@@ -184,15 +200,6 @@ $skip-opacity: 0.1;
   overflow-y: hidden;
 }
 
-.nextTag {
-  grid-area: next;
-  font-size: 1rem;
-  color: $orange-500;
-  letter-spacing: 0.03px;
-  font-weight: 600;
-  text-align: right;
-}
-
 .eventStatus {
   grid-area: status;
   display: flex;

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

@@ -40,7 +40,7 @@ interface EventBlockProps {
   previousEnd: MaybeNumber;
   colour: string;
   isPast: boolean;
-  next: boolean;
+  isNext: boolean;
   skip: boolean;
   loaded: boolean;
   hasCursor: boolean;
@@ -76,7 +76,7 @@ export default function EventBlock(props: EventBlockProps) {
     previousEnd,
     colour,
     isPast,
-    next,
+    isNext,
     skip = false,
     loaded,
     hasCursor,
@@ -240,7 +240,7 @@ export default function EventBlock(props: EventBlockProps) {
       className={blockClasses}
       ref={setNodeRef}
       style={dragStyle}
-      onMouseDown={handleFocusClick}
+      onClick={handleFocusClick}
       onContextMenu={onContextMenu}
       id='event-block'
     >
@@ -268,7 +268,7 @@ export default function EventBlock(props: EventBlockProps) {
           title={title}
           note={note}
           delay={delay}
-          next={next}
+          isNext={isNext}
           skip={skip}
           loaded={loaded}
           playback={playback}

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

@@ -41,7 +41,7 @@ interface EventBlockInnerProps {
   title: string;
   note: string;
   delay: number;
-  next: boolean;
+  isNext: boolean;
   skip: boolean;
   loaded: boolean;
   playback?: Playback;
@@ -63,7 +63,7 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
     title,
     note,
     delay,
-    next,
+    isNext,
     skip = false,
     loaded,
     playback,
@@ -100,12 +100,14 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
           linkStart={linkStart}
         />
       </div>
-      <EditableBlockTitle title={title} eventId={eventId} placeholder='Event title' className={style.eventTitle} />
+      <div className={style.titleSection}>
-      {next && (
+        <EditableBlockTitle title={title} eventId={eventId} placeholder='Event title' className={style.eventTitle} />
-        <Tooltip label='Next event' {...tooltipProps}>
+        {isNext && (
-          <span className={style.nextTag}>UP NEXT</span>
+          <Tooltip label='Next event' {...tooltipProps}>
-        </Tooltip>
+            <span className={style.nextTag}>UP NEXT</span>
-      )}
+          </Tooltip>
+        )}
+      </div>
       <EventBlockPlayback
         eventId={eventId}
         skip={skip}
@@ -117,7 +119,7 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
       <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}`}>
-          {loaded && <EventBlockProgressBar playback={playback} />}
+          {loaded && <EventBlockProgressBar />}
         </div>
         <div className={style.eventStatus} tabIndex={-1}>
           <Tooltip label={`Time type: ${timerType}`} {...tooltipProps}>

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

@@ -10,6 +10,7 @@ $gap-left: calc(2rem + 0.25rem + 3rem);
 
   display: flex;
   gap: 0.5rem;
+  font-weight: 700;
 }
 
 @mixin indicator($bg-colour) {

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

@@ -1,4 +1,4 @@
-import { memo } from 'react';
+import { memo, MouseEvent } from 'react';
 import { IoPause } from '@react-icons/all-files/io5/IoPause';
 import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
 import { IoReload } from '@react-icons/all-files/io5/IoReload';
@@ -40,11 +40,13 @@ const EventBlockPlayback = (props: EventBlockPlaybackProps) => {
   const { eventId, skip, isPlaying, isPaused, loaded, disablePlayback } = props;
   const { updateEvent } = useEventAction();
 
-  const toggleSkip = () => {
+  const toggleSkip = (event: MouseEvent) => {
+    event.stopPropagation();
     updateEvent({ id: eventId, skip: !skip });
   };
 
-  const actionHandler = () => {
+  const actionHandler = (event: MouseEvent) => {
+    event.stopPropagation();
     // is playing -> pause
     // is paused -> continue
     // otherwise -> start
@@ -57,6 +59,11 @@ const EventBlockPlayback = (props: EventBlockPlaybackProps) => {
     }
   };
 
+  const load = (event: MouseEvent) => {
+    event.stopPropagation();
+    setEventPlayback.loadEvent(eventId);
+  };
+
   const buttonVariant: Partial<StyleVariant> = {};
 
   if (isPaused) {
@@ -103,7 +110,7 @@ const EventBlockPlayback = (props: EventBlockPlaybackProps) => {
         isDisabled={disablePlayback}
         {...tooltipProps}
         {...blockBtnStyle}
-        clickHandler={() => setEventPlayback.loadEvent(eventId)}
+        clickHandler={load}
         tabIndex={-1}
       />
       <TooltipActionBtn

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

@@ -5,20 +5,5 @@
 
   transition: 1s linear;
   transition-property: width;
-
+  background-color: $gray-200;
-  &.play {
-    background-color: $playback-start;
-  }
-
-  &.overtime {
-    background-color: $playback-negative;
-  }
-
-  &.pause {
-    background-color: $ontime-paused;
-  }
-
-  &.roll {
-    background-color: $ontime-roll;
-  }
 }

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

@@ -1,14 +1,10 @@
-import { MaybeNumber, Playback } from 'ontime-types';
+import { MaybeNumber } from 'ontime-types';
 
 import { useTimer } from '../../../../common/hooks/useSocket';
 import { clamp } from '../../../../common/utils/math';
 
 import style from './EventBlockProgressBar.module.scss';
 
-interface EventBlockProgressBarProps {
-  playback?: Playback;
-}
-
 export function getPercentComplete(remaining: MaybeNumber, total: MaybeNumber): number {
   if (remaining === null || total === null) {
     return 0;
@@ -25,10 +21,9 @@ export function getPercentComplete(remaining: MaybeNumber, total: MaybeNumber):
   return clamp(100 - (remaining * 100) / total, 0, 100);
 }
 
-export default function EventBlockProgressBar(props: EventBlockProgressBarProps) {
+export default function EventBlockProgressBar() {
-  const { playback } = props;
   const timer = useTimer();
 
   const progress = `${getPercentComplete(timer.current, timer.duration)}%`;
-  return <div className={`${style.progressBar} ${playback ? style[playback] : ''}`} style={{ width: progress }} />;
+  return <div className={style.progressBar} style={{ width: progress }} />;
 }

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

@@ -63,6 +63,7 @@
   font-size: calc(1rem - 3px);
   color: $label-gray;
   display: flex;
+  align-items: center;
   gap: 0.5rem;
   max-width: max-content;
   cursor: pointer;

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

@@ -135,7 +135,7 @@ const EventEditorTimes = (props: EventEditorTimesProps) => {
       <div>
         <span className={style.inputLabel}>Event Visibility</span>
         <label className={style.switchLabel}>
-          <Switch size='sm' isChecked={isPublic} onChange={() => handleSubmit('isPublic', isPublic)} variant='ontime' />
+          <Switch size='md' isChecked={isPublic} onChange={() => handleSubmit('isPublic', isPublic)} variant='ontime' />
           {isPublic ? 'Public' : 'Private'}
         </label>
       </div>

apps/client/src/features/rundown/rundown-header/RundownHeader.tsx

@@ -22,15 +22,16 @@ export default function RundownHeader() {
     <div className={style.header}>
       <ButtonGroup isAttached>
         <TooltipActionBtn
-          variant={appMode === AppMode.Freeze ? 'ontime-filled' : 'ontime-ghosted'}
+          variant={appMode === AppMode.Freeze ? 'ontime-filled' : 'ontime-outlined'}
           size='sm'
           icon={<IoSnowOutline />}
           clickHandler={setFreezeMode}
           tooltip='Freeze rundown'
           aria-label='Freeze rundown'
+          isDisabled
         />
         <TooltipActionBtn
-          variant={appMode === AppMode.Run ? 'ontime-filled' : 'ontime-ghosted'}
+          variant={appMode === AppMode.Run ? 'ontime-filled' : 'ontime-outlined'}
           size='sm'
           icon={<IoPlay />}
           clickHandler={setRunMode}
@@ -38,7 +39,7 @@ export default function RundownHeader() {
           aria-label='Run mode'
         />
         <TooltipActionBtn
-          variant={appMode === AppMode.Edit ? 'ontime-filled' : 'ontime-ghosted'}
+          variant={appMode === AppMode.Edit ? 'ontime-filled' : 'ontime-outlined'}
           size='sm'
           icon={<IoOptions />}
           clickHandler={setEditMode}
@@ -47,7 +48,7 @@ export default function RundownHeader() {
         />
       </ButtonGroup>
       <RundownMenu>
-        <MenuButton size='sm' as={Button} rightIcon={<IoAdd />} aria-label='Rundown menu' variant='ontime-ghosted'>
+        <MenuButton size='sm' as={Button} rightIcon={<IoAdd />} aria-label='Rundown menu' variant='ontime-outlined'>
           Rundown
         </MenuButton>
       </RundownMenu>

apps/client/src/features/rundown/time-input-flow/TimeInputFlow.module.scss

@@ -26,4 +26,5 @@
   color: $blue-500;
   margin-right: 0.5rem;
   font-size: 1.5em;
+  display: grid;
 }

apps/client/src/features/viewers/timer/Timer.scss

@@ -30,6 +30,19 @@
     transition: $viewer-transition-time;
   }
 
+  .blackout {
+    position: absolute;
+    width: 100vw;
+    height: 100vh;
+    background-color: #000;
+    z-index: 2;
+    opacity: 0;
+    transition: opacity $viewer-transition-time;
+    &--active {
+      opacity: 1;
+    }
+  }
+
   /* =================== CLOCK ===================*/
 
   .clock-container {

apps/client/src/features/viewers/timer/Timer.tsx

@@ -145,7 +145,7 @@ export default function Timer(props: TimerProps) {
   }
   const stageTimerCharacters = display.replace('/:/g', '').length;
 
-  const baseClasses = `stage-timer ${isMirrored ? 'mirror' : ''} ${showBlackout ? 'blackout' : ''}`;
+  const baseClasses = `stage-timer ${isMirrored ? 'mirror' : ''}`;
   let timerFontSize = 89 / (stageTimerCharacters - 1);
   // we need to shrink the timer if the external is going to be there
   if (showExternal) {
@@ -162,6 +162,7 @@ export default function Timer(props: TimerProps) {
     <div className={showFinished ? `${baseClasses} stage-timer--finished` : baseClasses} data-testid='timer-view'>
       <NavigationMenu />
       <ViewParamsEditor paramFields={timerOptions} />
+      <div className={showBlackout ? 'blackout blackout--active' : 'blackout'} />
       {!userOptions.hideMessage && (
         <div className={showOverlay ? 'message-overlay message-overlay--active' : 'message-overlay'}>
           <div className={`message ${showBlinking ? 'blink' : ''}`}>{pres.text}</div>

apps/client/src/index.scss

@@ -33,8 +33,19 @@ html,
   background-color: $bg-container-l1;
 }
 
-// workaround for chakra
+/* smaller root size for MacOS laptops */
-// // https://github.com/chakra-ui/chakra-ui/issues/417
+@media (max-width: 1600px) {
+  body,
+  html,
+  .App {
+    font-size: 14px;
+  }
+}
+
+/**
+ * workaround for chakra
+ * https://github.com/chakra-ui/chakra-ui/issues/417
+ */
 option {
   color: initial;
 }

apps/client/src/theme/_viewerCommon.scss

@@ -1,7 +1,3 @@
 .mirror {
   transform: rotate(180deg);
 }
-
-.blackout {
-  opacity: 0;
-}

apps/client/src/theme/ontimeTextInputs.ts

@@ -3,6 +3,7 @@ const commonStyles = {
   backgroundColor: '#262626', // $gray-1200
   color: '#e2e2e2', // $gray-200
   border: '1px solid transparent',
+  borderRadius: '3px',
   _hover: {
     backgroundColor: '#2d2d2d', // $gray-1100
   },
@@ -25,6 +26,18 @@ export const ontimeInputFilled = {
   },
 };
 
+export const ontimeInputGhosted = {
+  field: {
+    ...commonStyles,
+    backgroundColor: 'transparent',
+    color: '#f6f6f6', // $gray-50
+    _hover: {
+      backgroundColor: 'transparent', // $gray-1100
+      border: '1px solid #2B5ABC', // $blue-500
+    },
+  },
+};
+
 export const ontimeInputFilledOnLight = {
   field: {
     backgroundColor: 'white',

apps/client/src/theme/theme.ts

@@ -23,6 +23,7 @@ import { ontimeTab } from './ontimeTab';
 import {
   ontimeInputFilled,
   ontimeInputFilledOnLight,
+  ontimeInputGhosted,
   ontimeTextAreaFilled,
   ontimeTextAreaFilledOnLight,
   ontimeTextAreaTransparent,
@@ -71,6 +72,7 @@ const theme = extendTheme({
       },
       variants: {
         'ontime-filled': { ...ontimeInputFilled },
+        'ontime-ghosted': { ...ontimeInputGhosted },
         'ontime-filled-on-light': { ...ontimeInputFilledOnLight },
       },
     },

apps/electron/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ontime",
+  "name": "ontime-prerelease",
   "version": "3.0.0-alpha",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
@@ -29,8 +29,8 @@
     "cleanup": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   },
   "build": {
-    "productName": "ontime",
+    "productName": "ontime-prerelease",
-    "appId": "no.lightdev.ontime",
+    "appId": "no.lightdev.ontime.prerelease",
     "asar": true,
     "dmg": {
       "artifactName": "ontime-macOS-${arch}.dmg",

apps/electron/src/menu/applicationMenu.js

@@ -121,6 +121,12 @@ function getApplicationMenu(isMac, askToQuit) {
                 await shell.openExternal('http://localhost:4001/cuesheet');
               },
             },
+            {
+              label: 'Operator',
+              click: async () => {
+                await shell.openExternal('http://localhost:4001/operator');
+              },
+            },
           ],
         },
         { type: 'separator' },
@@ -153,7 +159,7 @@ function getApplicationMenu(isMac, askToQuit) {
         {
           label: 'Online documentation',
           click: async () => {
-            await shell.openExternal('https://ontime.gitbook.io/');
+            await shell.openExternal('https://docs.getontime.no/');
           },
         },
       ],

apps/server/src/api-integration/integration.controller.ts

@@ -85,13 +85,13 @@ const actionHandlers: Record<string, ActionHandler> = {
         return { payload: 'success' };
       }
       if ('id' in payload) {
-        assert.isString(payload);
+        assert.isString(payload.id);
-        runtimeService.startById(payload);
+        runtimeService.startById(payload.id);
         return { payload: 'success' };
       }
       if ('cue' in payload) {
-        assert.isString(payload);
+        assert.isString(payload.cue);
-        runtimeService.startByCue(payload);
+        runtimeService.startByCue(payload.cue);
         return { payload: 'success' };
       }
     }

apps/server/src/external/demo/app.js

@@ -48,7 +48,7 @@ const connectSocket = () => {
     // we only need to read message type of ontime
     if (type === 'ontime') {
       // destructure known data from ontime
-      // see https://cpvalente.gitbook.io/ontime/control-and-feedback/websocket-api
+      // see https://docs.getontime.no/api/osc-and-ws/
       const { timer, playback } = payload;
       const timerElement = document.getElementById('timer');
       if (playback == 'stop') {

apps/server/src/external/demo/index.html

@@ -10,5 +10,5 @@
 
 <body>
     <div id="timer"></div>
-    <script src="./app.js" type="module"></script>
+    <script src="./app.js" type="text/javascript"></script>
 </html>

apps/server/src/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { initAssets, startIntegrations, startOSCServer, startServer } from './app.js';
 
 async function startOntime() {

apps/server/src/services/TimerService.ts

@@ -142,17 +142,18 @@ function broadcastResult(_target: any, _propertyKey: string, descriptor: Propert
     const isTimeToUpdate = state.clock - TimerService.previousUpdate >= TimerService._updateInterval;
 
     // some changes need an immediate update
+    const hasNewLoaded = state.eventNow?.id !== TimerService.previousState?.eventNow?.id;
     const hasSkippedBack = state.clock < TimerService.previousUpdate;
     const justStarted = !TimerService.previousState?.timer;
     const hasChangedPlayback = TimerService.previousState.timer?.playback !== state.timer.playback;
-    const hasImmediateChanges = hasSkippedBack || justStarted || hasChangedPlayback;
+    const hasImmediateChanges = hasNewLoaded || hasSkippedBack || justStarted || hasChangedPlayback;
 
     if (hasImmediateChanges || (isTimeToUpdate && !deepEqual(TimerService.previousState?.timer, state.timer))) {
       eventStore.set('timer', state.timer);
       TimerService.previousState.timer = { ...state.timer };
     }
 
-    if (isTimeToUpdate && !deepEqual(TimerService.previousState?.runtime, state.runtime)) {
+    if (hasChangedPlayback || (isTimeToUpdate && !deepEqual(TimerService.previousState?.runtime, state.runtime))) {
       eventStore.set('runtime', state.runtime);
       TimerService.previousState.runtime = { ...state.runtime };
     }

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

@@ -1387,6 +1387,9 @@ describe('getRuntimeOffset()', () => {
       _timer: {
         pausedAt: null,
       },
+      runtime: {
+        actualStart: 150,
+      },
     } as RuntimeState;
 
     const offset = getRuntimeOffset(state);
@@ -1408,6 +1411,9 @@ describe('getRuntimeOffset()', () => {
       _timer: {
         pausedAt: null,
       },
+      runtime: {
+        actualStart: 100,
+      },
     } as RuntimeState;
 
     const offset = getRuntimeOffset(state);
@@ -1430,9 +1436,116 @@ describe('getRuntimeOffset()', () => {
       _timer: {
         pausedAt: 125,
       },
+      runtime: {
+        actualStart: 100,
+      },
     } as RuntimeState;
 
     const offset = getRuntimeOffset(state);
     expect(offset).toBe(25);
   });
+
+  it('can only count once started', () => {
+    const state = {
+      clock: 78480789,
+      eventNow: {
+        id: 'd6a2ce',
+        type: 'event',
+        title: '',
+        timeStart: 77400000,
+        timeEnd: 81000000,
+        duration: 3600000,
+        timeStrategy: 'lock-duration',
+        linkStart: null,
+        endAction: 'none',
+        timerType: 'count-down',
+        isPublic: true,
+        skip: false,
+        note: '',
+        colour: '',
+        cue: '1',
+        revision: 0,
+        timeWarning: 120000,
+        timeDanger: 60000,
+        custom: {},
+        delay: 0,
+      },
+      runtime: {
+        selectedEventIndex: 0,
+        numEvents: 2,
+        offset: -77400000,
+        plannedStart: 77400000,
+        plannedEnd: 84600000,
+        actualStart: null,
+        expectedEnd: null,
+      },
+      timer: {
+        addedTime: 0,
+        current: 3600000,
+        duration: 3600000,
+        elapsed: null,
+        expectedFinish: null,
+        finishedAt: null,
+        playback: 'armed',
+        secondaryTimer: null,
+        startedAt: null,
+      },
+      _timer: { pausedAt: null, secondaryTarget: null, finishedNow: false },
+    } as RuntimeState;
+
+    const offset = getRuntimeOffset(state);
+    expect(offset).toBe(null);
+  });
+
+  it('handles loaded event', () => {
+    const state = {
+      clock: 79521653,
+      eventNow: {
+        id: '835242',
+        type: 'event',
+        title: '',
+        timeStart: 81000000,
+        timeEnd: 84600000,
+        duration: 3600000,
+        timeStrategy: 'lock-duration',
+        linkStart: null,
+        endAction: 'none',
+        timerType: 'count-down',
+        isPublic: true,
+        skip: false,
+        note: '',
+        colour: '',
+        cue: '2',
+        revision: 0,
+        timeWarning: 120000,
+        timeDanger: 60000,
+        custom: {},
+        delay: 0,
+      },
+      runtime: {
+        selectedEventIndex: 1,
+        numEvents: 2,
+        offset: -81000000,
+        plannedStart: 77400000,
+        plannedEnd: 84600000,
+        actualStart: 79443403,
+        expectedEnd: null,
+      },
+      timer: {
+        addedTime: 0,
+        current: 3600000,
+        duration: 3600000,
+        elapsed: null,
+        expectedFinish: null,
+        finishedAt: null,
+        playback: 'armed',
+        secondaryTimer: null,
+        startedAt: null,
+      },
+      _timer: { pausedAt: null, secondaryTarget: null, finishedNow: false },
+    } as RuntimeState;
+
+    const offset = getRuntimeOffset(state);
+    expect(offset).toBe(79521653 - 81000000);
+  });
 });

apps/server/src/services/project-service/ProjectService.ts

@@ -14,6 +14,7 @@ import { appStateService } from '../app-state-service/AppStateService.js';
 import { ensureDirectory, getFilesFromFolder, removeFileExtension } from '../../utils/fileManagement.js';
 import { dbModel } from '../../models/dataModel.js';
 import { deleteFile } from '../../utils/parserUtils.js';
+import { switchDb } from '../../setup/loadDb.js';
 
 // init dependencies
 init();
@@ -40,6 +41,9 @@ export async function applyProjectFile(filePath: string, options?: Options) {
   const newFilePath = join(resolveProjectsDirectory, filename);
   await rename(filePath, newFilePath);
 
+  // change LowDB to point to new file
+  await switchDb(filename);
+
   // apply data model
   await applyDataModel(data, options);
 
@@ -135,6 +139,9 @@ export async function createProjectFile(filename: string, projectData: ProjectDa
   const newFile = join(resolveProjectsDirectory, filename);
   await writeFile(newFile, JSON.stringify(data));
 
+  // change LowDB to point to new file
+  await switchDb(filename);
+
   // apply its data
   await applyDataModel(data);
 

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

@@ -191,10 +191,7 @@ class RuntimeService {
     }
 
     const timedEvents = getPlayableEvents();
-    const state = runtimeState.getState();
+    const success = runtimeState.load(event, timedEvents);
-    // TODO: return success boolean from runtimeState, when we work with optimising integrations
-    runtimeState.load(event, timedEvents);
-    const success = event.id === state.eventNow?.id;
 
     if (success) {
       integrationService.dispatch(TimerLifeCycle.onLoad);

apps/server/src/services/timerUtils.ts

@@ -292,20 +292,27 @@ export const updateRoll = (state: RuntimeState) => {
 
 /**
  * Calculates difference between the runtime and the schedule of an event
+ * Positive offset is a delay
+ * Negative offset is time ahead
  * @param state
  * @returns
  */
-export function getRuntimeOffset(state: RuntimeState): number {
+export function getRuntimeOffset(state: RuntimeState): MaybeNumber {
-  if (state.eventNow === null) {
+  if (state.runtime.actualStart === null) {
-    return 0;
+    return null;
   }
-
+  const { clock } = state;
   const { timeStart } = state.eventNow;
   const { addedTime, current, startedAt } = state.timer;
 
+  // if we havent started, the offset is the difference to the schedule
+  if (startedAt === null) {
+    return clock - timeStart;
+  }
+
   const overtime = Math.min(current, 0);
   const startOffset = startedAt - timeStart;
-  const pausedTime = state._timer.pausedAt === null ? 0 : state.clock - state._timer.pausedAt;
+  const pausedTime = state._timer.pausedAt === null ? 0 : clock - state._timer.pausedAt;
 
   return startOffset + addedTime + pausedTime + Math.abs(overtime);
 }

apps/server/src/setup/index.ts

@@ -97,7 +97,8 @@ const lastLoadedProject = isTest ? 'db.json' : getLastLoadedProject();
 
 // path to public db
 export const resolveDbDirectory = join(testDbStartDirectory, isTest ? `../${config.database.testdb}` : config.projects);
-export const resolveDbPath = join(resolveDbDirectory, lastLoadedProject ? lastLoadedProject : config.database.filename);
+export const resolveDbName = lastLoadedProject ? lastLoadedProject : config.database.filename;
+export const resolveDbPath = join(resolveDbDirectory, resolveDbName);
 
 export const pathToStartDb = isTest
   ? join(srcDirectory, '..', config.database.testdb, config.database.filename)

apps/server/src/setup/loadDb.ts

@@ -8,7 +8,7 @@ import { join } from 'path';
 import { ensureDirectory } from '../utils/fileManagement.js';
 import { dbModel } from '../models/dataModel.js';
 
-import { pathToStartDb, resolveDbDirectory, resolveDbPath } from './index.js';
+import { pathToStartDb, resolveDbDirectory, resolveDbName } from './index.js';
 import { parseProjectFile } from '../services/project-service/projectFileUtils.js';
 import { parseJson } from '../utils/parser.js';
 
@@ -16,25 +16,25 @@ import { parseJson } from '../utils/parser.js';
  * @description ensures directories exist and populates database
  * @return {string} - path to db file
  */
-const populateDb = (): string => {
+const populateDb = (directory: string, filename: string): string => {
-  // if everything goes well, the DB in disk is the one loaded
+  ensureDirectory(directory);
-  let dbInDisk = resolveDbPath;
+  let dbPath = join(directory, filename);
-  ensureDirectory(resolveDbDirectory);
 
+  // if everything goes well, the DB in disk is the one loaded
   // if dbInDisk doesn't exist we want to use startup db
-  if (!existsSync(dbInDisk)) {
+  if (!existsSync(dbPath)) {
     try {
       const dbDirectory = resolveDbDirectory;
       const newFileDirectory = join(dbDirectory, pathToStartDb.split('/').pop());
 
       copyFileSync(pathToStartDb, newFileDirectory);
-      dbInDisk = newFileDirectory;
+      dbPath = newFileDirectory;
     } catch (_) {
       /* we do not handle this */
     }
   }
 
-  return dbInDisk;
+  return dbPath;
 };
 
 /**
@@ -55,10 +55,9 @@ const parseDatabase = async (fileToRead: string, adapterToUse: Low<DatabaseModel
 
 /**
  * @description loads ontime db
- * @return {Promise<{data: (*), db: Low<unknown>}>}
  */
-async function loadDb() {
+async function loadDb(directory: string, filename: string) {
-  const dbInDisk = populateDb();
+  const dbInDisk = populateDb(directory, filename);
 
   const adapter = new JSONFile<DatabaseModel>(dbInDisk);
   const db = new Low(adapter, dbModel);
@@ -72,12 +71,24 @@ async function loadDb() {
 
 export let db = {} as Low<DatabaseModel>;
 export let data = {} as DatabaseModel;
-export const dbLoadingProcess = loadDb();
+export const dbLoadingProcess = loadDb(resolveDbDirectory, resolveDbName);
 
+/**
+ * Initialises database at known location
+ */
 const init = async () => {
   const dbProvider = await dbLoadingProcess;
   db = dbProvider.db;
   data = dbProvider.data;
 };
 
+/**
+ * Allows to switch the database to a new file
+ */
+export const switchDb = async (newFileName: string) => {
+  const { db: newDb, data: newData } = await loadDb(resolveDbDirectory, newFileName);
+  db = newDb;
+  data = newData;
+};
+
 init();

apps/server/src/stores/__tests__/runtimeState.test.ts

@@ -177,7 +177,7 @@ describe('mutation on runtimeState', () => {
       stop();
       newState = getState();
       expect(newState.runtime.actualStart).toBeNull();
-      expect(newState.runtime.offset).toBe(0);
+      expect(newState.runtime.offset).toBeNull();
       expect(newState.runtime.expectedEnd).toBeNull();
     });
 

apps/server/src/stores/runtimeState.ts

@@ -17,7 +17,7 @@ import { timerConfig } from '../config/config.js';
 const initialRuntime: Runtime = {
   selectedEventIndex: null,
   numEvents: 0,
-  offset: 0,
+  offset: null,
   plannedStart: 0,
   plannedEnd: 0,
   actualStart: null,
@@ -128,7 +128,11 @@ export function updateRundownData(playableRundown: OntimeEvent[]) {
  * @param rundown
  * @param initialData
  */
-export function load(event: OntimeEvent, rundown: OntimeEvent[], initialData?: Partial<TimerState & RestorePoint>) {
+export function load(
+  event: OntimeEvent,
+  rundown: OntimeEvent[],
+  initialData?: Partial<TimerState & RestorePoint>,
+): boolean {
   clear();
 
   updateRundownData(rundown);
@@ -153,9 +157,11 @@ export function load(event: OntimeEvent, rundown: OntimeEvent[], initialData?: P
     if (firstStart === null || typeof firstStart === 'number') {
       runtimeState.runtime.actualStart = firstStart;
       runtimeState.runtime.offset = getRuntimeOffset(runtimeState);
-      runtimeState.runtime.expectedEnd = runtimeState.runtime.plannedEnd + runtimeState.runtime.offset;
+      runtimeState.runtime.expectedEnd = (runtimeState.runtime.plannedEnd + runtimeState.runtime.offset) % dayInMs;
     }
   }
+
+  return event.id === runtimeState.eventNow?.id;
 }
 
 export function loadNow(event: OntimeEvent, playableEvents: OntimeEvent[]) {
@@ -329,7 +335,9 @@ export function addTime(amount: number) {
 
   // update runtime delays: over - under
   runtimeState.runtime.offset = getRuntimeOffset(runtimeState);
-  runtimeState.runtime.expectedEnd = runtimeState.runtime.plannedEnd + runtimeState.runtime.offset;
+  if (runtimeState.runtime.offset !== null) {
+    runtimeState.runtime.expectedEnd = (runtimeState.runtime.plannedEnd + runtimeState.runtime.offset) % dayInMs;
+  }
   return true;
 }
 

apps/server/src/utils/parser.ts

@@ -15,8 +15,6 @@ import {
   OntimeEvent,
   OntimeRundown,
   SupportedEvent,
-  EndAction,
-  TimerType,
   TimeStrategy,
   CustomFields,
   EventCustomFields,
@@ -325,8 +323,8 @@ export function createPatch(originalEvent: OntimeEvent, patchEvent: Partial<Onti
     duration,
     timeStrategy,
     linkStart: validateLinkStart(maybeLinkStart),
-    endAction: validateEndAction(patchEvent.endAction, EndAction.None),
+    endAction: validateEndAction(patchEvent.endAction, originalEvent.endAction),
-    timerType: validateTimerType(patchEvent.timerType, TimerType.CountDown),
+    timerType: validateTimerType(patchEvent.timerType, originalEvent.timerType),
     isPublic: typeof patchEvent.isPublic === 'boolean' ? patchEvent.isPublic : originalEvent.isPublic,
     skip: typeof patchEvent.skip === 'boolean' ? patchEvent.skip : originalEvent.skip,
     note: makeString(patchEvent.note, originalEvent.note),

e2e/tests/000-upload-showfile.spec.ts

@@ -1,4 +1,4 @@
-import { test } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
 const fileToUpload = 'e2e/tests/fixtures/test-db.json';
 
@@ -20,7 +20,12 @@ test('test project file upload', async ({ page }) => {
   await page.getByRole('button', { name: 'close' }).click();
 
   // asset test events
-  await page.getByText('Albania').click();
+  const firstTitle = page.getByTestId('entry-1').getByTestId('block__title')
-  await page.getByText('Latvia').click();
+  await expect(firstTitle).toHaveValue('Albania');
-  await page.getByText('Lithuania').click();
+
+  const secondTitle = page.getByTestId('entry-2').getByTestId('block__title')
+  await expect(secondTitle).toHaveValue('Latvia');
+
+  const thirdTitle = page.getByTestId('entry-3').getByTestId('block__title')
+  await expect(thirdTitle).toHaveValue('Lithuania');
 });

e2e/tests/features/203-delay-block.spec.ts

@@ -64,11 +64,11 @@ test('delays are show correctly', async ({ page }) => {
   await page.getByTestId('rundown').getByTestId('time-input-duration').click();
   await page.getByTestId('rundown').getByTestId('time-input-duration').fill('10');
   await page.getByTestId('rundown').getByTestId('time-input-duration').press('Enter');
-  await page.getByText('Event title').click();
+  await page.getByTestId('block__title').click();
-  await page.getByPlaceholder('Event title').fill('test');
+  await page.getByTestId('block__title').fill('test');
-  await page.getByPlaceholder('Event title').press('Enter');
+  await page.getByTestId('block__title').press('Enter');
 
-  await page.getByTestId('entry-1').getByText('test').click({ button: 'right' });
+  await page.locator('#event-block').getByText('1').click({ button: 'right' });
   await page.getByRole('menuitem', { name: 'Toggle public' }).click();
 
   // add a delay

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

@@ -3,7 +3,7 @@ import { MaybeNumber } from '../../utils/utils.type.js';
 export type Runtime = {
   numEvents: number;
   selectedEventIndex: MaybeNumber;
-  offset: number;
+  offset: MaybeNumber;
   plannedStart: MaybeNumber;
   actualStart: MaybeNumber;
   plannedEnd: MaybeNumber;