mgr/dashboard: RGW Details card cleanup

Fixes: https://tracker.ceph.com/issues/62377
Signed-off-by: cloudbehl <cloudbehl@gmail.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html
index 15b33e141229d47c0bc1d7587498420712704adc..c947e4490625b9e94b64df826170f83f736903af 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html
@@ -3,18 +3,18 @@
     <tbody>
       <tr>
         <td i18n
-            class="bold w-25">Name</td>
-        <td class="w-75">{{ selection.bid }}</td>
+            class="bold w-25">Versioning</td>
+        <td class="w-75">{{ selection.versioning }}</td>
       </tr>
       <tr>
         <td i18n
-            class="bold">ID</td>
-        <td>{{ selection.id }}</td>
+            class="bold">Encryption</td>
+        <td>{{ selection.encryption }}</td>
       </tr>
       <tr>
         <td i18n
-            class="bold">Owner</td>
-        <td>{{ selection.owner }}</td>
+            class="bold">MFA Delete</td>
+        <td>{{ selection.mfa_delete }}</td>
       </tr>
       <tr>
         <td i18n
@@ -28,54 +28,14 @@
       </tr>
       <tr>
         <td i18n
-            class="bold">Marker</td>
-        <td>{{ selection.marker }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Maximum marker</td>
-        <td>{{ selection.max_marker }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Version</td>
-        <td>{{ selection.ver }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Master version</td>
-        <td>{{ selection.master_ver }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Modification time</td>
+            class="bold">Last modification time</td>
         <td>{{ selection.mtime | cdDate }}</td>
       </tr>
-      <tr>
-        <td i18n
-            class="bold">Zonegroup</td>
-        <td>{{ selection.zonegroup }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Versioning</td>
-        <td>{{ selection.versioning }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">Encryption</td>
-        <td>{{ selection.encryption }}</td>
-      </tr>
-      <tr>
-        <td i18n
-            class="bold">MFA Delete</td>
-        <td>{{ selection.mfa_delete }}</td>
-      </tr>
     </tbody>
   </table>
 
   <!-- Bucket quota -->
-  <div *ngIf="selection.bucket_quota">
+  <div>
     <legend i18n>Bucket quota</legend>
     <table class="table table-striped table-bordered">
       <tbody>
@@ -84,24 +44,26 @@
               class="bold w-25">Enabled</td>
           <td class="w-75">{{ selection.bucket_quota.enabled | booleanText }}</td>
         </tr>
-        <tr>
-          <td i18n
-              class="bold">Maximum size</td>
-          <td *ngIf="selection.bucket_quota.max_size <= -1"
-              i18n>Unlimited</td>
-          <td *ngIf="selection.bucket_quota.max_size > -1">
-            {{ selection.bucket_quota.max_size | dimless }}
-          </td>
-        </tr>
-        <tr>
-          <td i18n
-              class="bold">Maximum objects</td>
-          <td *ngIf="selection.bucket_quota.max_objects <= -1"
-              i18n>Unlimited</td>
-          <td *ngIf="selection.bucket_quota.max_objects > -1">
-            {{ selection.bucket_quota.max_objects }}
-          </td>
-        </tr>
+        <ng-container *ngIf="selection.bucket_quota.enabled">
+          <tr>
+            <td i18n
+                class="bold">Maximum size</td>
+            <td *ngIf="selection.bucket_quota.max_size <= -1"
+                i18n>Unlimited</td>
+            <td *ngIf="selection.bucket_quota.max_size > -1">
+              {{ selection.bucket_quota.max_size | dimless }}
+            </td>
+          </tr>
+          <tr>
+            <td i18n
+                class="bold">Maximum objects</td>
+            <td *ngIf="selection.bucket_quota.max_objects <= -1"
+                i18n>Unlimited</td>
+            <td *ngIf="selection.bucket_quota.max_objects > -1">
+              {{ selection.bucket_quota.max_objects }}
+            </td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
index ca6e09f0cec7254bd9c384147f227bae0e4f4d7f..59f62952a5075b8dcc46a09d06ef4bc5cde54784 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
@@ -27,6 +27,7 @@ describe('RgwBucketDetailsComponent', () => {
     fixture = TestBed.createComponent(RgwBucketDetailsComponent);
     component = fixture.componentInstance;
     component.selection = new CdTableSelection();
+    component.selection = { bid: 'bucket', bucket_quota: { enabled: false, max_size: 0 } };
     fixture.detectChanges();
   });