merge 036, everything broken

web/projects/ui/src/app/services/pkg-status-rendering.service.ts

@@ -1,7 +1,6 @@
 import {
   PackageDataEntry,
   PackageMainStatus,
-  PackagePlus,
   PackageState,
   Status,
 } from 'src/app/services/patch-db/data-model'
@@ -21,12 +20,15 @@ export function renderPkgStatus(
   let dependency: DependencyStatus | null = null
   let health: HealthStatus | null = null
 
-  if (pkg.state === PackageState.Installed && pkg.installed) {
-    primary = getPrimaryStatus(pkg.installed.status)
+  if (pkg['state-info'].state === PackageState.Installed) {
+    primary = getPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
-    health = getHealthStatus(pkg.installed.status)
+    health = getHealthStatus(
+      pkg.status,
+      !isEmptyObject(pkg['state-info'].manifest['health-checks']),
+    )
   } else {
-    primary = pkg.state
+    primary = pkg['state-info'].state as string as PrimaryStatus
   }
 
   return { primary, dependency, health }