Merge pull request Sofie-Automation#1488 from bbc/upstream/fix/infinite-pieceinstance-has-nopackage-statuses

Author: jstarpl

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -198,6 +198,10 @@ export type PieceContentStatusPiece = Pick<
 	'_id' | 'content' | 'expectedPackages' | 'name'
 > & {
 	pieceInstanceId?: PieceInstanceId
+	/**
+	 * If this is an infinite continuation, check the previous PieceInstance to fill the gap when package-manager has not processed an adlibbed part
+	 */
+	previousPieceInstanceId?: PieceInstanceId
 }
 export interface PieceContentStatusStudio
 	extends Pick<DBStudio, '_id' | 'previewContainerIds' | 'thumbnailContainerIds'> {
@@ -656,6 +660,13 @@ async function checkPieceContentExpectedPackageStatus(
 				if (piece.pieceInstanceId) {
 					// If this is a PieceInstance, try looking up the PieceInstance first
 					expectedPackageIds.unshift(getExpectedPackageId(piece.pieceInstanceId, expectedPackage._id))
+
+					if (piece.previousPieceInstanceId) {
+						// Also try the previous PieceInstance, when this is an infinite continuation in case package-manager needs to catchup
+						expectedPackageIds.unshift(
+							getExpectedPackageId(piece.previousPieceInstanceId, expectedPackage._id)
+						)
+					}
 				}
 
 				let warningMessage: ContentMessageLight | null = null

meteor/server/publications/pieceContentStatusUI/rundown/reactiveContentCache.ts

@@ -64,14 +64,15 @@ export const partInstanceFieldSpecifier = literal<
 	part: 1, // This could be stricter, but this is unlikely to be changed once the PartInstance is created
 })
 
-export type PieceInstanceFields = '_id' | 'rundownId' | 'partInstanceId' | 'piece'
+export type PieceInstanceFields = '_id' | 'rundownId' | 'partInstanceId' | 'piece' | 'infinite'
 export const pieceInstanceFieldSpecifier = literal<
 	MongoFieldSpecifierOnesStrict<Pick<PieceInstance, PieceInstanceFields>>
 >({
 	_id: 1,
 	rundownId: 1,
 	partInstanceId: 1,
 	piece: 1, // This could be stricter, but this is unlikely to be changed once the PieceInstance is created
+	infinite: 1, // This could be stricter, but this is temporary and should never change once set
 })
 
 export type AdLibPieceFields =

meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts

@@ -166,13 +166,26 @@ export async function regenerateForPieceInstanceIds(
 			const sourceLayer =
 				pieceDoc.piece.sourceLayerId && sourceLayersForRundown?.sourceLayers?.[pieceDoc.piece.sourceLayerId]
 
+			let previousPieceInstanceId: PieceInstanceId | undefined
+			if (pieceDoc.infinite) {
+				// Note: this is a temporary solution, until single packages can be owned by multiple PieceInstances
+				// This shouldn't need to be reactive upon this PieceInstance, as this is filling a brief gap until package-manager catches up.
+				// That assumption could be wrong, but trying to track this dependency will be messy so would be nice to avoid.
+				const previousPieceInstance = contentCache.PieceInstances.findOne({
+					'infinite.infiniteInstanceId': pieceDoc.infinite.infiniteInstanceId,
+					'infinite.infiniteInstanceIndex': pieceDoc.infinite.infiniteInstanceIndex - 1,
+				})
+				previousPieceInstanceId = previousPieceInstance?._id
+			}
+
 			if (partInstance && segment && sourceLayer) {
 				const [status, dependencies] = await checkPieceContentStatusAndDependencies(
 					uiStudio,
 					messageFactories.get(pieceDoc.rundownId),
 					{
 						...pieceDoc.piece,
 						pieceInstanceId: pieceDoc._id,
+						previousPieceInstanceId,
 					},
 					sourceLayer
 				)