From f1a01f5ba49feb8e078284df420137535dadaee7 Mon Sep 17 00:00:00 2001
From: Paul Payne <paul@payne.io>
Date: Mon, 13 Oct 2025 12:23:21 +0000
Subject: [PATCH] Fix cluster service page.

---
 src/components/ClusterServicesComponent.tsx | 22 ++++++++++++++-------
 src/services/api/types/service.ts           |  3 ++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/ClusterServicesComponent.tsx b/src/components/ClusterServicesComponent.tsx
index fa9cc6a..4df553e 100644
--- a/src/components/ClusterServicesComponent.tsx
+++ b/src/components/ClusterServicesComponent.tsx
@@ -24,6 +24,7 @@ export function ClusterServicesComponent() {
     switch (status) {
       case 'running':
       case 'ready':
+      case 'deployed':
         return <CheckCircle className="h-5 w-5 text-green-500" />;
       case 'error':
         return <AlertCircle className="h-5 w-5 text-red-500" />;
@@ -36,19 +37,23 @@ export function ClusterServicesComponent() {
   };
 
   const getStatusBadge = (service: Service) => {
-    const status = service.status?.status || (service.deployed ? 'deployed' : 'available');
+    // Handle both old format (status as string) and new format (status as object)
+    const status = typeof service.status === 'string' ? service.status :
+                   service.status?.status || (service.deployed ? 'deployed' : 'available');
 
     const variants: Record<string, 'secondary' | 'default' | 'success' | 'destructive' | 'outline'> = {
+      'not-deployed': 'secondary',
       available: 'secondary',
       deploying: 'default',
       installing: 'default',
       running: 'success',
       ready: 'success',
+      deployed: 'success',
       error: 'destructive',
-      deployed: 'outline',
     };
 
     const labels: Record<string, string> = {
+      'not-deployed': 'Not Deployed',
       available: 'Available',
       deploying: 'Deploying',
       installing: 'Installing',
@@ -59,7 +64,7 @@ export function ClusterServicesComponent() {
     };
 
     return (
-      <Badge variant={variants[status]}>
+      <Badge variant={variants[status] || 'secondary'}>
         {labels[status] || status}
       </Badge>
     );
@@ -210,16 +215,18 @@ export function ClusterServicesComponent() {
                           {service.version}
                         </Badge>
                       )}
-                      {getStatusIcon(service.status?.status)}
+                      {getStatusIcon(typeof service.status === 'string' ? service.status : service.status?.status)}
                     </div>
                     <p className="text-sm text-muted-foreground">{service.description}</p>
-                    {service.status?.message && (
+                    {typeof service.status === 'object' && service.status?.message && (
                       <p className="text-xs text-muted-foreground mt-1">{service.status.message}</p>
                     )}
                   </div>
                   <div className="flex items-center gap-3">
                     {getStatusBadge(service)}
-                    {!service.deployed && (
+                    {((typeof service.status === 'string' && service.status === 'not-deployed') ||
+                      (!service.status || service.status === 'not-deployed') ||
+                      (typeof service.status === 'object' && service.status?.status === 'not-deployed')) && (
                       <Button
                         size="sm"
                         onClick={() => handleInstallService(service.name)}
@@ -228,7 +235,8 @@ export function ClusterServicesComponent() {
                         {isInstalling ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Install'}
                       </Button>
                     )}
-                    {service.deployed && (
+                    {((typeof service.status === 'string' && service.status === 'deployed') ||
+                      (typeof service.status === 'object' && service.status?.status === 'deployed')) && (
                       <Button
                         size="sm"
                         variant="destructive"
diff --git a/src/services/api/types/service.ts b/src/services/api/types/service.ts
index 15e79c3..bb026ea 100644
--- a/src/services/api/types/service.ts
+++ b/src/services/api/types/service.ts
@@ -2,8 +2,9 @@ export interface Service {
   name: string;
   description: string;
   version?: string;
-  status?: ServiceStatus;
+  status?: ServiceStatus | string; // Can be either an object or a string like 'deployed', 'not-deployed'
   deployed?: boolean;
+  namespace?: string;
 }
 
 export interface ServiceStatus {