Merge branch 'feat/option-to-disable-evaluation-form' into bbc-release52

bbc · Dec 17, 2024 · 10240cb · 10240cb
2 parents deae44f + e9f21fb
commit 10240cb
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 1 deletion.
diff --git a/meteor/__mocks__/defaultCollectionObjects.ts b/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({}),

diff --git a/meteor/server/api/rest/v1/typeConversion.ts b/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,
 	}
 }
 

diff --git a/meteor/server/api/studio/api.ts b/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({}),

diff --git a/meteor/server/lib/rest/v1/studios.ts b/meteor/server/lib/rest/v1/studios.ts
@@ -221,4 +221,5 @@ export interface APIStudioSettings {
 	allowHold?: boolean
 	allowPieceDirectPlay?: boolean
 	enableBuckets?: boolean
+	enableEvaluationForm: true
 }
diff --git a/meteor/server/migration/0_1_0.ts b/meteor/server/migration/0_1_0.ts
@@ -36,6 +36,7 @@ export const addSteps = addMigrationSteps('0.1.0', [
 					allowHold: false,
 					allowPieceDirectPlay: false,
 					enableBuckets: true,
+					enableEvaluationForm: true,
 				}),
 				mappingsWithOverrides: wrapDefaultObject({}),
 				blueprintConfigWithOverrides: wrapDefaultObject({}),

diff --git a/meteor/server/migration/X_X_X.ts b/meteor/server/migration/X_X_X.ts
@@ -513,6 +513,56 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 			}
 		},
 	},
+	{
+		id: `studios settings create default enableBuckets=true`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({
+				'settingsWithOverrides.defaults.enableBuckets': { $exists: false },
+			})
+			if (studios.length > 0) {
+				return 'studio is missing enableBuckets setting'
+			}
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({
+				'settingsWithOverrides.defaults.enableBuckets': { $exists: false },
+			})
+			for (const studio of studios) {
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						'settingsWithOverrides.defaults.enableBuckets': true,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `studios settings create default enableEvaluationForm=true`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({
+				'settingsWithOverrides.defaults.enableEvaluationForm': { $exists: false },
+			})
+			if (studios.length > 0) {
+				return 'studio is missing enableEvaluationForm setting'
+			}
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({
+				'settingsWithOverrides.defaults.enableEvaluationForm': { $exists: false },
+			})
+			for (const studio of studios) {
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						'settingsWithOverrides.defaults.enableEvaluationForm': true,
+					},
+				})
+			}
+		},
+	},
 ])
 
 interface PartialOldICoreSystem {

diff --git a/meteor/server/migration/__tests__/migrations.test.ts b/meteor/server/migration/__tests__/migrations.test.ts
@@ -118,6 +118,7 @@ describe('Migrations', () => {
 							allowHold: true,
 							allowPieceDirectPlay: true,
 							enableBuckets: true,
+							enableEvaluationForm: true,
 						}),
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
@@ -160,6 +161,7 @@ describe('Migrations', () => {
 							allowHold: true,
 							allowPieceDirectPlay: true,
 							enableBuckets: true,
+							enableEvaluationForm: true,
 						}),
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
@@ -202,6 +204,7 @@ describe('Migrations', () => {
 							allowHold: true,
 							allowPieceDirectPlay: true,
 							enableBuckets: true,
+							enableEvaluationForm: 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
@@ -252,6 +252,7 @@ describe('lib/mediaObjects', () => {
 			allowHold: false,
 			allowPieceDirectPlay: false,
 			enableBuckets: false,
+			enableEvaluationForm: false,
 		}
 
 		const mockDefaultStudio = defaultStudio(protectString('studio0'))

diff --git a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts
@@ -110,6 +110,7 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			allowHold: true,
 			allowPieceDirectPlay: true,
 			enableBuckets: true,
+			enableEvaluationForm: 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
@@ -18,6 +18,7 @@ describe('Test blueprint config', () => {
 				allowHold: true,
 				allowPieceDirectPlay: true,
 				enableBuckets: true,
+				enableEvaluationForm: true,
 			}),
 			blueprintConfigWithOverrides: wrapDefaultObject({ sdfsdf: 'one', another: 5 }),
 		})
@@ -44,6 +45,7 @@ describe('Test blueprint config', () => {
 				allowHold: true,
 				allowPieceDirectPlay: true,
 				enableBuckets: true,
+				enableEvaluationForm: true,
 			}),
 			blueprintConfigWithOverrides: wrapDefaultObject({ sdfsdf: 'one', another: 5 }),
 		})

diff --git a/packages/job-worker/src/playout/upgrade.ts b/packages/job-worker/src/playout/upgrade.ts
@@ -129,6 +129,7 @@ export async function handleBlueprintUpgradeForStudio(context: JobContext, _data
 		allowHold: true,
 		allowPieceDirectPlay: true,
 		enableBuckets: true,
+		enableEvaluationForm: true,
 	}
 
 	await context.directCollections.Studios.update(context.studioId, {

diff --git a/packages/shared-lib/src/core/model/StudioSettings.ts b/packages/shared-lib/src/core/model/StudioSettings.ts
@@ -86,4 +86,8 @@ export interface IStudioSettings {
 	 * Doubleclick changes behaviour as selector for userediting
 	 */
 	enableUserEdits?: boolean
+	/**
+	 * Enable evaluation form - the default behavior is to have evaluation forms.
+	 */
+	enableEvaluationForm: boolean
 }
diff --git a/packages/webui/src/__mocks__/defaultCollectionObjects.ts b/packages/webui/src/__mocks__/defaultCollectionObjects.ts
@@ -108,6 +108,7 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			allowHold: true,
 			allowPieceDirectPlay: true,
 			enableBuckets: true,
+			enableEvaluationForm: true,
 		}),
 		_rundownVersionHash: '',
 		routeSetsWithOverrides: wrapDefaultObject({}),

diff --git a/packages/webui/src/client/ui/RundownView.tsx b/packages/webui/src/client/ui/RundownView.tsx
@@ -3036,7 +3036,8 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 											<ErrorBoundary>
 												{this.props.matchedSegments &&
 													this.props.matchedSegments.length > 0 &&
-													this.props.userPermissions.studio && <AfterBroadcastForm playlist={playlist} />}
+													this.props.userPermissions.studio &&
+													studio.settings.enableEvaluationForm && <AfterBroadcastForm playlist={playlist} />}
 											</ErrorBoundary>
 											<ErrorBoundary>
 												<RundownHeader

diff --git a/packages/webui/src/client/ui/Settings/Studio/Generic.tsx b/packages/webui/src/client/ui/Settings/Studio/Generic.tsx
@@ -380,6 +380,16 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
 				{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
 			</LabelAndOverridesForCheckbox>
 
+			<LabelAndOverridesForCheckbox
+				label={t('Enable Evaluation Form')}
+				item={wrappedItem}
+				itemKey={'enableEvaluationForm'}
+				overrideHelper={overrideHelper}
+				hint={t('This enables or disables the evaluationform in the UI - enabled is the default behavior')}
+			>
+				{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
+			</LabelAndOverridesForCheckbox>
+
 			<LabelAndOverridesForCheckbox
 				label={t('Double click selection for properties panel')}
 				item={wrappedItem}