Allow AB display settings to be set by blueprints

And add a reset button in the UI to return them to the blueprints
default state,

Author: rjmunro

meteor/server/migration/upgrades/showStyleBase.ts

@@ -129,17 +129,28 @@ export async function runUpgradeForShowStyleBase(showStyleBaseId: ShowStyleBaseI
 
 	const result = blueprintManifest.applyConfig(blueprintContext, rawBlueprintConfig)
 
-	await ShowStyleBases.updateAsync(showStyleBaseId, {
-		$set: {
-			'sourceLayersWithOverrides.defaults': normalizeArray(result.sourceLayers, '_id'),
-			'outputLayersWithOverrides.defaults': normalizeArray(result.outputLayers, '_id'),
-			lastBlueprintConfig: {
-				blueprintHash: blueprint.blueprintHash,
-				blueprintId: blueprint._id,
-				blueprintConfigPresetId: showStyleBase.blueprintConfigPresetId ?? '',
-				config: rawBlueprintConfig,
-			},
+	const updateSet: Record<string, any> = {
+		'sourceLayersWithOverrides.defaults': normalizeArray(result.sourceLayers, '_id'),
+		'outputLayersWithOverrides.defaults': normalizeArray(result.outputLayers, '_id'),
+		lastBlueprintConfig: {
+			blueprintHash: blueprint.blueprintHash,
+			blueprintId: blueprint._id,
+			blueprintConfigPresetId: showStyleBase.blueprintConfigPresetId ?? '',
+			config: rawBlueprintConfig,
 		},
+	}
+
+	// Store the blueprint-defined abChannelDisplay config if provided
+	if (result.abChannelDisplay !== undefined) {
+		updateSet.blueprintAbChannelDisplay = result.abChannelDisplay
+		// Initialize abChannelDisplay from blueprint if not already set by user
+		if (!showStyleBase.abChannelDisplay) {
+			updateSet.abChannelDisplay = result.abChannelDisplay
+		}
+	}
+
+	await ShowStyleBases.updateAsync(showStyleBaseId, {
+		$set: updateSet,
 	})
 
 	await updateTriggeredActionsForShowStyleBaseId(showStyleBaseId, result.triggeredActions)
@@ -153,6 +164,7 @@ async function loadShowStyleAndBlueprint(showStyleBaseId: ShowStyleBaseId) {
 			blueprintConfigPresetId: 1,
 			blueprintConfigWithOverrides: 1,
 			lastBlueprintFixUpHash: 1,
+			abChannelDisplay: 1,
 		},
 	})) as
 		| Pick<
@@ -161,6 +173,7 @@ async function loadShowStyleAndBlueprint(showStyleBaseId: ShowStyleBaseId) {
 				| 'blueprintId'
 				| 'blueprintConfigPresetId'
 				| 'blueprintConfigWithOverrides'
+				| 'abChannelDisplay'
 				| 'lastBlueprintFixUpHash'
 		  >
 		| undefined

packages/blueprints-integration/src/api/showStyle.ts

@@ -36,7 +36,7 @@ import type {
 	IBlueprintPiece,
 	IBlueprintPart,
 } from '../documents/index.js'
-import type { IBlueprintShowStyleVariant, IOutputLayer, ISourceLayer } from '../showStyle.js'
+import type { IBlueprintShowStyleVariant, IOutputLayer, ISourceLayer, SourceLayerType } from '../showStyle.js'
 import type { TSR, OnGenerateTimelineObj, TimelineObjectCoreExt } from '../timeline.js'
 import type { IBlueprintConfig } from '../common.js'
 import type { ReadonlyDeep } from 'type-fest'
@@ -322,6 +322,19 @@ export interface BlueprintResultApplyShowStyleConfig {
 	outputLayers: IOutputLayer[]
 
 	triggeredActions: IBlueprintTriggeredActions[]
+
+	/** Configuration for displaying AB resolver channel assignments */
+	abChannelDisplay?: {
+		/** Source layer IDs that should show AB channel info */
+		sourceLayerIds: string[]
+		/** Configure by source layer type */
+		sourceLayerTypes: SourceLayerType[]
+		/** Only show for specific output layers (e.g., only PGM) */
+		outputLayerIds: string[]
+		/** Enable display on Director screen */
+		showOnDirectorScreen: boolean
+		// Future: showOnPresenterScreen, showOnCameraScreen when those views are implemented
+	}
 }
 
 export interface IShowStyleConfigPreset<TConfig = IBlueprintConfig> {

packages/corelib/src/dataModel/ShowStyleBase.ts

@@ -61,6 +61,14 @@ export interface DBShowStyleBase {
 		// Future: showOnPresenterScreen, showOnCameraScreen when those views are implemented
 	}
 
+	/** Blueprint default for abChannelDisplay (saved during blueprint upgrade) */
+	blueprintAbChannelDisplay?: {
+		sourceLayerIds: string[]
+		sourceLayerTypes: SourceLayerType[]
+		outputLayerIds: string[]
+		showOnDirectorScreen: boolean
+	}
+
 	_rundownVersionHash: string
 
 	/** Details on the last blueprint used to generate the defaults values for this */

packages/webui/src/client/ui/Settings/ShowStyle/AbChannelDisplay.scss

@@ -1,4 +1,10 @@
 .ab-channel-display {
+	&__header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
 	&__section {
 		margin-top: 1rem;
 

packages/webui/src/client/ui/Settings/ShowStyle/AbChannelDisplay.tsx

@@ -6,6 +6,8 @@ import { useCallback, useMemo } from 'react'
 import { SourceLayers, OutputLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { ColumnPackedGrid, ColumnPackedGridGroup, ColumnPackedGridItem } from '../components/ColumnPackedGrid'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faSync } from '@fortawesome/free-solid-svg-icons'
 import '../components/ColumnPackedGrid.scss'
 import './AbChannelDisplay.scss'
 
@@ -45,12 +47,27 @@ export function AbChannelDisplaySettings({ showStyleBase }: Readonly<AbChannelDi
 		[]
 	)
 
-	const config = showStyleBase.abChannelDisplay ?? {
-		sourceLayerIds: [],
-		sourceLayerTypes: [SourceLayerType.VT, SourceLayerType.LIVE_SPEAK],
-		outputLayerIds: [],
-		showOnDirectorScreen: false,
-	}
+	const blueprintDefault = showStyleBase.blueprintAbChannelDisplay
+	const config = showStyleBase.abChannelDisplay ??
+		blueprintDefault ?? {
+			sourceLayerIds: [],
+			sourceLayerTypes: [SourceLayerType.VT, SourceLayerType.LIVE_SPEAK],
+			outputLayerIds: [],
+			showOnDirectorScreen: false,
+		}
+
+	// Check if current config differs from blueprint default
+	const hasOverrides = useMemo(() => {
+		if (!blueprintDefault || !showStyleBase.abChannelDisplay) return false
+
+		const current = showStyleBase.abChannelDisplay
+		return (
+			JSON.stringify(current.sourceLayerIds.sort()) !== JSON.stringify(blueprintDefault.sourceLayerIds.sort()) ||
+			JSON.stringify(current.sourceLayerTypes.sort()) !== JSON.stringify(blueprintDefault.sourceLayerTypes.sort()) ||
+			JSON.stringify(current.outputLayerIds.sort()) !== JSON.stringify(blueprintDefault.outputLayerIds.sort()) ||
+			current.showOnDirectorScreen !== blueprintDefault.showOnDirectorScreen
+		)
+	}, [showStyleBase.abChannelDisplay, blueprintDefault])
 
 	const updateConfig = useCallback(
 		(updates: Partial<NonNullable<DBShowStyleBase['abChannelDisplay']>>) => {
@@ -71,6 +88,14 @@ export function AbChannelDisplaySettings({ showStyleBase }: Readonly<AbChannelDi
 		[showStyleBase._id, config]
 	)
 
+	const resetToBlueprint = useCallback(() => {
+		ShowStyleBases.update(showStyleBase._id, {
+			$unset: {
+				abChannelDisplay: 1,
+			},
+		})
+	}, [showStyleBase._id])
+
 	const toggleDirectorScreen = useCallback(() => {
 		updateConfig({ showOnDirectorScreen: !config.showOnDirectorScreen })
 	}, [updateConfig, config.showOnDirectorScreen])
@@ -161,7 +186,21 @@ export function AbChannelDisplaySettings({ showStyleBase }: Readonly<AbChannelDi
 
 	return (
 		<div className="studio-edit ab-channel-display">
-			<h2>{t('AB Resolver Channel Display')}</h2>
+			<div className="ab-channel-display__header">
+				<h2>{t('AB Resolver Channel Display')}</h2>
+				{blueprintDefault && (
+					<button
+						type="button"
+						className="btn btn-primary"
+						onClick={resetToBlueprint}
+						title={t('Reset to default')}
+						disabled={!hasOverrides}
+					>
+						<span>{t('Reset')}</span>
+						<FontAwesomeIcon icon={faSync} />
+					</button>
+				)}
+			</div>
 			<p>
 				{t(
 					'Configure which pieces should display their assigned AB resolver channel (e.g., "Server A") on various screens. This helps operators identify which video server is playing each clip.'