Merge branch 'bbc-local/upstream/set-next-from-here' into nrk/test/set-next-from-here

Author: nytamin

meteor/server/api/userActions.ts

@@ -49,6 +49,7 @@ import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { UserPermissions } from '@sofie-automation/meteor-lib/dist/userPermissions'
 import { assertConnectionHasOneOfPermissions } from '../security/auth'
 import { checkAccessToRundown } from '../security/check'
+import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 
 const PERMISSIONS_FOR_PLAYOUT_USERACTION: Array<keyof UserPermissions> = ['studio']
 const PERMISSIONS_FOR_BUCKET_MODIFICATION: Array<keyof UserPermissions> = ['studio']
@@ -121,8 +122,9 @@ class ServerUserActionAPI
 		userEvent: string,
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
-		nextPartId: PartId,
-		timeOffset: number | null
+		nextPartOrInstanceId: PartId | PartInstanceId,
+		timeOffset: number | null,
+		isInstance: boolean | null
 	) {
 		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
 			this,
@@ -131,12 +133,15 @@ class ServerUserActionAPI
 			rundownPlaylistId,
 			() => {
 				check(rundownPlaylistId, String)
-				check(nextPartId, String)
+				check(nextPartOrInstanceId, String)
 			},
 			StudioJobs.SetNextPart,
 			{
 				playlistId: rundownPlaylistId,
-				nextPartId,
+				nextPartId: isInstance ? undefined : protectString<PartId>(unprotectString(nextPartOrInstanceId)),
+				nextPartInstanceId: isInstance
+					? protectString<PartInstanceId>(unprotectString(nextPartOrInstanceId))
+					: undefined,
 				setManually: true,
 				nextTimeOffset: timeOffset ?? undefined,
 			}

meteor/yarn.lock

@@ -1245,7 +1245,7 @@ __metadata:
   dependencies:
     "@mos-connection/model": "npm:^5.0.0-alpha.0"
     kairos-lib: "npm:^0.2.3"
-    timeline-state-resolver-types: "npm:10.0.0-nightly-release53-20251217-143607-df590aa96.0"
+    timeline-state-resolver-types: "npm:10.0.0-nightly-release53-20260123-151128-04b075e87.0"
     tslib: "npm:^2.8.1"
     type-fest: "npm:^4.33.0"
   languageName: node
@@ -9976,12 +9976,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:10.0.0-nightly-release53-20251217-143607-df590aa96.0":
-  version: 10.0.0-nightly-release53-20251217-143607-df590aa96.0
-  resolution: "timeline-state-resolver-types@npm:10.0.0-nightly-release53-20251217-143607-df590aa96.0"
+"timeline-state-resolver-types@npm:10.0.0-nightly-release53-20260123-151128-04b075e87.0":
+  version: 10.0.0-nightly-release53-20260123-151128-04b075e87.0
+  resolution: "timeline-state-resolver-types@npm:10.0.0-nightly-release53-20260123-151128-04b075e87.0"
   dependencies:
     tslib: "npm:^2.8.1"
-  checksum: 10/6f17030e9f10568757b3ebaae40a54ce5220ce5c2f37d9b5d8a5d286704e4779c80fbfddae500e1952a6efdf6e76b67bc18d0151211c84eb194ae3b52f78c7bf
+  checksum: 10/7322e958a35bc9deaa332c201414248b097c5894b556e481c5a97d51e292cb61c017d3d373fe1ae3bf19383965535dbfe104d8c38ca7c109eadbffc781a08ed9
   languageName: node
   linkType: hard
 

packages/corelib/src/worker/studio.ts

@@ -254,7 +254,8 @@ export interface ActivateRundownPlaylistProps extends RundownPlayoutPropsBase {
 }
 export type DeactivateRundownPlaylistProps = RundownPlayoutPropsBase
 export interface SetNextPartProps extends RundownPlayoutPropsBase {
-	nextPartId: PartId
+	nextPartId?: PartId
+	nextPartInstanceId?: PartInstanceId
 	setManually?: boolean
 	nextTimeOffset?: number
 }

packages/job-worker/src/playout/lookahead/__tests__/findForLayer.test.ts

@@ -0,0 +1,34 @@
+jest.mock('../../findObjects')
+import { context, TfindLookaheadObjectsForPart } from './helpers/mockSetup.js'
+import { findLookaheadForLayer } from '../../findForLayer.js'
+import { expectInstancesToMatch } from '../utils.js'
+import { findForLayerTestConstants } from './constants.js'
+import { findLookaheadObjectsForPart } from '../../findObjects.js'
+
+const findLookaheadObjectsForPartMockBase = findLookaheadObjectsForPart as TfindLookaheadObjectsForPart
+const findLookaheadObjectsForPartMock = findLookaheadObjectsForPartMockBase.mockImplementation(() => []) // Default mock
+
+beforeEach(() => {
+	findLookaheadObjectsForPartMock.mockReset()
+})
+
+const current = findForLayerTestConstants.current
+const nextFuture = findForLayerTestConstants.nextFuture
+const layer = findForLayerTestConstants.layer
+
+describe('findLookaheadForLayer – basic behavior', () => {
+	test('no parts', () => {
+		const res = findLookaheadForLayer(context, {}, [], 'abc', 1, 1)
+
+		expect(res.timed).toHaveLength(0)
+		expect(res.future).toHaveLength(0)
+	})
+	test('if the previous part is unset', () => {
+		findLookaheadObjectsForPartMock.mockReturnValue([])
+
+		findLookaheadForLayer(context, { previous: undefined, current, next: nextFuture }, [], layer, 1, 1)
+
+		expect(findLookaheadObjectsForPartMock).toHaveBeenCalledTimes(2)
+		expectInstancesToMatch(findLookaheadObjectsForPartMock, 1, layer, current, undefined)
+	})
+})

packages/job-worker/src/playout/lookahead/__tests__/findForLayer/basicBehavior.test.ts

@@ -0,0 +1,40 @@
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
+import { PartInstanceAndPieceInstances, PartAndPieces } from '../../util.js'
+import { createFakePiece } from '../utils.js'
+
+const layer: string = getRandomString()
+
+export const findForLayerTestConstants = {
+	previous: {
+		part: { _id: 'pPrev', part: 'prev' },
+		allPieces: [createFakePiece('1'), createFakePiece('2'), createFakePiece('3')],
+		onTimeline: true,
+		nowInPart: 2000,
+	} as any as PartInstanceAndPieceInstances,
+	current: {
+		part: { _id: 'pCur', part: 'cur' },
+		allPieces: [createFakePiece('4'), createFakePiece('5'), createFakePiece('6')],
+		onTimeline: true,
+		nowInPart: 1000,
+	} as any as PartInstanceAndPieceInstances,
+	nextTimed: {
+		part: { _id: 'pNextTimed', part: 'nextT' },
+		allPieces: [createFakePiece('7'), createFakePiece('8'), createFakePiece('9')],
+		onTimeline: true,
+	} as any as PartInstanceAndPieceInstances,
+	nextFuture: {
+		part: { _id: 'pNextFuture', part: 'nextF' },
+		allPieces: [createFakePiece('10'), createFakePiece('11'), createFakePiece('12')],
+		onTimeline: false,
+	} as any as PartInstanceAndPieceInstances,
+
+	orderedParts: [{ _id: 'p1' }, { _id: 'p2', invalid: true }, { _id: 'p3' }, { _id: 'p4' }, { _id: 'p5' }].map(
+		(p) => ({
+			part: p as any,
+			usesInTransition: true,
+			pieces: [{ _id: p._id + '_p1' } as any],
+		})
+	) as PartAndPieces[],
+
+	layer,
+}

packages/job-worker/src/playout/lookahead/__tests__/findForLayer/constants.ts

@@ -0,0 +1,6 @@
+import { setupDefaultJobEnvironment } from '../../../../../__mocks__/context.js'
+import { findLookaheadObjectsForPart } from '../../../../../playout/lookahead/findObjects.js'
+
+export type TfindLookaheadObjectsForPart = jest.MockedFunction<typeof findLookaheadObjectsForPart>
+
+export const context = setupDefaultJobEnvironment()