From b0df51cc6a30a9e97833f72283e7551cf2251b99 Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Fri, 21 Jul 2023 16:57:41 +0530 Subject: [PATCH] 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 --- .../rgw-multisite-zone-form.component.ts | 10 ---------- .../rgw-multisite-zonegroup-form.component.ts | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) 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 1fb9c178da1..19d957646a7 100644 --- 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 01955cd49a1..9a08d2fa9cb 100644 --- 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({ -- 2.39.5