From 60fa799d547eb4d94704767fdd659c3431dc0b6b Mon Sep 17 00:00:00 2001
From: Sagar Gopale <sagar.gopale@ibm.com>
Date: Thu, 18 Dec 2025 13:52:15 +0530
Subject: [PATCH] mgr/dashboard: rename 'Zone Group' labels to 'Zonegroup'

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

Signed-off-by: Sagar Gopale <sagar.gopale@ibm.com>
---
 .../service-form/service-form.component.html       |  4 ++--
 .../create-rgw-service-entities.component.html     |  8 ++++----
 ...ultisite-zonegroup-deletion-form.component.html |  6 +++---
 .../app/ceph/rgw/models/rgw-storage-class.model.ts |  2 +-
 .../rgw-daemon-list/rgw-daemon-list.component.ts   |  2 +-
 .../rgw-multisite-details.component.ts             |  6 +++---
 .../rgw-multisite-migrate.component.html           | 10 +++++-----
 .../rgw-multisite-sync-pipe-modal.component.ts     |  2 +-
 .../rgw-multisite-wizard.component.html            |  2 +-
 .../rgw-multisite-zone-form.component.html         |  8 ++++----
 .../rgw-multisite-zonegroup-form.component.html    | 14 +++++++-------
 .../rgw-overview-dashboard.component.html          |  2 +-
 .../rgw-storage-class-form.component.html          |  2 +-
 .../rgw-storage-class-list.component.ts            |  2 +-
 14 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index cdcb637551f7..4b5dd8b33018 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -13,7 +13,7 @@
                         i18n>
           <a class="text-decoration-underline"
              (click)="createMultisiteSetup()">
-             Click here</a> to create a new Realm/Zone Group/Zone
+             Click here</a> to create a new Realm/Zonegroup/Zone
         </cd-alert-panel>
 
         <cd-alert-panel *ngIf="serviceForm.controls.service_type.value === 'oauth2-proxy'"
@@ -209,7 +209,7 @@
              *ngIf="serviceForm.controls.service_type.value === 'rgw'">
           <label class="cd-col-form-label"
                  for="zonegroup_name"
-                 i18n>Zone Group</label>
+                 i18n>Zonegroup</label>
           <div class="cd-col-form-input">
             <select class="form-select"
                     id="zonegroup_name"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
index 36c31b4a93ec..6bb030d29a63 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html
@@ -4,7 +4,7 @@
            (overlaySelected)="closeModal()">
   <cds-modal-header (closeSelect)="closeModal()">
     <h3 cdsModalHeaderHeading
-        i18n>Create Realm/Zone Group/Zone</h3>
+        i18n>Create Realm/Zonegroup/Zone</h3>
     <cd-help-text [formAllFieldsRequired]="true"></cd-help-text>
   </cds-modal-header>
   <form
@@ -16,7 +16,7 @@
     <div cdsModalContent>
       <cd-alert-panel type="info"
                       spacingClass="mt-3"
-                      i18n>The realm/zone group/zone created will be set as default and master.
+                      i18n>The realm/zonegroup/zone created will be set as default and master.
       </cd-alert-panel>
       <div class="form-item">
         <cds-text-label
@@ -55,11 +55,11 @@
                      createMultisiteEntitiesForm.controls.zonegroupName.dirty"
           [invalidText]="zoneGroupNameError"
           i18n
-          >Zone Group Name
+          >Zonegroup Name
           <input
             cdsText
             type="text"
-            placeholder="Zone group name..."
+            placeholder="Zonegroup name..."
             id="zonegroupName"
             name="zonegroupName"
             formControlName="zonegroupName"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
index f23e017be01e..2f92b0467a04 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">Delete Zone Group</ng-container>
+                class="modal-title">Delete Zonegroup</ng-container>
 
   <ng-container class="modal-content">
     <form name="zonegroupForm"
@@ -8,12 +8,12 @@
           novalidate>
       <div class="modal-body ms-4">
         <label i18n>
-          This will delete your <strong>{{zonegroup?.name}}</strong> Zone Group.
+          This will delete your <strong>{{zonegroup?.name}}</strong> Zonegroup.
         </label>
         <ng-container *ngIf="zonesList.length > 0">
           <label class="mt-3"
                  i18n>
-              Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zone Group?</label>
+              Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zonegroup?</label>
           <ng-container *ngIf="includedPools.size > 0">
             <label i18n>
               This will delete the following:</label>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-storage-class.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-storage-class.model.ts
index 370fa78d0b64..bb9cb0143e02 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-storage-class.model.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-storage-class.model.ts
@@ -278,7 +278,7 @@ export const READTHROUGH_RESTORE_DAYS_TEXT = $localize`The days for which object
 
 export const RESTORE_STORAGE_CLASS_TEXT = $localize`The storage class to which object data is to be restored.`;
 
-export const ZONEGROUP_TEXT = $localize`A Zone Group is a logical grouping of one or more zones that share the same data
+export const ZONEGROUP_TEXT = $localize`A Zonegroup is a logical grouping of one or more zones that share the same data
                   and metadata, allowing for multi-site replication and geographic distribution of
                   data.`;
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts
index b1b6b9be798b..07d22eb77ffd 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts
@@ -54,7 +54,7 @@ export class RgwDaemonListComponent extends ListWithDetails implements OnInit {
         flexGrow: 2
       },
       {
-        name: $localize`Zone Group`,
+        name: $localize`Zonegroup`,
         prop: 'zonegroup_name',
         flexGrow: 2
       },
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
index bb86c4784154..50fe1e4c066e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
@@ -59,9 +59,9 @@ export class RgwMultisiteDetailsComponent extends CdForm implements OnDestroy, O
 
   messages = {
     noDefaultRealm: $localize`Please create a default realm first to enable this feature`,
-    noMasterZone: $localize`Please create a master zone for each zone group to enable this feature`,
+    noMasterZone: $localize`Please create a master zone for each zonegroup to enable this feature`,
     noRealmExists: $localize`No realm exists`,
-    disableExport: $localize`Please create master zone group and master zone for each of the realms`
+    disableExport: $localize`Please create master zonegroup and master zone for each of the realms`
   };
 
   icons = Icons;
@@ -244,7 +244,7 @@ export class RgwMultisiteDetailsComponent extends CdForm implements OnDestroy, O
       {
         permission: 'create',
         icon: Icons.add,
-        name: this.actionLabels.CREATE + ' Zone Group',
+        name: this.actionLabels.CREATE + ' Zonegroup',
         click: () => this.openModal('zonegroup'),
         disable: () => this.getDisable(),
         visible: () => !this.showMigrateAndReplicationActions
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
index e9d1c7e69266..aa3f59ae9d75 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html
@@ -2,7 +2,7 @@
   <ng-container i18n="form title"
                 class="modal-title">Migrate Single Site to Multi-site
     <cd-helper>
-      <span>Migrate from a single-site deployment with a default zone group and zone to a multi-site system</span>
+      <span>Migrate from a single-site deployment with a default zonegroup and zone to a multi-site system</span>
     </cd-helper>
   </ng-container>
 
@@ -34,11 +34,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroupName"
-               i18n>Rename default zone group</label>
+               i18n>Rename default zonegroup</label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
-                 placeholder="Zone group name..."
+                 placeholder="Zonegroup name..."
                  id="zonegroupName"
                  name="zonegroupName"
                  formControlName="zonegroupName">
@@ -47,13 +47,13 @@
                 i18n>This field is required.</span>
           <span class="invalid-feedback"
                 *ngIf="multisiteMigrateForm.showError('zonegroupName', formDir, 'uniqueName')"
-                i18n>The chosen zone group name is already in use.</span>
+                i18n>The chosen zonegroup name is already in use.</span>
         </div>
       </div>
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroup_endpoints"
-               i18n>Zone group Endpoints
+               i18n>Zonegroup Endpoints
         </label>
         <div class="cd-col-form-input">
           <input class="form-control"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-pipe-modal/rgw-multisite-sync-pipe-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-pipe-modal/rgw-multisite-sync-pipe-modal.component.ts
index aeaf66b3d3e1..92f94d283c5c 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-pipe-modal/rgw-multisite-sync-pipe-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-pipe-modal/rgw-multisite-sync-pipe-modal.component.ts
@@ -19,7 +19,7 @@ import { ComboBoxItem } from '~/app/shared/models/combo-box.model';
 
 const ALL_ZONES = $localize`All zones (*)`;
 const ALL_BUCKET_SELECTED_HELP_TEXT =
-  'If no value is provided, all the buckets in the zone group will be selected.';
+  'If no value is provided, all the buckets in the zonegroup will be selected.';
 
 interface PipeParams {
   source: { zones: string[]; bucket: string };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.html
index 7da9c3d90302..9cc4afc6bf08 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.html
@@ -104,7 +104,7 @@
                 <div class="form-group row">
                   <label class="cd-col-form-label required"
                          for="zonegroupName"
-                         i18n>Zone Group Name</label>
+                         i18n>Zonegroup Name</label>
                   <div class="cd-col-form-input">
                     <input class="form-control"
                            type="text"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
index a8855e94d5b4..b30a8f1b7804 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html
@@ -17,9 +17,9 @@
           formControlName="selectedZonegroup"
           [disabled]="action === actionLabels.EDIT ? true : null"
           (change)="onZoneGroupChange($event.target.value)"
-          label="Zone group"
+          label="Zonegroup"
           i18n
-          >Zone group
+          >Zonegroup
           <option
             *ngFor="let zonegroupName of zonegroupList"
             [value]="zonegroupName.name"
@@ -73,7 +73,7 @@
           i18n
           [disabled]="action === actionLabels.EDIT ? true : null"
           >Mark as default zone
-          <cd-help-text *ngIf="disableDefault && action === actionLabels.CREATE">Default zone can only exist in a default zone group.
+          <cd-help-text *ngIf="disableDefault && action === actionLabels.CREATE">Default zone can only exist in a default zonegroup.
           </cd-help-text>
           <cd-help-text *ngIf="isDefaultZone">
             <span>You cannot unset the default flag.</span>
@@ -94,7 +94,7 @@
           [disabled]="action === actionLabels.EDIT ? true : null"
           i18n
           >Master
-          <cd-help-text *ngIf="disableMaster">Master zone already exist for the selected zone group.
+          <cd-help-text *ngIf="disableMaster">Master zone already exist for the selected zonegroup.
           </cd-help-text>
           <cd-help-text *ngIf="isMasterZone">
             <span>You cannot unset the master flag. </span>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
index e607addd529e..85c8a6890672 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html
@@ -1,6 +1,6 @@
 <cd-modal [modalRef]="activeModal">
   <ng-container i18n="form title"
-                class="modal-title">{{ action | titlecase }} Zone Group</ng-container>
+                class="modal-title">{{ action | titlecase }} Zonegroup</ng-container>
 
   <ng-container class="modal-content">
     <form name="multisiteZonegroupForm"
@@ -30,11 +30,11 @@
       <div class="form-group row">
         <label class="cd-col-form-label required"
                for="zonegroupName"
-               i18n>Zone Group Name</label>
+               i18n>Zonegroup Name</label>
         <div class="cd-col-form-input">
           <input class="form-control"
                  type="text"
-                 placeholder="Zone group name..."
+                 placeholder="Zonegroup name..."
                  id="zonegroupName"
                  name="zonegroupName"
                  formControlName="zonegroupName">
@@ -43,7 +43,7 @@
                 i18n>This field is required.</span>
           <span class="invalid-feedback"
                 *ngIf="multisiteZonegroupForm.showError('zonegroupName', formDir, 'uniqueName')"
-                i18n>The chosen zone group name is already in use.</span>
+                i18n>The chosen zonegroup name is already in use.</span>
         <div class="custom-control custom-checkbox">
           <input class="form-check-input"
                  id="default_zonegroup"
@@ -55,7 +55,7 @@
                  for="default_zonegroup"
                  i18n>Default</label>
           <span *ngIf="disableDefault && action === actionLabels.CREATE">
-            <cd-helper i18n>Zone group doesn't belong to the default realm.</cd-helper>
+            <cd-helper i18n>Zonegroup doesn't belong to the default realm.</cd-helper>
           </span>
           <cd-helper *ngIf="action === actionLabels.EDIT && !info.data.is_default">
             <span i18n>Please consult the&nbsp;<cd-doc section="rgw-multisite"></cd-doc>&nbsp;to follow the failover mechanism</span>
@@ -73,7 +73,7 @@
                  for="master_zonegroup"
                  i18n>Master</label>
           <span *ngIf="disableMaster && action === actionLabels.CREATE">
-            <cd-helper i18n>Multiple master zone groups can't be configured. If you want to create a new zone group and make it the master zone group, you must delete the default zone group.</cd-helper>
+            <cd-helper i18n>Multiple master zonegroups can't be configured. If you want to create a new zonegroup and make it the master zonegroup, you must delete the default zonegroup.</cd-helper>
           </span>
           <cd-helper *ngIf="action === actionLabels.EDIT && !info.data.is_master">
             <span i18n>Please consult the&nbsp;<cd-doc section="rgw-multisite"></cd-doc>&nbsp;to follow the failover mechanism</span>
@@ -201,7 +201,7 @@
     <div class="modal-footer">
       <cd-form-button-panel (submitActionEvent)="submit()"
                             [form]="multisiteZonegroupForm"
-                            [submitText]="(action | titlecase) + ' ' + 'Zone Group'"></cd-form-button-panel>
+                            [submitText]="(action | titlecase) + ' ' + 'Zonegroup'"></cd-form-button-panel>
     </div>
     </form>
   </ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
index 16963b069206..69ab46002049 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.html
@@ -19,7 +19,7 @@
 
       <cd-card-row [data]="rgwZonegroupCount"
                    link="/rgw/multisite"
-                   title="Zone Group"
+                   title="Zonegroup"
                    summaryType="simplified"
                    *ngIf="rgwZonegroupCount != null"></cd-card-row>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.html
index 821c529a52af..1c0de9c9889d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.html
@@ -40,7 +40,7 @@
         <!-- Zonegroup -->
         <div cdsCol>
           <cds-select
-            label="Zone Group Name"
+            label="Zonegroup Name"
             i18n-label
             formControlName="zonegroup"
             id="zonegroup"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts
index 57f966ffff91..023de5232e8d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts
@@ -75,7 +75,7 @@ export class RgwStorageClassListComponent extends ListWithDetails implements OnI
         flexGrow: 2
       },
       {
-        name: $localize`Zone Group`,
+        name: $localize`Zonegroup`,
         prop: 'zonegroup_name',
         flexGrow: 2
       },
-- 
2.47.3