fix

Author: Julusian

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

@@ -83,19 +83,23 @@ export const ExpectedPackagesStatus: React.FC<{}> = function ExpectedPackagesSta
 		}
 
 		for (const work of expectedPackageWorkStatuses) {
-			const device = peripheralDevicesMap.get(work.deviceId)
 			// todo: make this better:
-			const key = unprotectString(work.fromPackages[0]?.id) || 'unknown_work_' + work._id
-			// const referencedPackage = packageRef[packageId]
-			let packageWithWorkStatus = packagesWithWorkStatuses[key]
-			if (!packageWithWorkStatus) {
-				packagesWithWorkStatuses[key] = packageWithWorkStatus = {
-					package: undefined,
-					statuses: [],
-					device,
+			let fromPackageIds = work.fromPackages.map((p) => unprotectString(p.id))
+			if (fromPackageIds.length === 0) fromPackageIds = ['unknown_work_' + work._id]
+
+			for (const key of fromPackageIds) {
+				// const referencedPackage = packageRef[packageId]
+				let packageWithWorkStatus = packagesWithWorkStatuses[key]
+				if (!packageWithWorkStatus) {
+					packagesWithWorkStatuses[key] = packageWithWorkStatus = {
+						package: undefined,
+						statuses: [],
+						device: undefined,
+					}
 				}
+				packageWithWorkStatus.statuses.push(work)
+				packageWithWorkStatus.device = peripheralDevicesMap.get(work.deviceId)
 			}
-			packageWithWorkStatus.statuses.push(work)
 		}
 
 		for (const id of Object.keys(packagesWithWorkStatuses)) {
@@ -140,6 +144,8 @@ export const ExpectedPackagesStatus: React.FC<{}> = function ExpectedPackagesSta
 		return keys.map(({ packageId }) => {
 			const p = packagesWithWorkStatuses[packageId]
 
+			console.log('p', p)
+
 			return p.package ? (
 				<PackageStatus key={packageId} package={p.package} statuses={p.statuses} device={p.device} />
 			) : (
@@ -152,6 +158,7 @@ export const ExpectedPackagesStatus: React.FC<{}> = function ExpectedPackagesSta
 	function renderPackageContainerStatuses() {
 		return packageContainerStatuses.map((packageContainerStatus) => {
 			const device = peripheralDevicesMap.get(packageContainerStatus.deviceId)
+			console.log(device, packageContainerStatus.deviceId)
 			return (
 				<PackageContainerStatus
 					key={unprotectString(packageContainerStatus._id)}