Merge branch 'upstream/studio-settings-for-features' of github.com:bbc/sofie-core into release52

nytamin · nytamin · commit 45fa3d2ffb8c · 2024-12-10T14:50:49.000+01:00
diff --git a/meteor/__mocks__/defaultCollectionObjects.ts b/meteor/__mocks__/defaultCollectionObjects.ts
@@ -110,6 +110,9 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			mediaPreviewsUrl: '',
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
 			fallbackPartDuration: DEFAULT_FALLBACK_PART_DURATION,
+			allowHold: false,
+			allowPieceDirectPlay: false,
+			enableBuckets: false,
 		},
 		_rundownVersionHash: '',
 		routeSetsWithOverrides: wrapDefaultObject({}),
diff --git a/meteor/server/api/rest/v1/typeConversion.ts b/meteor/server/api/rest/v1/typeConversion.ts
@@ -19,7 +19,7 @@ import {
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBStudio, IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { assertNever, getRandomId, literal } from '@sofie-automation/corelib/dist/lib'
+import { assertNever, Complete, getRandomId, literal } from '@sofie-automation/corelib/dist/lib'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import {
 	applyAndValidateOverrides,
@@ -333,7 +333,7 @@ export async function studioFrom(apiStudio: APIStudio, existingId?: StudioId): P
 	}
 }
 
-export async function APIStudioFrom(studio: DBStudio): Promise<APIStudio> {
+export async function APIStudioFrom(studio: DBStudio): Promise<Complete<APIStudio>> {
 	const studioSettings = APIStudioSettingsFrom(studio.settings)
 
 	return {
@@ -346,7 +346,7 @@ export async function APIStudioFrom(studio: DBStudio): Promise<APIStudio> {
 	}
 }
 
-export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): IStudioSettings {
+export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): Complete<IStudioSettings> {
 	return {
 		frameRate: apiStudioSettings.frameRate,
 		mediaPreviewsUrl: apiStudioSettings.mediaPreviewsUrl,
@@ -362,10 +362,14 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): IStudi
 		enableQuickLoop: apiStudioSettings.enableQuickLoop,
 		forceQuickLoopAutoNext: forceQuickLoopAutoNextFrom(apiStudioSettings.forceQuickLoopAutoNext),
 		fallbackPartDuration: apiStudioSettings.fallbackPartDuration ?? DEFAULT_FALLBACK_PART_DURATION,
+		allowAdlibTestingSegment: apiStudioSettings.allowAdlibTestingSegment,
+		allowHold: apiStudioSettings.allowHold ?? true, // Backwards compatible
+		allowPieceDirectPlay: apiStudioSettings.allowPieceDirectPlay ?? true, // Backwards compatible
+		enableBuckets: apiStudioSettings.enableBuckets ?? true, // Backwards compatible
 	}
 }
 
-export function APIStudioSettingsFrom(settings: IStudioSettings): APIStudioSettings {
+export function APIStudioSettingsFrom(settings: IStudioSettings): Complete<APIStudioSettings> {
 	return {
 		frameRate: settings.frameRate,
 		mediaPreviewsUrl: settings.mediaPreviewsUrl,
@@ -381,6 +385,10 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): APIStudioSetti
 		enableQuickLoop: settings.enableQuickLoop,
 		forceQuickLoopAutoNext: APIForceQuickLoopAutoNextFrom(settings.forceQuickLoopAutoNext),
 		fallbackPartDuration: settings.fallbackPartDuration,
+		allowAdlibTestingSegment: settings.allowAdlibTestingSegment,
+		allowHold: settings.allowHold,
+		allowPieceDirectPlay: settings.allowPieceDirectPlay,
+		enableBuckets: settings.enableBuckets,
 	}
 }
 
diff --git a/meteor/server/api/studio/api.ts b/meteor/server/api/studio/api.ts
@@ -48,6 +48,9 @@ export async function insertStudioInner(organizationId: OrganizationId | null, n
 				frameRate: 25,
 				mediaPreviewsUrl: '',
 				minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+				allowHold: false,
+				allowPieceDirectPlay: false,
+				enableBuckets: true,
 			},
 			_rundownVersionHash: '',
 			routeSetsWithOverrides: wrapDefaultObject({}),
diff --git a/meteor/server/lib/rest/v1/studios.ts b/meteor/server/lib/rest/v1/studios.ts
@@ -214,4 +214,8 @@ export interface APIStudioSettings {
 	forceQuickLoopAutoNext?: 'disabled' | 'enabled_when_valid_duration' | 'enabled_forcing_min_duration'
 	minimumTakeSpan?: number
 	fallbackPartDuration?: number
+	allowAdlibTestingSegment?: boolean
+	allowHold?: boolean
+	allowPieceDirectPlay?: boolean
+	enableBuckets?: boolean
 }
diff --git a/meteor/server/migration/0_1_0.ts b/meteor/server/migration/0_1_0.ts
@@ -441,6 +441,9 @@ export const addSteps = addMigrationSteps('0.1.0', [
 					frameRate: 25,
 					mediaPreviewsUrl: '',
 					minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+					allowHold: false,
+					allowPieceDirectPlay: false,
+					enableBuckets: true,
 				},
 				mappingsWithOverrides: wrapDefaultObject({}),
 				blueprintConfigWithOverrides: wrapDefaultObject({}),
diff --git a/meteor/server/migration/X_X_X.ts b/meteor/server/migration/X_X_X.ts
@@ -187,4 +187,41 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 			}
 		},
 	},
+
+	{
+		id: `add studio settings allowHold & allowPieceDirectPlay`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({
+				$or: [
+					{ 'settings.allowHold': { $exists: false } },
+					{ 'settings.allowPieceDirectPlay': { $exists: false } },
+				],
+			})
+
+			if (studios.length > 0) {
+				return 'studios must have settings.allowHold and settings.allowPieceDirectPlay defined'
+			}
+
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({
+				$or: [
+					{ 'settings.allowHold': { $exists: false } },
+					{ 'settings.allowPieceDirectPlay': { $exists: false } },
+				],
+			})
+
+			for (const studio of studios) {
+				// Populate the settings to be backwards compatible
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						'settings.allowHold': true,
+						'settings.allowPieceDirectPlay': true,
+					},
+				})
+			}
+		},
+	},
 ])
diff --git a/meteor/server/migration/__tests__/migrations.test.ts b/meteor/server/migration/__tests__/migrations.test.ts
@@ -126,6 +126,9 @@ describe('Migrations', () => {
 							mediaPreviewsUrl: '',
 							frameRate: 25,
 							minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+							allowHold: true,
+							allowPieceDirectPlay: true,
+							enableBuckets: true,
 						},
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
@@ -164,6 +167,9 @@ describe('Migrations', () => {
 							mediaPreviewsUrl: '',
 							frameRate: 25,
 							minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+							allowHold: true,
+							allowPieceDirectPlay: true,
+							enableBuckets: true,
 						},
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
@@ -202,6 +208,9 @@ describe('Migrations', () => {
 							mediaPreviewsUrl: '',
 							frameRate: 25,
 							minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+							allowHold: true,
+							allowPieceDirectPlay: true,
+							enableBuckets: true,
 						},
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
diff --git a/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts b/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts
@@ -167,9 +167,7 @@ describe('lib/mediaObjects', () => {
 	test('getAcceptedFormats', () => {
 		const acceptedFormats = getAcceptedFormats({
 			supportedMediaFormats: '1920x1080i5000, 1280x720, i5000, i5000tff',
-			mediaPreviewsUrl: '',
 			frameRate: 25,
-			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
 		})
 		expect(acceptedFormats).toEqual([
 			['1920', '1080', 'i', '5000', undefined],
@@ -252,6 +250,9 @@ describe('lib/mediaObjects', () => {
 			supportedAudioStreams: '4',
 			frameRate: 25,
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+			allowHold: false,
+			allowPieceDirectPlay: false,
+			enableBuckets: false,
 		}
 
 		const mockDefaultStudio = defaultStudio(protectString('studio0'))
diff --git a/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts b/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts
@@ -147,7 +147,9 @@ export function acceptFormat(format: string, formats: Array<Array<string>>): boo
  * 	[undefined, undefined, i, 5000, tff]
  * ]
  */
-export function getAcceptedFormats(settings: IStudioSettings | undefined): Array<Array<string>> {
+export function getAcceptedFormats(
+	settings: Pick<IStudioSettings, 'supportedMediaFormats' | 'frameRate'> | undefined
+): Array<Array<string>> {
 	const formatsConfigField = settings ? settings.supportedMediaFormats : ''
 	const formatsString: string =
 		(formatsConfigField && formatsConfigField !== '' ? formatsConfigField : '1920x1080i5000') + ''
diff --git a/packages/corelib/src/dataModel/Studio.ts b/packages/corelib/src/dataModel/Studio.ts
@@ -88,6 +88,24 @@ export interface IStudioSettings {
 	 * Default: 3000
 	 */
 	fallbackPartDuration?: number
+
+	/**
+	 * Whether to allow hold operations for Rundowns in this Studio
+	 * When disabled, any action-triggers that would normally trigger a hold operation will be silently ignored
+	 * This should only block entering hold, to ensure Sofie doesn't get stuck if it somehow gets into hold
+	 */
+	allowHold: boolean
+
+	/**
+	 * Whether to allow direct playing of a piece in the rundown
+	 * This behaviour is usally triggered by double-clicking on a piece in the GUI
+	 */
+	allowPieceDirectPlay: boolean
+
+	/**
+	 * Enable buckets - the default behavior is to have buckets.
+	 */
+	enableBuckets: boolean
 }
 
 export type StudioLight = Omit<DBStudio, 'mappingsWithOverrides' | 'blueprintConfigWithOverrides'>
diff --git a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts
@@ -107,6 +107,9 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			mediaPreviewsUrl: '',
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
 			allowAdlibTestingSegment: true,
+			allowHold: true,
+			allowPieceDirectPlay: true,
+			enableBuckets: true,
 		},
 		routeSetsWithOverrides: wrapDefaultObject({}),
 		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
diff --git a/packages/job-worker/src/blueprints/__tests__/config.test.ts b/packages/job-worker/src/blueprints/__tests__/config.test.ts
@@ -15,6 +15,9 @@ describe('Test blueprint config', () => {
 				mediaPreviewsUrl: '',
 				frameRate: 25,
 				minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+				allowHold: true,
+				allowPieceDirectPlay: true,
+				enableBuckets: true,
 			},
 			blueprintConfigWithOverrides: wrapDefaultObject({ sdfsdf: 'one', another: 5 }),
 		})
@@ -38,6 +41,9 @@ describe('Test blueprint config', () => {
 				mediaPreviewsUrl: '',
 				frameRate: 25,
 				minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+				allowHold: true,
+				allowPieceDirectPlay: true,
+				enableBuckets: true,
 			},
 			blueprintConfigWithOverrides: wrapDefaultObject({ sdfsdf: 'one', another: 5 }),
 		})
diff --git a/packages/job-worker/src/playout/adlibJobs.ts b/packages/job-worker/src/playout/adlibJobs.ts
@@ -35,6 +35,12 @@ import { PlayoutPieceInstanceModel } from './model/PlayoutPieceInstanceModel'
  * Play an existing Piece in the Rundown as an AdLib
  */
 export async function handleTakePieceAsAdlibNow(context: JobContext, data: TakePieceAsAdlibNowProps): Promise<void> {
+	if (!context.studio.settings.allowPieceDirectPlay) {
+		// Piece direct play isn't allowed, making this a noop
+		logger.debug(`Piece direct play isn't allowed, skipping`)
+		return
+	}
+
 	return runJobWithPlayoutModel(
 		context,
 		data,
diff --git a/packages/job-worker/src/playout/holdJobs.ts b/packages/job-worker/src/playout/holdJobs.ts
@@ -5,11 +5,18 @@ import { ActivateHoldProps, DeactivateHoldProps } from '@sofie-automation/coreli
 import { JobContext } from '../jobs'
 import { runJobWithPlayoutModel } from './lock'
 import { updateTimeline } from './timeline/generate'
+import { logger } from '../logging'
 
 /**
  * Activate Hold
  */
 export async function handleActivateHold(context: JobContext, data: ActivateHoldProps): Promise<void> {
+	if (!context.studio.settings.allowHold) {
+		// Hold isn't allowed, making this a noop
+		logger.debug(`Hold isn't allowed, skipping`)
+		return
+	}
+
 	return runJobWithPlayoutModel(
 		context,
 		data,
@@ -59,6 +66,8 @@ export async function handleActivateHold(context: JobContext, data: ActivateHold
  * Deactivate Hold
  */
 export async function handleDeactivateHold(context: JobContext, data: DeactivateHoldProps): Promise<void> {
+	// This should be possible even when hold is not allowed, as it is a way to get out of a stuck state
+
 	return runJobWithPlayoutModel(
 		context,
 		data,
diff --git a/packages/openapi/api/definitions/studios.yaml b/packages/openapi/api/definitions/studios.yaml
@@ -546,6 +546,15 @@ components:
         fallbackPartDuration:
           type: number
           description: The duration to apply on too short Parts Within QuickLoop when forceQuickLoopAutoNext is set to `enabled_forcing_min_duration`
+        allowAdlibTestingSegment:
+          type: boolean
+          description: Whether to allow adlib testing mode, before a Part is playing in a Playlist
+        allowHold:
+          type: boolean
+          description: Whether to allow hold operations for Rundowns in this Studio
+        allowPieceDirectPlay:
+          type: boolean
+          description: Whether to allow direct playing of a piece in the rundown
 
       required:
         - frameRate
diff --git a/packages/webui/src/__mocks__/defaultCollectionObjects.ts b/packages/webui/src/__mocks__/defaultCollectionObjects.ts
@@ -105,6 +105,9 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			frameRate: 25,
 			mediaPreviewsUrl: '',
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+			allowHold: true,
+			allowPieceDirectPlay: true,
+			enableBuckets: true,
 		},
 		_rundownVersionHash: '',
 		routeSetsWithOverrides: wrapDefaultObject({}),
diff --git a/packages/webui/src/client/ui/RundownView.tsx b/packages/webui/src/client/ui/RundownView.tsx
@@ -1051,7 +1051,7 @@ const RundownHeader = withTranslation()(
 									{this.props.playlist.activationId ? (
 										<MenuItem onClick={(e) => this.take(e)}>{t('Take')}</MenuItem>
 									) : null}
-									{this.props.playlist.activationId ? (
+									{this.props.studio.settings.allowHold && this.props.playlist.activationId ? (
 										<MenuItem onClick={(e) => this.hold(e)}>{t('Hold')}</MenuItem>
 									) : null}
 									{this.props.playlist.activationId && canClearQuickLoop ? (
@@ -1457,7 +1457,8 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 		rundownHeaderLayoutId: protectString((params['rundownHeaderLayout'] as string) || ''),
 		miniShelfLayoutId: protectString((params['miniShelfLayout'] as string) || ''),
 		shelfDisplayOptions: {
-			enableBuckets: displayOptions.includes('buckets'),
+			// If buckets are enabled in Studiosettings, it can also be filtered in the URLs display options.
+			enableBuckets: !!studio?.settings.enableBuckets && displayOptions.includes('buckets'),
 			enableLayout: displayOptions.includes('layout') || displayOptions.includes('shelfLayout'),
 			enableInspector: displayOptions.includes('inspector'),
 		},
@@ -2234,7 +2235,8 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 				item &&
 				item.instance &&
 				this.props.playlist &&
-				this.props.playlist.currentPartInfo
+				this.props.playlist.currentPartInfo &&
+				this.props.studio?.settings.allowPieceDirectPlay
 			) {
 				const idToCopy = item.instance.isTemporary ? item.instance.piece._id : item.instance._id
 				const playlistId = this.props.playlist._id
diff --git a/packages/webui/src/client/ui/Settings/Studio/Generic.tsx b/packages/webui/src/client/ui/Settings/Studio/Generic.tsx

Original file line number	Diff line number	Diff line change
`@@ -214,4 +214,8 @@ export interface APIStudioSettings {`
`214`	`214`	`forceQuickLoopAutoNext?: 'disabled' \| 'enabled_when_valid_duration' \| 'enabled_forcing_min_duration'`
`215`	`215`	`minimumTakeSpan?: number`
`216`	`216`	`fallbackPartDuration?: number`
	`217`	`+ allowAdlibTestingSegment?: boolean`
	`218`	`+ allowHold?: boolean`
	`219`	`+ allowPieceDirectPlay?: boolean`
	`220`	`+ enableBuckets?: boolean`
`217`	`221`	`}`