From 0ed14dc833633adaaea3112541cf2ddc4121dfae Mon Sep 17 00:00:00 2001 From: Dnyaneshwari Date: Tue, 1 Oct 2024 17:18:13 +0530 Subject: [PATCH] mgr/dashboard: Unable to delete realm via dashboard Replacing Bootstrap Modal Service (ModalService) with Carbon Modal Service (ModalCdsService) Fixes: https://tracker.ceph.com/issues/68290 Signed-off-by: Dnyaneshwari talwekar --- .../rgw-multisite-details.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 fbe3110b978ea..6204432470e74 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 @@ -546,20 +546,20 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit { delete(node: TreeNode) { if (node.data.type === 'realm') { - this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { + const modalRef = this.cdsModalService.show(CriticalConfirmationModalComponent, { itemDescription: $localize`${node.data.type} ${node.data.name}`, itemNames: [`${node.data.name}`], submitAction: () => { this.rgwRealmService.delete(node.data.name).subscribe( () => { - this.modalRef.close(); this.notificationService.show( NotificationType.success, $localize`Realm: '${node.data.name}' deleted successfully` ); + this.cdsModalService.dismissAll(); }, () => { - this.modalRef.componentInstance.stopLoadingSpinner(); + this.cdsModalService.stopLoadingSpinner(modalRef.deletionForm); } ); } -- 2.39.5