Merge branch 'main' into bbc-main-autonext

Author: PeterC89

packages/job-worker/src/ingest/__tests__/updateNext.test.ts

@@ -7,6 +7,7 @@ import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { saveIntoDb } from '../../db/changes.js'
 import { ensureNextPartIsValid as ensureNextPartIsValidRaw } from '../updateNext.js'
 import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js'
+import { setupMockShowStyleCompound } from '../../__mocks__/presetCollections.js'
 import { runJobWithPlayoutModel } from '../../playout/lock.js'
 
 jest.mock('../../playout/setNext')
@@ -538,6 +539,47 @@ describe('ensureNextPartIsValid', () => {
 			false
 		)
 	})
+	test('Next part instance is orphaned: "deleted" and `syncIngestUpdateToPartInstance` exists', async () => {
+		const showStyleCompound = await setupMockShowStyleCompound(context)
+		await context.mockCollections.Rundowns.update(rundownId, {
+			$set: {
+				showStyleBaseId: showStyleCompound._id,
+				showStyleVariantId: showStyleCompound.showStyleVariantId,
+			},
+		})
+		context.updateShowStyleBlueprint({
+			syncIngestUpdateToPartInstance: jest.fn(),
+		})
+
+		const instanceId: PartInstanceId = protectString('orphaned_first_part_with_callback')
+		await context.mockCollections.PartInstances.insertOne(
+			literal<DBPartInstance>({
+				_id: instanceId,
+				rundownId: rundownId,
+				segmentId: protectString('mock_segment1'),
+				playlistActivationId: protectString('active'),
+				segmentPlayoutId: protectString(''),
+				takeCount: 0,
+				rehearsal: false,
+				part: literal<DBPart>({
+					_id: protectString('orphan_with_callback_1'),
+					_rank: 1.5,
+					rundownId: rundownId,
+					segmentId: protectString('mock_segment1'),
+					externalId: 'o1-callback',
+					title: 'Orphan 1 Callback',
+					expectedDurationWithTransition: undefined,
+				}),
+				orphaned: 'deleted',
+			})
+		)
+
+		await resetPartIds(null, instanceId, false)
+
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
+
+		expect(setNextPartMock).not.toHaveBeenCalled()
+	})
 	test('Next part is invalid, but instance is not', async () => {
 		// Insert a temporary instance
 		const instanceId: PartInstanceId = protectString('orphaned_first_part')

packages/job-worker/src/ingest/updateNext.ts

@@ -5,8 +5,13 @@ import { setNextPart } from '../playout/setNext.js'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 
 /**
- * Make sure that the nextPartInstance for the current Playlist is still correct
- * This will often change the nextPartInstance
+ * Make sure that the nextPartInstance for the current Playlist is still correct.
+ * This will often change the nextPartInstance.
+ *
+ * If the selected next part has been deleted by ingest, the default behavior is to
+ * drop it and autoselect a replacement. If the show-style blueprint defines
+ * `syncIngestUpdateToPartInstance`, the deleted next part is kept selected here so
+ * the blueprint can decide whether to remove it or preserve it.
  * @param context Context of the job being run
  * @param playoutModel Playout Model to operate on
  * @returns Whether the timeline should be updated following this operation
@@ -43,14 +48,22 @@ export async function ensureNextPartIsValid(context: JobContext, playoutModel: P
 
 	const orderedSegments = playoutModel.getAllOrderedSegments()
 	const orderedParts = playoutModel.getAllOrderedParts()
+	const nextPartIsDeleted = nextPartInstance?.partInstance.orphaned === 'deleted'
 
-	if (!nextPartInstance || nextPartInstance.partInstance.orphaned === 'deleted') {
-		// Don't have a nextPart or it has been deleted, so autoselect something
+	if (nextPartIsDeleted && (await hasSyncIngestUpdateToPartInstance(context, playoutModel, nextPartInstance))) {
+		// Source has deleted this part, but it is selected as next.
+		// Keep it selected, and let blueprint function `syncIngestUpdateToPartInstance` decide what to do with it.
+		span?.end()
+		return false
+	}
+
+	if (!nextPartInstance || nextPartIsDeleted) {
+		// Don't have a nextPart, so autoselect something
 		const newNextPart = selectNextPart(
 			context,
 			playlist,
 			currentPartInstance?.partInstance ?? null,
-			nextPartInstance?.partInstance ?? null,
+			null,
 			orderedSegments,
 			orderedParts,
 			{ ignoreUnplayable: true, ignoreQuickLoop: false }
@@ -97,3 +110,26 @@ export async function ensureNextPartIsValid(context: JobContext, playoutModel: P
 	span?.end()
 	return false
 }
+
+async function hasSyncIngestUpdateToPartInstance(
+	context: JobContext,
+	playoutModel: PlayoutModel,
+	nextPartInstance: PlayoutModel['nextPartInstance']
+): Promise<boolean> {
+	if (!nextPartInstance) return false
+	const rundown = playoutModel.getRundown(nextPartInstance.partInstance.part.rundownId)
+	if (!rundown) return false
+	if (!rundown.rundown.showStyleVariantId) return false
+
+	try {
+		const showStyle = await context.getShowStyleCompound(
+			rundown.rundown.showStyleVariantId,
+			rundown.rundown.showStyleBaseId
+		)
+		const blueprint = await context.getShowStyleBlueprint(showStyle._id)
+
+		return !!blueprint.blueprint.syncIngestUpdateToPartInstance
+	} catch {
+		return false
+	}
+}

packages/webui/src/client/lib/collapseJSON.tsx

@@ -59,7 +59,7 @@ export function CollapseJSON({ json }: { json: string }): JSX.Element {
 				<Button
 					variant="light"
 					size="sm"
-					key={'collapse'}
+					key={'copy'}
 					className="collapse-json__copy"
 					tabIndex={0}
 					onClick={(e) => {

packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx

@@ -4,31 +4,22 @@ import { calculateTTimerDiff, calculateTTimerOverUnder } from '../../lib/tTimerU
 import { useTiming } from '../RundownView/RundownTiming/withTiming.js'
 import { OverUnderChip } from '../../lib/Components/OverUnderChip.js'
 import { Countdown } from '../RundownView/RundownHeader/Countdown.js'
+import { getCurrentTime } from '../../lib/systemTime.js'
 
 interface TTimerDisplayProps {
 	timer: RundownTTimer
 }
 
 export function TTimerDisplay({ timer }: Readonly<TTimerDisplayProps>): JSX.Element | null {
-	useTiming()
+	const timing = useTiming()
 
 	if (!timer.mode) return null
 
-	const now = Date.now()
+	const now = timing.currentTime ?? getCurrentTime()
 
 	const diff = calculateTTimerDiff(timer, now)
 	const overUnder = calculateTTimerOverUnder(timer, now)
-	const timeStr = RundownUtils.formatDiffToTimecode(
-		Math.abs(diff),
-		false,
-		true,
-		true,
-		false,
-		true,
-		undefined,
-		true,
-		true
-	)
+	const timeStr = RundownUtils.formatDiffToTimecode(Math.abs(diff), false, true, true, false, true)
 	const timerSign = diff >= 0 ? '' : '-'
 
 	return (

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx

@@ -4,6 +4,7 @@ import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
 import { RundownUtils } from '../../../lib/rundown.js'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderDurations({
 	playlist,
@@ -21,7 +22,7 @@ export function RundownHeaderDurations({
 
 	const estDuration = PlaylistTiming.getRemainingDuration(
 		playlist.timing,
-		timingDurations.currentTime ?? Date.now(),
+		timingDurations.currentTime ?? getCurrentTime(),
 		timingDurations.remainingPlaylistDuration,
 		startedPlayback
 	)

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx

@@ -3,6 +3,7 @@ import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTi
 import { useTranslation } from 'react-i18next'
 import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderExpectedEnd({
 	playlist,
@@ -14,7 +15,7 @@ export function RundownHeaderExpectedEnd({
 	const { t } = useTranslation()
 	const timingDurations = useTiming()
 
-	const now = timingDurations.currentTime ?? Date.now()
+	const now = timingDurations.currentTime ?? getCurrentTime()
 	const expectedEnd = PlaylistTiming.getExpectedEnd(playlist.timing)
 	const startedPlayback = playlist.activationId ? playlist.startedPlayback : undefined
 	const estEnd = PlaylistTiming.getEstimatedEnd(

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
 import { RundownUtils } from '../../../lib/rundown.js'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderPlannedStart({
 	playlist,
@@ -16,7 +17,7 @@ export function RundownHeaderPlannedStart({
 	const timingDurations = useTiming()
 	const expectedStart = PlaylistTiming.getExpectedStart(playlist.timing)
 
-	const now = timingDurations.currentTime ?? Date.now()
+	const now = timingDurations.currentTime ?? getCurrentTime()
 	const startsIn = now - (expectedStart ?? 0)
 	const startedPlayback = playlist.activationId ? playlist.startedPlayback : undefined
 

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimers.tsx

@@ -12,7 +12,8 @@ interface IProps {
 }
 
 export const RundownHeaderTimers: React.FC<IProps> = ({ tTimers }) => {
-	useTiming()
+	const timing = useTiming()
+	const now = timing.currentTime ?? getCurrentTime()
 
 	const activeTimers = tTimers.filter((t) => t.mode).slice(0, 2)
 	if (activeTimers.length == 0) return null
@@ -21,7 +22,7 @@ export const RundownHeaderTimers: React.FC<IProps> = ({ tTimers }) => {
 		<div className="rundown-header__clocks-timers">
 			{activeTimers.map((timer) => (
 				<div key={timer.index} className="rundown-header__clocks-timers__row">
-					<SingleTimer timer={timer} />
+					<SingleTimer timer={timer} now={now} />
 				</div>
 			))}
 		</div>
@@ -30,10 +31,10 @@ export const RundownHeaderTimers: React.FC<IProps> = ({ tTimers }) => {
 
 interface ISingleTimerProps {
 	timer: RundownTTimer
+	now: number
 }
 
-function SingleTimer({ timer }: Readonly<ISingleTimerProps>) {
-	const now = getCurrentTime()
+function SingleTimer({ timer, now }: Readonly<ISingleTimerProps>) {
 	const mode = timer.mode
 	if (!mode) return null
 	const isRunning = !!timer.state && !timer.state.paused