Update based on Atif's comments (#8558, #9202)

Signed-off-by: Keith Chong <kykchong@redhat.com>

Author: keithchong

src/gitops/components/appset/graph/AppSetUtils.tsx

@@ -36,28 +36,25 @@ export function getAppSetHealthStatus(appSet: ApplicationSetKind): HealthStatusC
     }
 
     // Check for missing resources
-    const missingResourceExist = resources.find((r) => r.health.status === HealthStatus.MISSING);
+    const missingResourceExist = resources.find((r) => r.health?.status === HealthStatus.MISSING);
     if (missingResourceExist) {
       return 'Missing';
     }
 
-    const degradedResourceExist = resources.find((r) => r.health.status === HealthStatus.DEGRADED);
+    const degradedResourceExist = resources.find((r) => r.health?.status === HealthStatus.DEGRADED);
     if (degradedResourceExist) {
       return 'Degraded';
     }
 
     const progressingResourceExist = resources.find(
-      (r) => r.health.status === HealthStatus.PROGRESSING,
+      (r) => r.health?.status === HealthStatus.PROGRESSING,
     );
     if (progressingResourceExist) {
       return 'Progressing';
     }
 
-    const allHealthyResources = resources.every((r) => r.health.status === HealthStatus.HEALTHY);
-    if (allHealthyResources) {
-      return 'Healthy';
-    }
-    return 'Healthy';
+    const allHealthyResources = resources.every((r) => r.health?.status === HealthStatus.HEALTHY);
+    return allHealthyResources ? 'Healthy' : 'Unknown';
   }
   return 'Unknown';
 }

src/gitops/components/appset/graph/graph-utils.tsx

@@ -158,7 +158,7 @@ export const getInitialNodes = (
       const isStepGroupExpanded = stepGroupId ? expandedStepGroups.has(stepGroupId) : false;
 
       let isOwnerRefOnly = false;
-      if (isStepGroupExpanded && appResource?.step > '0') {
+      if (isStepGroupExpanded && parseInt(appResource?.step) > 0) {
         const targetApp = applicationSet.status?.applicationStatus?.find(
           (appStatus) => appStatus.application === application.metadata.name,
         );
@@ -313,7 +313,7 @@ export const getInitialNodes = (
 };
 
 export const getInitialEdges = (
-  application: ApplicationSetKind,
+  applicationSet: ApplicationSetKind,
   applications: ApplicationKind[],
   nodes: NodeModel[],
   isOwnerReferenceView: boolean,
@@ -334,11 +334,11 @@ export const getInitialEdges = (
         id: 'e-applicationset',
         type: isOwnerReferenceView ? 'edge' : 'task-edge',
         source:
-          application.kind +
+          applicationSet.kind +
           '-' +
-          (application.metadata?.name ?? '') +
+          (applicationSet.metadata?.name ?? '') +
           '-' +
-          application.metadata?.namespace,
+          applicationSet.metadata?.namespace,
         target: isOwnerReferenceView ? 'applicationset-node-spacer' : '1-step-group',
         nodeSeparation: 0,
         edgeStyle: EdgeStyle.default,

src/gitops/models/ApplicationSetModel.ts

@@ -131,7 +131,7 @@ export interface ApplicationStatusContent {
   application: string;
   status: 'Waiting' | 'Pending' | 'Progressing' | 'Healthy';
   message?: string;
-  lastTransitionTime?: string;
+  lastTransitionTime?: Time;
   step?: string;
   targetRevisions?: string[];
 }