wip

Author: Julusian

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -341,13 +341,15 @@ async function checkPieceContentMediaObjectStatus(
 						sourceLayer: sourceLayer.name,
 						pieceName: piece.name,
 						fileName: '',
+						containerLabel: '',
 					}),
 				})
 			} else {
 				const messageRequiredArgs: PieceContentStatusMessageRequiredArgs = {
 					sourceLayer: sourceLayer.name,
 					pieceName: piece.name,
 					fileName: fileName,
+					containerLabel: '',
 				}
 				const mediaObject = await getMediaObject(fileName)
 				// If media object not found, then...
@@ -464,6 +466,7 @@ async function checkPieceContentMediaObjectStatus(
 							sourceLayer: sourceLayer.name,
 							pieceName: piece.name,
 							fileName: fileName,
+							containerLabel: '',
 						}),
 					})
 				} else {
@@ -574,27 +577,27 @@ async function checkPieceContentExpectedPackageStatus(
 			const checkedPackageContainers = new Set<string>()
 
 			for (const routedDeviceId of routedDeviceIds) {
-				let packageContainerId: string | undefined
-				for (const [containerId, packageContainer] of Object.entries<ReadonlyDeep<StudioPackageContainer>>(
+				let matchedPackageContainer: [string, ReadonlyDeep<StudioPackageContainer>] | undefined
+				for (const packageContainer of Object.entries<ReadonlyDeep<StudioPackageContainer>>(
 					studio.packageContainers
 				)) {
-					if (packageContainer.deviceIds.includes(unprotectString(routedDeviceId))) {
+					if (packageContainer[1].deviceIds.includes(unprotectString(routedDeviceId))) {
 						// TODO: how to handle if a device has multiple containers?
-						packageContainerId = containerId
+						matchedPackageContainer = packageContainer
 						break // just picking the first one found, for now
 					}
 				}
 
-				if (!packageContainerId) {
+				if (!matchedPackageContainer) {
 					continue
 				}
 
-				if (checkedPackageContainers.has(packageContainerId)) {
+				if (checkedPackageContainers.has(matchedPackageContainer[0])) {
 					// we have already checked this package container for this expected package
 					continue
 				}
 
-				checkedPackageContainers.add(packageContainerId)
+				checkedPackageContainers.add(matchedPackageContainer[0])
 
 				const expectedPackageIds = [getExpectedPackageId(piece._id, expectedPackage._id)]
 				if (piece.pieceInstanceId) {
@@ -606,13 +609,14 @@ async function checkPieceContentExpectedPackageStatus(
 					sourceLayer: sourceLayer.name,
 					pieceName: piece.name,
 					fileName: getExpectedPackageFileName(expectedPackage) ?? '',
+					containerLabel: matchedPackageContainer[1].container.label,
 				}
 
 				let warningMessage: ContentMessage | null = null
 				let matchedExpectedPackageId: ExpectedPackageId | null = null
 				for (const expectedPackageId of expectedPackageIds) {
 					const packageOnPackageContainer = await getPackageContainerPackageStatus(
-						packageContainerId,
+						matchedPackageContainer[0],
 						expectedPackageId
 					)
 					if (!packageOnPackageContainer) continue

meteor/server/publications/pieceContentStatusUI/messageFactory.ts

@@ -77,6 +77,7 @@ export interface PieceContentStatusMessageRequiredArgs {
 	sourceLayer: string
 	pieceName: string
 	fileName: string
+	containerLabel: string
 }
 
 export type BlueprintForStatusMessage = Pick<Blueprint, '_id' | 'packageStatusMessages'>

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

@@ -64,7 +64,7 @@ export interface ShowStyleBlueprintManifest<TRawConfig = IBlueprintConfig, TProc
 	configPresets: Record<string, IShowStyleConfigPreset<TRawConfig>>
 
 	/** Alternate package status messages, to override the builtin ones produced by Sofie */
-	packageStatusMessages?: Record<PackageStatusMessage, string | undefined>
+	packageStatusMessages?: Partial<Record<PackageStatusMessage, string>>
 
 	/** Translations connected to the studio (as stringified JSON) */
 	translations?: string

packages/webui/src/client/lib/dev.ts

@@ -11,8 +11,10 @@ import { logger } from './logging'
 const windowAny: any = window
 
 Meteor.startup(() => {
-	windowAny['Collections'] = Object.fromEntries(ClientCollections.entries())
-	windowAny['PublicationCollections'] = Object.fromEntries(PublicationCollections.entries())
+	setTimeout(() => {
+		windowAny['Collections'] = Object.fromEntries(ClientCollections.entries())
+		windowAny['PublicationCollections'] = Object.fromEntries(PublicationCollections.entries())
+	}, 1000)
 })
 
 windowAny['getCurrentTime'] = getCurrentTime