From 705fd91cd85f7de3b5a925fdf1a620ce90d23560 Mon Sep 17 00:00:00 2001
From: Naman Munet <naman.munet@ibm.com>
Date: Mon, 16 Mar 2026 18:44:46 +0530
Subject: [PATCH] tentacle: mgr/dashboard: add helper text to bucket form >
 policy and other spacing fixes

Fixes: https://tracker.ceph.com/issues/75525

Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit f8bc7f6bf7988bc23b36a431ec7875a00aa4d939)
---
 .../rgw-bucket-form/rgw-bucket-form.component.html    | 10 +++++++---
 .../rgw-bucket-notification-list.component.ts         |  2 +-
 .../rgw-bucket-tiering-form.component.html            | 11 ++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
index 7cfc01617640..8b5edc0ea29f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
@@ -69,9 +69,11 @@
 
     <!-- Accounts -->
     @if(accounts.length && accountUsers.length > 0){
-      <cds-checkbox formControlName="isAccountOwner"
-                    i18n>Select account user
-      </cds-checkbox>
+      <div class="form-item">
+        <cds-checkbox formControlName="isAccountOwner"
+                      i18n>Select account user
+        </cds-checkbox>
+      </div>
     }
 
     @if (bucketForm.get('isAccountOwner').value) {
@@ -433,6 +435,8 @@
         <cds-textarea-label for="id"
                             [invalid]="!bucketForm.controls.bucket_policy.valid && (bucketForm.controls.bucket_policy.dirty)"
                             [invalidText]="bucketPolicyError"
+                            helperText="Define access permissions for this bucket using an S3-compatible JSON policy. This controls who can access the bucket and what actions they can perform."
+                            i18n-helperText
                             i18n>Bucket Policy
           <textarea cdsTextArea
                     class="textarea-field"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
index 989d73b9fa53..14e9e823cd1f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
@@ -74,7 +74,7 @@ export class RgwBucketNotificationListComponent extends ListWithDetails implemen
       },
       {
         name: $localize`Destination`,
-        prop: 'Destination',
+        prop: 'Topic',
         flexGrow: 1,
         cellTransformation: CellTemplate.copy
       },
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.html
index f3a41fd72531..9750359ddb8c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.html
@@ -86,7 +86,7 @@
         </ng-template>
       </div>
       <legend class="cds--label">Choose a configuration scope</legend>
-      <div>
+      <div class="form-item">
         <cds-radio-group
           formControlName="hasPrefix"
         >
@@ -126,9 +126,10 @@
       </div>
 
       <!-- tags -->
-      <div *ngIf="tieringForm.controls.hasPrefix.value">
+      <div class="form-item"
+           *ngIf="tieringForm.controls.hasPrefix.value">
         <div class="form-group-header">Tags</div>
-        <div>All the tags must exist in the object's tag set for the rule to apply.</div>
+        <div class="cds-mb-4">All the tags must exist in the object's tag set for the rule to apply.</div>
         <ng-container formArrayName="tags"
                       *ngFor="let tags of tags.controls; index as i">
           <ng-container [formGroupName]="i">
@@ -194,7 +195,7 @@
       </div>
 
       <legend class="cds--label">Status</legend>
-      <div>
+      <div class="form-item">
         <cds-radio-group
           formControlName="status">
         <cds-radio [value]="'Enabled'"
@@ -203,7 +204,7 @@
                      i18n>Disabled </cds-radio>
         </cds-radio-group>
       </div>
-      <div class="form-item">
+      <div>
         <cds-number formControlName="days"
                     label="Number of days"
                     [min]="1"
-- 
2.47.3