Fixed Drives offline card UI (minio#2732)

brandongevat · Mar 23, 2023 · 5e65f2a · 5e65f2a
1 parent 1e34536
commit 5e65f2a
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 3 deletions.
diff --git a/models/backend_properties.go b/models/backend_properties.go
diff --git a/portal-ui/src/api/consoleApi.ts b/portal-ui/src/api/consoleApi.ts
@@ -609,6 +609,8 @@ export interface BackendProperties {
   backendType?: string;
   rrSCParity?: number;
   standardSCParity?: number;
+  onlineDrives?: number;
+  offlineDrives?: number;
 }
 
 export interface ArnsResponse {

diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx
@@ -201,8 +201,10 @@ const BasicDashboard = ({ usage }: IDashboardProps) => {
             </BoxItem>
             <BoxItem>
               <StatusCountCard
-                offlineCount={offlineDrives.length}
-                onlineCount={onlineDrives.length}
+                offlineCount={
+                  usage?.backend.offlineDrives || offlineDrives.length
+                }
+                onlineCount={usage?.backend.onlineDrives || onlineDrives.length}
                 label={"Drives"}
                 icon={<DrivesIcon />}
               />

diff --git a/portal-ui/src/screens/Console/Dashboard/types.ts b/portal-ui/src/screens/Console/Dashboard/types.ts
@@ -34,6 +34,8 @@ export interface Backend {
   backendType: string;
   standardSCParity: number;
   rrSCParity: number;
+  onlineDrives: number;
+  offlineDrives: number;
 }
 
 export interface ServerInfo {

diff --git a/restapi/admin_info.go b/restapi/admin_info.go
@@ -76,6 +76,8 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
 	var backendType string
 	var rrSCParity float64
 	var standardSCParity float64
+	var onlineDrives float64
+	var offlineDrives float64
 
 	if v, success := serverInfo.Backend.(map[string]interface{}); success {
 		bt, ok := v["backendType"]
@@ -90,6 +92,14 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
 		if ok {
 			standardSCParity = sp.(float64)
 		}
+		onDrives, ok := v["onlineDisks"]
+		if ok {
+			onlineDrives = onDrives.(float64)
+		}
+		offDrives, ok := v["offlineDisks"]
+		if ok {
+			offlineDrives = offDrives.(float64)
+		}
 	}
 
 	var usedSpace int64
@@ -132,8 +142,9 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
 		BackendType:      backendType,
 		RrSCParity:       int64(rrSCParity),
 		StandardSCParity: int64(standardSCParity),
+		OnlineDrives:     int64(onlineDrives),
+		OfflineDrives:    int64(offlineDrives),
 	}
-
 	return &UsageInfo{
 		Buckets:    int64(serverInfo.Buckets.Count),
 		Objects:    int64(serverInfo.Objects.Count),

diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/swagger.yml b/swagger.yml
@@ -4616,6 +4616,10 @@ definitions:
         type: integer
       standardSCParity:
         type: integer
+      onlineDrives:
+        type: integer
+      offlineDrives:
+        type: integer    
   arnsResponse:
     type: object
     properties: