refactor

Author: lucasgoral

src/components/ControlPlane/FluxList.tsx

@@ -37,7 +37,7 @@ export default function FluxList() {
     isReady: boolean;
     statusUpdateTime?: string;
     item: unknown;
-    readyStatus: undefined | { message?: string };
+    readyStatus: string;
   };
 
   const gitReposColumns: AnalyticalTableColumnDefinition[] = useMemo(
@@ -70,7 +70,7 @@ export default function FluxList() {
               transitionTime={
                 cellData.cell.row.original?.statusUpdateTime ? cellData.cell.row.original?.statusUpdateTime : ''
               }
-              message={cellData.cell.row.original?.readyStatus?.message}
+              message={cellData.cell.row.original?.readyStatus}
             />
           ) : null,
       },
@@ -115,7 +115,7 @@ export default function FluxList() {
                 transitionTime={
                   cellData.cell.row.original?.statusUpdateTime ? cellData.cell.row.original?.statusUpdateTime : ''
                 }
-                message={cellData.cell.row.original?.readyStatus?.message}
+                message={cellData.cell.row.original?.readyStatus}
               />
             </span>
           ) : null,
@@ -144,26 +144,28 @@ export default function FluxList() {
 
   const gitReposRows: FluxRow[] =
     gitReposData?.items?.map((item) => {
+      const readyObject = item.status?.conditions?.find((x) => x.type === 'Ready');
       return {
         name: item.metadata.name,
-        isReady: item?.status?.conditions?.find((x) => x.type === 'Ready')?.status === 'True',
-        statusUpdateTime: item.status?.conditions?.find((x) => x.type === 'Ready')?.lastTransitionTime,
+        isReady: readyObject?.status === 'True',
+        statusUpdateTime: readyObject?.lastTransitionTime,
         revision: shortenCommitHash(item.status.artifact?.revision ?? '-'),
         created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
         item: item,
-        readyStatus: item.status?.conditions?.find((x) => x.type === 'Ready'),
+        readyStatus: readyObject?.message ?? readyObject?.reason ?? '',
       };
     }) ?? [];
 
   const kustomizationsRows: FluxRow[] =
     kustmizationData?.items?.map((item) => {
+      const readyObject = item.status?.conditions?.find((x) => x.type === 'Ready');
       return {
         name: item.metadata.name,
-        isReady: item.status?.conditions?.find((x) => x.type === 'Ready')?.status === 'True',
-        statusUpdateTime: item.status?.conditions?.find((x) => x.type === 'Ready')?.lastTransitionTime,
+        isReady: readyObject?.status === 'True',
+        statusUpdateTime: readyObject?.lastTransitionTime,
         created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
         item: item,
-        readyStatus: item.status?.conditions?.find((x) => x.type === 'Ready'),
+        readyStatus: readyObject?.message ?? '',
       };
     }) ?? [];
 

src/lib/api/types/crossplane/listManagedResources.ts

@@ -15,6 +15,8 @@ export type ManagedResourcesResponse = [
               type: 'Ready' | 'Synced' | unknown;
               status: 'True' | 'False';
               lastTransitionTime: string;
+              message?: string;
+              reason?: string;
             },
           ];
         };

src/lib/api/types/crossplane/listProviders.ts

@@ -17,6 +17,8 @@ export type ProvidersListResponse = {
             type: 'Healthy' | 'Installed' | unknown;
             status: 'True' | 'False';
             lastTransitionTime: string;
+            message?: string;
+            reason?: string;
           },
         ];
       };

src/lib/api/types/flux/listGitRepo.ts

@@ -20,6 +20,8 @@ export type GitReposResponse = {
             status: string;
             type: string;
             lastTransitionTime: string;
+            message?: string;
+            reason?: string;
           },
         ];
       };