From cb3a695c2551b59bf9a45fd0d36da6374ce304a0 Mon Sep 17 00:00:00 2001
From: Alex <33497058+bexsoft@users.noreply.github.com>
Date: Wed, 27 Apr 2022 10:36:39 -0600
Subject: [PATCH] Removed quota from versioning section & added inside summary
 page (#1910)

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
---
 .../BucketDetails/BucketSummaryPanel.tsx      | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx
index 50c116945..a1bbeaeed 100644
--- a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx
+++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx
@@ -510,6 +510,14 @@ const BucketSummary = ({
                     }
                   />
                 </Box>
+                <EditablePropertyItem
+                    iamScopes={[IAM_SCOPES.ADMIN_SET_BUCKET_QUOTA]}
+                    resourceName={bucketName}
+                    property={"Quota:"}
+                    value={quotaEnabled ? "Enabled" : "Disabled"}
+                    onEdit={setBucketQuota}
+                    isLoading={loadingQuota}
+                />
               </Box>
 
               <Box
@@ -520,6 +528,9 @@ const BucketSummary = ({
                 }}
               >
                 <ReportedUsage bucketSize={bucketSize} />
+                {quotaEnabled && quota ? (
+                    <BucketQuotaSize quota={quota} />
+                ) : null}
               </Box>
             </Box>
           </Grid>
@@ -546,31 +557,11 @@ const BucketSummary = ({
                   <EditablePropertyItem
                     iamScopes={[IAM_SCOPES.S3_PUT_BUCKET_VERSIONING]}
                     resourceName={bucketName}
-                    property={"Versioning:"}
-                    value={isVersioned ? "Enabled" : "Disabled"}
+                    property={"Current Status:"}
+                    value={isVersioned ? "Enabled" : "Unversioned (Default)"}
                     onEdit={setBucketVersioning}
                     isLoading={loadingVersioning}
                   />
-
-                  <EditablePropertyItem
-                    iamScopes={[IAM_SCOPES.ADMIN_SET_BUCKET_QUOTA]}
-                    resourceName={bucketName}
-                    property={"Quota:"}
-                    value={quotaEnabled ? "Enabled" : "Disabled"}
-                    onEdit={setBucketQuota}
-                    isLoading={loadingQuota}
-                  />
-                </Box>
-                <Box
-                  sx={{
-                    display: "grid",
-                    gridTemplateColumns: "1fr",
-                    alignItems: "flex-start",
-                  }}
-                >
-                  {quotaEnabled && quota ? (
-                    <BucketQuotaSize quota={quota} />
-                  ) : null}
                 </Box>
               </Box>
             </Grid>