wip: fix nocommit

Author: Julusian

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -683,59 +683,54 @@ async function checkPieceContentExpectedPackageStatus(
 
 				checkedPackageContainers.add(matchedPackageContainer[0])
 
-				// nocommit - strip out array
-				const expectedPackageIds = [getExpectedPackageIdNew(packageOwnerId, expectedPackage)]
-
-				let warningMessage: ContentMessageLight | null = null
-				let matchedExpectedPackageId: ExpectedPackageId | null = null
-				for (const expectedPackageId of expectedPackageIds) {
-					const packageOnPackageContainer = await getPackageContainerPackageStatus(
-						matchedPackageContainer[0],
-						expectedPackageId
-					)
-					if (!packageOnPackageContainer) continue
-
-					matchedExpectedPackageId = expectedPackageId
+				const fileName = getExpectedPackageFileName(expectedPackage) ?? ''
+				const containerLabel = matchedPackageContainer[1].container.label
 
-					if (!thumbnailUrl) {
-						const sideEffect = getSideEffect(expectedPackage, studio)
+				const candidatePackageId = getExpectedPackageIdNew(packageOwnerId, expectedPackage)
+				const packageOnPackageContainer = await getPackageContainerPackageStatus(
+					matchedPackageContainer[0],
+					candidatePackageId
+				)
+				if (!packageOnPackageContainer) {
+					// If no package matched, we must have a warning
 
-						thumbnailUrl = await getAssetUrlFromPackageContainerStatus(
-							studio.packageContainers,
-							getPackageContainerPackageStatus,
-							expectedPackageId,
-							sideEffect.thumbnailContainerId,
-							sideEffect.thumbnailPackageSettings?.path
-						)
-					}
+					pushOrMergeMessage({
+						...getPackageSourceMissingWarning(),
+						fileName: fileName,
+						packageContainers: [containerLabel],
+					})
 
-					if (!previewUrl) {
-						const sideEffect = getSideEffect(expectedPackage, studio)
+					continue
+				}
 
-						previewUrl = await getAssetUrlFromPackageContainerStatus(
-							studio.packageContainers,
-							getPackageContainerPackageStatus,
-							expectedPackageId,
-							sideEffect.previewContainerId,
-							sideEffect.previewPackageSettings?.path
-						)
-					}
+				if (!thumbnailUrl) {
+					const sideEffect = getSideEffect(expectedPackage, studio)
 
-					warningMessage = getPackageWarningMessage(packageOnPackageContainer.status)
+					thumbnailUrl = await getAssetUrlFromPackageContainerStatus(
+						studio.packageContainers,
+						getPackageContainerPackageStatus,
+						candidatePackageId,
+						sideEffect.thumbnailContainerId,
+						sideEffect.thumbnailPackageSettings?.path
+					)
+				}
 
-					progress = getPackageProgress(packageOnPackageContainer.status) ?? undefined
+				if (!previewUrl) {
+					const sideEffect = getSideEffect(expectedPackage, studio)
 
-					// Found a packageOnPackageContainer
-					break
+					previewUrl = await getAssetUrlFromPackageContainerStatus(
+						studio.packageContainers,
+						getPackageContainerPackageStatus,
+						candidatePackageId,
+						sideEffect.previewContainerId,
+						sideEffect.previewPackageSettings?.path
+					)
 				}
 
-				const fileName = getExpectedPackageFileName(expectedPackage) ?? ''
-				const containerLabel = matchedPackageContainer[1].container.label
-
-				if (!matchedExpectedPackageId || warningMessage) {
-					// If no package matched, we must have a warning
-					warningMessage = warningMessage ?? getPackageSourceMissingWarning()
+				progress = getPackageProgress(packageOnPackageContainer.status) ?? undefined
 
+				const warningMessage = getPackageWarningMessage(packageOnPackageContainer.status)
+				if (warningMessage) {
 					pushOrMergeMessage({
 						...warningMessage,
 						fileName: fileName,
@@ -750,7 +745,7 @@ async function checkPieceContentExpectedPackageStatus(
 						containerLabel,
 					}
 					// Fetch scan-info about the package:
-					const dbPackageInfos = await getPackageInfos(matchedExpectedPackageId)
+					const dbPackageInfos = await getPackageInfos(candidatePackageId)
 					for (const packageInfo of dbPackageInfos) {
 						if (packageInfo.type === PackageInfo.Type.SCAN) {
 							packageInfos[expectedPackage._id].scan = packageInfo.payload