Fix TenantCapacity usage (#2184)

minio · Jun 26, 2024 · 52137a2 · 52137a2
1 parent 7ff26c0
commit 52137a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/web-app/src/screens/Console/Common/UsageBarWrapper/SummaryUsageBar.tsx b/web-app/src/screens/Console/Common/UsageBarWrapper/SummaryUsageBar.tsx
@@ -131,7 +131,10 @@ const SummaryUsageBar = ({
       ) : (
         <TenantCapacityMain>
           <TenantCapacity
-            totalCapacity={tenant.status?.usage?.raw || 0}
+            totalCapacity={
+              (tenant.status?.usage?.capacity || 0) +
+              (tenant.status?.usage?.capacity_usage || 0)
+            }
             usedSpaceVariants={spaceVariants}
             statusClass={""}
             render={"bar"}

diff --git a/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx b/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx
@@ -258,7 +258,9 @@ const TenantListItem = ({ tenant }: { tenant: TenantList }) => {
             <Grid container>
               <Grid item xs={2}>
                 <TenantCapacity
-                  totalCapacity={tenant.capacity || 0}
+                  totalCapacity={
+                    (tenant.capacity || 0) + (tenant.capacity_usage || 0)
+                  }
                   usedSpaceVariants={spaceVariants}
                   statusClass={healthStatusToClass(tenant.health_status!)}
                 />