wip: tidy

Author: Julusian

meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts

@@ -36,6 +36,7 @@ import { defaultStudio } from '../../../../__mocks__/defaultCollectionObjects'
 import { MediaObjects } from '../../../collections'
 import { PieceDependencies } from '../common'
 import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
+import { PieceContentStatusMessageFactory } from '../messageFactory'
 
 const mockMediaObjectsCollection = MongoMock.getInnerMockCollection<MediaObject>(MediaObjects)
 
@@ -449,7 +450,9 @@ describe('lib/mediaObjects', () => {
 			timelineObjectsString: EmptyPieceTimelineObjectsBlob,
 		})
 
-		const status1 = await checkPieceContentStatusAndDependencies(mockStudio, piece1, sourcelayer1)
+		const messageFactory = new PieceContentStatusMessageFactory(undefined)
+
+		const status1 = await checkPieceContentStatusAndDependencies(mockStudio, messageFactory, piece1, sourcelayer1)
 		expect(status1[0].status).toEqual(PieceStatusCode.OK)
 		expect(status1[0].messages).toHaveLength(0)
 		expect(status1[1]).toMatchObject(
@@ -460,7 +463,7 @@ describe('lib/mediaObjects', () => {
 			})
 		)
 
-		const status2 = await checkPieceContentStatusAndDependencies(mockStudio, piece2, sourcelayer1)
+		const status2 = await checkPieceContentStatusAndDependencies(mockStudio, messageFactory, piece2, sourcelayer1)
 		expect(status2[0].status).toEqual(PieceStatusCode.SOURCE_BROKEN)
 		expect(status2[0].messages).toHaveLength(1)
 		expect(status2[0].messages[0]).toMatchObject({
@@ -474,7 +477,7 @@ describe('lib/mediaObjects', () => {
 			})
 		)
 
-		const status3 = await checkPieceContentStatusAndDependencies(mockStudio, piece3, sourcelayer1)
+		const status3 = await checkPieceContentStatusAndDependencies(mockStudio, messageFactory, piece3, sourcelayer1)
 		expect(status3[0].status).toEqual(PieceStatusCode.SOURCE_MISSING)
 		expect(status3[0].messages).toHaveLength(1)
 		expect(status3[0].messages[0]).toMatchObject({

meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import { BucketId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { BlueprintId, BucketId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { logger } from '../../../logging'
 import {
 	blueprintFieldSpecifier,

meteor/server/publications/pieceContentStatusUI/common.ts

@@ -1,9 +1,4 @@
-import {
-	ExpectedPackageId,
-	PackageContainerPackageId,
-	RundownId,
-	StudioId,
-} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { ExpectedPackageId, PackageContainerPackageId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PackageContainerPackageStatusDB } from '@sofie-automation/corelib/dist/dataModel/PackageContainerPackageStatus'
 import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'

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?: Partial<Record<PackageStatusMessage, string>>
+	packageStatusMessages?: Partial<Record<PackageStatusMessage, string | undefined>>
 
 	/** Translations connected to the studio (as stringified JSON) */
 	translations?: string

packages/corelib/src/dataModel/Blueprint.ts

@@ -55,7 +55,7 @@ export interface Blueprint {
 	hasFixUpFunction: boolean
 
 	/** The blueprint provided alternate package status messages, if any were provided */
-	packageStatusMessages?: Record<PackageStatusMessage, string | undefined>
+	packageStatusMessages?: Partial<Record<PackageStatusMessage, string | undefined>>
 }
 
 /** Describes the last state a Blueprint document was in when applying config changes */

packages/meteor-lib/src/collections/ExpectedPackages.ts

@@ -70,13 +70,11 @@ export function getSideEffect(
 	)
 }
 
-export function getExpectedPackageFileName(
-	expectedPackage: ExpectedPackage.Any
-): string | undefined {
+export function getExpectedPackageFileName(expectedPackage: ExpectedPackage.Any): string | undefined {
 	if (expectedPackage.type === ExpectedPackage.PackageType.MEDIA_FILE) {
 		return expectedPackage.content.filePath
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.QUANTEL_CLIP) {
-		return  expectedPackage.content.guid || expectedPackage.content.title
+		return expectedPackage.content.guid || expectedPackage.content.title
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.JSON_DATA) {
 		return undefined // Not supported
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.HTML_TEMPLATE) {
@@ -85,4 +83,4 @@ export function getExpectedPackageFileName(
 		assertNever(expectedPackage)
 		return undefined
 	}
-}
+}