From 52137a250c5c38fd40b0851a1388713fb8a38ef5 Mon Sep 17 00:00:00 2001
From: Allan Roger Reid <allanrogerreid@gmail.com>
Date: Wed, 26 Jun 2024 02:29:39 -0700
Subject: [PATCH] Fix TenantCapacity usage (#2184)

---
 .../Console/Common/UsageBarWrapper/SummaryUsageBar.tsx       | 5 ++++-
 .../screens/Console/Tenants/ListTenants/TenantListItem.tsx   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web-app/src/screens/Console/Common/UsageBarWrapper/SummaryUsageBar.tsx b/web-app/src/screens/Console/Common/UsageBarWrapper/SummaryUsageBar.tsx
index 01ff7f855de..75170540ed8 100644
--- 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
index b78e77d997e..fb9f6e369d3 100644
--- 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!)}
                 />