Merge remote-tracking branch 'nrk/release52' into upstream/feat/properties-panel

Author: Mint de Wit

meteor/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.51.6](///compare/v1.51.5...v1.51.6) (2025-01-14)
+
+
+### Features
+
+* add more logging 8c16ce8
+
+
+### Bug Fixes
+
+* Include previousPartInstance in check to orphan segments rather than remove them. 51b7104
+* only run onPart/PiecePlaybackStarted/Stopped on current, next or previous parts a9fe401
+* **PoGw:** filter log output to ensure that message field in JSONL output is never an object 0d2b844
+* set nextPartInstance to null if it's referring to a Segment that has been removed b1045f9
+* updatePartInstancesSegmentIds: take into account when multiple segments have been merged into one. b769157
+
+### [1.51.5](///compare/v1.51.4...v1.51.5) (2025-01-07)
+
+
+### Bug Fixes
+
+* **job-worker/playout:** Hold mode doesn't work at all a7d6999
+
 ### [1.51.4](///compare/v1.51.3...v1.51.4) (2024-12-04)
 
 

meteor/__mocks__/defaultCollectionObjects.ts

@@ -113,6 +113,7 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			allowHold: false,
 			allowPieceDirectPlay: false,
 			enableBuckets: false,
+			enableEvaluationForm: true,
 		}),
 		_rundownVersionHash: '',
 		routeSetsWithOverrides: wrapDefaultObject({}),

meteor/__mocks__/meteor.ts

@@ -195,9 +195,6 @@ export namespace MeteorMock {
 		// but it'll do for now:
 		return callAsync(methodName, ...args)
 	}
-	export function absoluteUrl(path?: string): string {
-		return path + '' // todo
-	}
 	export function setTimeout(fcn: () => void | Promise<void>, time: number): number {
 		return $.setTimeout(() => {
 			Promise.resolve()

meteor/server/api/rest/v1/playlists.ts

@@ -275,7 +275,8 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 		connection: Meteor.Connection,
 		event: string,
 		rundownPlaylistId: RundownPlaylistId,
-		delta: number
+		delta: number,
+		ignoreQuickLoop?: boolean
 	): Promise<ClientAPI.ClientResponse<PartId | null>> {
 		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
 			this.context.getMethodContext(connection),
@@ -291,6 +292,7 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 				playlistId: rundownPlaylistId,
 				partDelta: delta,
 				segmentDelta: 0,
+				ignoreQuickLoop,
 			}
 		)
 	}

meteor/server/api/rest/v1/typeConversion.ts

@@ -372,6 +372,7 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): Comple
 		allowHold: apiStudioSettings.allowHold ?? true, // Backwards compatible
 		allowPieceDirectPlay: apiStudioSettings.allowPieceDirectPlay ?? true, // Backwards compatible
 		enableBuckets: apiStudioSettings.enableBuckets ?? true, // Backwards compatible
+		enableEvaluationForm: apiStudioSettings.enableEvaluationForm ?? true, // Backwards compatible
 	}
 }
 
@@ -396,6 +397,7 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): Complete<APISt
 		allowHold: settings.allowHold,
 		allowPieceDirectPlay: settings.allowPieceDirectPlay,
 		enableBuckets: settings.enableBuckets,
+		enableEvaluationForm: settings.enableEvaluationForm,
 	}
 }
 

meteor/server/api/studio/api.ts

@@ -55,6 +55,7 @@ export async function insertStudioInner(organizationId: OrganizationId | null, n
 				allowHold: false,
 				allowPieceDirectPlay: false,
 				enableBuckets: true,
+				enableEvaluationForm: true,
 			}),
 			_rundownVersionHash: '',
 			routeSetsWithOverrides: wrapDefaultObject({}),

meteor/server/api/userActions.ts

@@ -191,7 +191,8 @@ class ServerUserActionAPI
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
 		partDelta: number,
-		segmentDelta: number
+		segmentDelta: number,
+		ignoreQuickLoop: boolean | null
 	) {
 		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
 			this,
@@ -208,6 +209,7 @@ class ServerUserActionAPI
 				playlistId: rundownPlaylistId,
 				partDelta: partDelta,
 				segmentDelta: segmentDelta,
+				ignoreQuickLoop: ignoreQuickLoop ?? undefined,
 			}
 		)
 	}

meteor/server/lib.ts

@@ -4,6 +4,7 @@ import fs from 'fs'
 import path from 'path'
 import { logger } from './logging'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { Meteor } from 'meteor/meteor'
 
 /** Returns absolute path to programs/server directory of your compiled application, without trailing slash. */
 export function getAbsolutePath(): string {
@@ -27,7 +28,10 @@ export function extractFunctionSignature(f: Function): string[] | undefined {
 export type Translations = Record<string, string>
 
 // The /public directory in a Meteor app
-export const public_dir = path.join(process.cwd(), '../web.browser/app')
+export const public_dir = Meteor.isProduction
+	? path.join(process.cwd(), '../web.browser/app')
+	: // In development, find the webui package and use its public directory
+	  path.join(process.cwd(), '../../../../../../packages/webui/public')
 
 /**
  * Get the i18next locale object for a given `languageCode`. If the translations file can not be found or it can't be

meteor/server/lib/rest/v1/playlists.ts

@@ -109,12 +109,14 @@ export interface PlaylistsRestAPI {
 	 * @param event User event string
 	 * @param rundownPlaylistId Playlist to target.
 	 * @param delta Amount to move next point by (+/-)
+	 * @param ignoreQuickLoop When moving the next part it should ignore any of the boundaries set by the QuickLoop feature
 	 */
 	moveNextPart(
 		connection: Meteor.Connection,
 		event: string,
 		rundownPlaylistId: RundownPlaylistId,
-		delta: number
+		delta: number,
+		ignoreQuickLoop?: boolean
 	): Promise<ClientAPI.ClientResponse<PartId | null>>
 	/**
 	 * Moves the next Segment point by `delta` places. Negative values are allowed to move "backwards" in the script.

meteor/server/lib/rest/v1/studios.ts

@@ -221,4 +221,5 @@ export interface APIStudioSettings {
 	allowHold?: boolean
 	allowPieceDirectPlay?: boolean
 	enableBuckets?: boolean
+	enableEvaluationForm?: boolean
 }