bump to v3.4.2

Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@getontime/cli",
-    "version": "3.4.0",
+    "version": "3.4.2",
     "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.4.0",
+  "version": "3.4.2",
   "private": true,
   "type": "module",
   "dependencies": {

apps/electron/package.json

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

apps/server/package.json

@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "exports": "./src/index.js",
   "dependencies": {
     "@googleapis/sheets": "^5.0.5",

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

@@ -1,4 +1,11 @@
-import { ErrorResponse, MessageResponse, OntimeRundownEntry, RundownCached, RundownPaginated } from 'ontime-types';
+import {
+  ErrorResponse,
+  MessageResponse,
+  OntimeRundown,
+  OntimeRundownEntry,
+  RundownCached,
+  RundownPaginated,
+} from 'ontime-types';
 import { getErrorMessage } from 'ontime-utils';
 
 import { Request, Response } from 'express';
@@ -21,6 +28,11 @@ import {
   getRundown,
 } from '../../services/rundown-service/rundownUtils.js';
 
+export async function rundownGetAll(_req: Request, res: Response<OntimeRundown>) {
+  const rundown = getRundown();
+  res.json(rundown);
+}
+
 export async function rundownGetNormalised(_req: Request, res: Response<RundownCached>) {
   const cachedRundown = getNormalisedRundown();
   res.json(cachedRundown);

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

@@ -5,6 +5,7 @@ import {
   rundownApplyDelay,
   rundownBatchPut,
   rundownDelete,
+  rundownGetAll,
   rundownGetById,
   rundownGetNormalised,
   rundownGetPaginated,
@@ -26,7 +27,8 @@ import {
 
 export const router = express.Router();
 
-router.get('/', rundownGetPaginatedQueryParams, rundownGetPaginated); // not used in Ontime frontend
+router.get('/', rundownGetAll); // not used in Ontime frontend
+router.get('/paginated', rundownGetPaginatedQueryParams, rundownGetPaginated); // not used in Ontime frontend
 router.get('/normalised', rundownGetNormalised);
 router.get('/:eventId', paramsMustHaveEventId, rundownGetById); // not used in Ontime frontend
 

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

@@ -54,18 +54,15 @@ const actionHandlers: Record<string, ActionHandler> = {
       if (typeof property !== 'string' || value === undefined) {
         throw new Error('Invalid property or value');
       }
-
       // parseProperty is async because of the data lock
-      parseProperty(property, value).then((newObjectProperty) => {
+      const newObjectProperty = parseProperty(property, value);
-        const key = Object.keys(newObjectProperty)[0] as keyof OntimeEvent;
+      const key = Object.keys(newObjectProperty)[0] as keyof OntimeEvent;
-        shouldThrottle = willCauseRegeneration(key) || shouldThrottle;
+      shouldThrottle = shouldThrottle || willCauseRegeneration(key);
-
+      if (patchEvent.custom && newObjectProperty.custom) {
-        if (patchEvent.custom && newObjectProperty.custom) {
+        Object.assign(patchEvent.custom, newObjectProperty.custom);
-          Object.assign(patchEvent.custom, newObjectProperty.custom);
+      } else {
-        } else {
+        Object.assign(patchEvent, newObjectProperty);
-          Object.assign(patchEvent, newObjectProperty);
+      }
-        }
-      });
     });
 
     if (shouldThrottle) {

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

@@ -42,7 +42,7 @@ const propertyConversion = {
   timeEnd: (value: unknown) => clampDuration(coerceNumber(value)),
 };
 
-export async function parseProperty(property: string, value: unknown) {
+export function parseProperty(property: string, value: unknown) {
   if (property.startsWith('custom:')) {
     const customKey = property.split(':')[1].toLocaleLowerCase(); // all custom fields keys are lowercase
     const customFields = getDataProvider().getCustomFields();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "Time keeping for live events",
   "keywords": [
     "ontime",