wip

Author: Julusian

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -10,7 +10,7 @@ import {
 	SourceLayerType,
 	VTContent,
 } from '@sofie-automation/blueprints-integration'
-import { getExpectedPackageIdNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
+import { getExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import {
 	BucketId,
 	ExpectedPackageId,
@@ -690,7 +690,7 @@ async function checkPieceContentExpectedPackageStatus(
 				const fileName = getExpectedPackageFileName(expectedPackage) ?? ''
 				const containerLabel = matchedPackageContainer[1].container.label
 
-				const candidatePackageId = getExpectedPackageIdNew(packageOwnerId, expectedPackage)
+				const candidatePackageId = getExpectedPackageId(packageOwnerId, expectedPackage)
 				const packageOnPackageContainer = await getPackageContainerPackageStatus(
 					matchedPackageContainer[0],
 					candidatePackageId

packages/corelib/src/dataModel/ExpectedPackages.ts

@@ -155,7 +155,7 @@ export type ExpectedPackageIngestSource =
  * Generate the expectedPackageId for the given expectedPackage.
  * This is a stable id derived from the package and its parent. This document is expected to be owned by multiple sources.
  */
-export function getExpectedPackageIdNew(
+export function getExpectedPackageId(
 	/** Preferably a RundownId or BucketId, but StudioId is allowed when not owned by a rundown or bucket */
 	parentId: RundownId | StudioId | BucketId,
 	/** The locally unique id of the expectedPackage */

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

@@ -4,7 +4,7 @@ import {
 	ExpectedPackageDBType,
 	ExpectedPackageDB,
 	ExpectedPackageIngestSource,
-	getExpectedPackageIdNew,
+	getExpectedPackageId,
 	ExpectedPackageIngestSourceBucketAdlibAction,
 	ExpectedPackageIngestSourceBucketAdlibPiece,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
@@ -99,7 +99,7 @@ function generateBucketExpectedPackages<TSource = never>(
 		}
 
 		bases.push({
-			_id: getExpectedPackageIdNew(bucketId, fullPackage),
+			_id: getExpectedPackageId(bucketId, fullPackage),
 			package: fullPackage,
 			studioId: studio._id,
 			rundownId: null,

packages/job-worker/src/ingest/model/IngestExpectedPackage.ts

@@ -1,6 +1,6 @@
 import type { ExpectedPackage } from '@sofie-automation/blueprints-integration'
 import {
-	getExpectedPackageIdNew,
+	getExpectedPackageId,
 	type ExpectedPackageDBType,
 	type ExpectedPackageIngestSourcePart,
 	type ExpectedPackageIngestSourceRundownBaseline,
@@ -38,7 +38,7 @@ export class ExpectedPackageCollector<TSource extends { fromPieceType: ExpectedP
 	): void => {
 		const insertedPackagesForSource = new Set<string>()
 		for (const expectedPackage of expectedPackages) {
-			const id = getExpectedPackageIdNew(this.#parentId, expectedPackage)
+			const id = getExpectedPackageId(this.#parentId, expectedPackage)
 
 			// Deduplicate with an id including the blueprintPackageId.
 			// This is to ensure the blueprints can reference the package with that id still

packages/job-worker/src/playout/model/implementation/PlayoutPieceInstanceModelImpl.ts

@@ -5,7 +5,7 @@ import { clone, getRandomId } from '@sofie-automation/corelib/dist/lib'
 import { ExpectedPackage, Time } from '@sofie-automation/blueprints-integration'
 import { PlayoutPieceInstanceModel } from '../PlayoutPieceInstanceModel.js'
 import _ from 'underscore'
-import { getExpectedPackageIdNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages.js'
+import { getExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages.js'
 
 export class PlayoutPieceInstanceModelImpl implements PlayoutPieceInstanceModel {
 	/**
@@ -168,7 +168,7 @@ function createExpectedPackagesMap(
 	if (!packages) return map
 
 	for (const pkg of packages) {
-		map.set(getExpectedPackageIdNew(rundownId, pkg), pkg)
+		map.set(getExpectedPackageId(rundownId, pkg), pkg)
 	}
 	return map
 }

packages/job-worker/src/playout/snapshot.ts

@@ -2,7 +2,7 @@ import {
 	ExpectedPackageDB,
 	ExpectedPackageDBType,
 	ExpectedPackageIngestSource,
-	getExpectedPackageIdNew,
+	getExpectedPackageId,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import {
 	AdLibActionId,
@@ -555,7 +555,7 @@ export async function handleRestorePlaylistSnapshot(
 			}
 
 			// Regenerate the ID from the new rundownId and packageId
-			expectedPackage._id = getExpectedPackageIdNew(
+			expectedPackage._id = getExpectedPackageId(
 				expectedPackage.rundownId || expectedPackage.studioId,
 				expectedPackage.package
 			)

packages/job-worker/src/studio/model/StudioBaselineHelper.ts

@@ -3,7 +3,7 @@ import {
 	ExpectedPackageDB,
 	ExpectedPackageDBType,
 	ExpectedPackageIngestSourceStudioBaseline,
-	getExpectedPackageIdNew,
+	getExpectedPackageId,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItemStudio } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { saveIntoDb } from '../../db/changes.js'
@@ -35,7 +35,7 @@ export class StudioBaselineHelper {
 		// Using a map here is a bit excessive, but it makes it easier to remove duplicates
 		this.#pendingExpectedPackages = new Map()
 		for (const expectedPackage of packages) {
-			const id = getExpectedPackageIdNew(this.#context.studioId, expectedPackage)
+			const id = getExpectedPackageId(this.#context.studioId, expectedPackage)
 
 			this.#pendingExpectedPackages.set(id, {
 				packageId: id,

packages/webui/src/client/ui/Status/package-status/PackageStatus.tsx

@@ -86,7 +86,7 @@ export const PackageStatus: React.FC<{
 
 			return 0
 		})
-	}, props.statuses)
+	}, [props.statuses])
 
 	let offlineReasonMessage: string | undefined = undefined
 	let connected = true