V3 (#657)

* refactor: cleanup routes * style: smaller base font * chore: upgrade dependencies * chore: lock node version to electron * refactor: pass HTTP to integration controller (#652) * refactor: deprecate onair control * refactor: remove playback router * Several project files user folder (#617) * chore: automated screenshots (#667) * feat: app settings (#658) * refactor: remove deprecated event data (#674) * Studio clock (#663) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Feat: reorder events with alt+ctrl + arrow up/down (#645) * Warning and danger per event (#677) --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * refactor: stabilise actionHandler (#683) Co-authored-by: Fabian Posenau <fabian@fphome.de> * improvement: hide seconds (#675) * wip: overview (#688) * fix: focus cursor (#695) * refactor: update lower third (#665) * Refactor/time formatting (#696) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * feat: multiple selection (#703) --------- Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Alex <ac@omnivox.dk> * fix: test - go to `Edit mode` befor tying to click `Event options` button (#708) * refactor: runtime service (#715) * fix: issue with loosing cursor position on message (#719) * remove info panel (#721) * Event editor continue (#722) * update API - part (#709) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * refactor: update timers (#729) * feat: many timers (#706) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * refactor: excel cleanup (#734) * refactor: allow import of blocks and skip import (#735) * Project manager (#697) * refactor: UI for linking events (#763) * upgraded pipeline actions (#777) * Over under (#771) * custom fields (#744) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Sheets settings (#774) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * style: tweaks to lower thirds (#785) * refactor: delays account for gaps (#784) * refactor: partial state updates (#780) * feat: generate crash report (#787) * Sheet use limited input device auth flow (#782) --------- Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Custom fields views (#789) * refactor: deprecate presenter and subtitle (#795) * refactor: organise API around resources (#798) --------- Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> * Time to end (#804) * Skip fixes (#805) * fix: onair derives from playback * Param nav (#822) --------- Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> * refactor: download files from interface (#831) * Quick options (#814) * End pause (#832) * chore: bump node version in docker (#834) * refactor: follow in run mode (#840) * fix: uncaught error in http integration (#837) * Apply project (#843) Co-authored-by: Matteo Gheza <matteo.gheza07@gmail.com> Co-authored-by: Ary <arylmoraesn@gmail.com> Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Alex Rohleder <alexrohleder96@gmail.com> Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> Co-authored-by: Fabian Posenau <fabianpos99+github@gmail.com>
2026-08-17 13:23:35 +00:00 · 2024-04-13 10:06:46 +02:00
parent debdbd1c5a
commit 55d1aca9b6
640 changed files with 26702 additions and 21623 deletions
@@ -0,0 +1,25 @@
+/**
+ * encapsulate logic related to showing a clock timer
+ */
+
+import { MaybeNumber } from 'ontime-types';
+
+import { formatTime } from '../../../../common/utils/time';
+import { FORMAT_12, FORMAT_24 } from '../../../../viewerConfig';
+import SuperscriptTime from '../superscript-time/SuperscriptTime';
+
+interface ClockTimeProps {
+  value: MaybeNumber;
+  preferredFormat12?: string;
+  preferredFormat24?: string;
+  className?: string;
+}
+
+export default function ClockTime(props: ClockTimeProps) {
+  const { value, preferredFormat12 = FORMAT_12, preferredFormat24 = FORMAT_24, className } = props;
+
+  // TODO: should we get the params from URL here to see if the user is overriding the default?
+  const formattedTime = formatTime(value, { format12: preferredFormat12, format24: preferredFormat24 });
+
+  return <SuperscriptTime className={className} time={formattedTime} />;
+}
@@ -0,0 +1,28 @@
+/**
+ * encapsulate logic related to showing a running timer
+ */
+
+import { MaybeNumber } from 'ontime-types';
+import { millisToString, removeLeadingZero, removeSeconds } from 'ontime-utils';
+
+interface RunningTimeProps {
+  value: MaybeNumber;
+  hideSeconds?: boolean;
+  hideLeadingZero?: boolean;
+  className?: string;
+}
+
+export default function RunningTime(props: RunningTimeProps) {
+  const { value, hideSeconds, hideLeadingZero, className } = props;
+  let formattedTime = millisToString(value);
+
+  if (hideLeadingZero) {
+    formattedTime = removeLeadingZero(formattedTime);
+  }
+
+  if (hideSeconds) {
+    formattedTime = removeSeconds(formattedTime);
+  }
+
+  return <div className={className}>{formattedTime}</div>;
+}
@@ -8,6 +8,9 @@ interface SuperscriptTimeProps {
  style?: CSSProperties;
 }

+/**
+ * @description receives a string like 12:00 AM and adds the period part to the superscript
+ */
 export default function SuperscriptTime(props: SuperscriptTimeProps) {
  const { time, className, style } = props;

@@ -0,0 +1,101 @@
+import { MaybeNumber, MaybeString, OntimeEvent, TimerType } from 'ontime-types';
+import { MILLIS_PER_MINUTE, MILLIS_PER_SECOND, millisToString, removeLeadingZero, removeSeconds } from 'ontime-utils';
+
+import type { ViewExtendedTimer } from '../../../common/models/TimeManager.type';
+import { timerPlaceholder, timerPlaceholderMin } from '../../../common/utils/styleUtils';
+
+type TimerTypeParams = Pick<ViewExtendedTimer, 'timerType' | 'current' | 'elapsed' | 'clock'>;
+
+export function getTimerByType(freezeEnd: boolean, timerObject?: TimerTypeParams): number | null {
+  if (!timerObject) {
+    return null;
+  }
+
+  switch (timerObject.timerType) {
+    case TimerType.CountDown:
+    case TimerType.TimeToEnd:
+      if (timerObject.current === null) {
+        return null;
+      }
+      return freezeEnd ? Math.max(timerObject.current, 0) : timerObject.current;
+    case TimerType.CountUp:
+      return Math.abs(timerObject.elapsed ?? 0);
+    case TimerType.Clock:
+      return timerObject.clock;
+    default: {
+      const exhaustiveCheck: never = timerObject.timerType;
+      return exhaustiveCheck;
+    }
+  }
+}
+
+export function isStringBoolean(text: string | null) {
+  if (text === null) {
+    return false;
+  }
+  return text?.toLowerCase() === 'true' || text === '1';
+}
+
+/**
+ * Retrieves a dynamic property from an event
+ * Considers custom fields
+ */
+export function getPropertyValue(event: OntimeEvent | null, property: MaybeString): string | undefined {
+  if (!event) {
+    return undefined;
+  }
+  if (typeof property !== 'string') {
+    return undefined;
+  }
+
+  if (property.startsWith('custom-')) {
+    const field = property.split('custom-')[1];
+    return event.custom?.[field]?.value;
+  }
+
+  return event[property as keyof OntimeEvent] as string;
+}
+
+export function capitaliseFirstLetter(string: string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+type FormattingOptions = {
+  removeSeconds: boolean;
+  removeLeadingZero: boolean;
+};
+
+export function getFormattedTimer(
+  timer: MaybeNumber,
+  timerType: TimerType,
+  localisedMinutes: string,
+  options: FormattingOptions,
+): string {
+  if (timer == null) {
+    return options.removeSeconds ? timerPlaceholderMin : timerPlaceholder;
+  }
+
+  let timeToParse = timer;
+
+  if (options.removeSeconds) {
+    const timerIsTimeOfDay = timerType === TimerType.Clock;
+    const isNegative = timeToParse < -MILLIS_PER_SECOND && !timerIsTimeOfDay && timerType !== TimerType.CountUp;
+    if (isNegative) {
+      // in negative numbers, we need to round down
+      timeToParse -= MILLIS_PER_MINUTE;
+    }
+  }
+
+  let display = millisToString(timeToParse);
+  display = removeLeadingZero(display);
+
+  if (options.removeSeconds) {
+    display = formatDisplayWithMinutes(display, localisedMinutes);
+  }
+  return display;
+}
+
+function formatDisplayWithMinutes(display: string, localisedMinutes: string): string {
+  display = removeSeconds(display);
+  return display.length < 3 ? `${display} ${localisedMinutes}` : display;
+}
@@ -1,43 +0,0 @@
-import { TimerType } from 'ontime-types';
-import { formatDisplay } from 'ontime-utils';
-
-import { TimeManagerType } from '../../../common/models/TimeManager.type';
-import { formatTime } from '../../../common/utils/time';
-
-const formatOptions = {
-  showSeconds: true,
-  format: 'hh:mm:ss a',
-};
-
-type TimerTypeParams = Pick<TimeManagerType, 'timerType' | 'current' | 'elapsed' | 'clock'>;
-
-export function getTimerByType(timerObject?: TimerTypeParams): string | number | null {
-  let timer = null;
-  if (!timerObject) {
-    return timer;
-  }
-
-  if (timerObject.timerType === TimerType.CountDown || timerObject.timerType === TimerType.TimeToEnd) {
-    timer = timerObject.current;
-  } else if (timerObject.timerType === TimerType.CountUp) {
-    timer = timerObject.elapsed;
-  } else if (timerObject.timerType === TimerType.Clock) {
-    timer = formatTime(timerObject.clock, formatOptions);
-  }
-
-  return timer;
-}
-
-export function formatTimerDisplay(timer?: string | number | null): string {
-  let display = '';
-
-  if (typeof timer === 'string') {
-    display = timer;
-  } else if (timer === null || typeof timer === 'undefined' || isNaN(timer)) {
-    display = '-- : -- : --';
-  } else {
-    display = formatDisplay(timer, true);
-  }
-
-  return display;
-}