mgr/dashboard: fix removal of non-master zone from the zone group via dashboard

Fixes: https://tracker.ceph.com/issues/62110
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts
index 1fb9c178da155c891c651a52664633c99d25d1be..19d957646a7c8668a9f6cfd75be59db636c44bfd 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts
@@ -325,14 +325,4 @@ export class RgwMultisiteZoneFormComponent implements OnInit {
         );
     }
   }
-
-  checkUrlArray(endpoints: string) {
-    let endpointsArray = [];
-    if (endpoints.includes(',')) {
-      endpointsArray = endpoints.split(',');
-    } else {
-      endpointsArray.push(endpoints);
-    }
-    return endpointsArray;
-  }
 }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts
index 01955cd49a1a66914192d6e541ffbb76cd0c9c6c..9a08d2fa9cb516e212778a2c12746b254eb887e7 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts
@@ -248,7 +248,7 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit {
       this.zonegroup = new RgwZonegroup();
       this.zonegroup.name = this.info.data.name;
       this.newZonegroupName = values['zonegroupName'];
-      this.zonegroup.endpoints = values['zonegroup_endpoints'];
+      this.zonegroup.endpoints = values['zonegroup_endpoints'].toString();
       this.zonegroup.placement_targets = values['placementTargets'];
       this.rgwZonegroupService
         .update(
@@ -275,16 +275,6 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit {
     }
   }
 
-  checkUrlArray(endpoints: string) {
-    let endpointsArray = [];
-    if (endpoints.includes(',')) {
-      endpointsArray = endpoints.split(',');
-    } else {
-      endpointsArray.push(endpoints);
-    }
-    return endpointsArray;
-  }
-
   addPlacementTarget() {
     this.placementTargets = this.multisiteZonegroupForm.get('placementTargets') as FormArray;
     const fg = new CdFormGroup({