From 95ec9194722a3b7ecf53dc66713d4dcd4c36bcd1 Mon Sep 17 00:00:00 2001
From: Afreen Misbah <afreen@ibm.com>
Date: Mon, 16 Jun 2025 20:46:39 +0530
Subject: [PATCH] mgr/dashboard: Add --force flag for listeners

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

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 604d351a4e7bbf47baf57e10f67219a2eea919e0)

Conflicts:
        src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
        src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
---
 .../nvmeof-listeners-list/nvmeof-listeners-list.component.ts | 5 ++++-
 .../dashboard/frontend/src/app/shared/api/nvmeof.service.ts  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
index 539551b5f80e9..4421de0ac134a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
@@ -104,7 +104,10 @@ export class NvmeofListenersListComponent implements OnInit, OnChanges {
     this.modalService.show(DeleteConfirmationModalComponent, {
       itemDescription: 'Listener',
       actionDescription: 'delete',
-      itemNames: [`listener ${listener.host_name} (${listener.traddr}:${listener.trsvcid})`],
+      infoMessage: $localize`This action will delete listener despite any active connections.`,
+      itemNames: [
+        $localize`listener` + ' ' + `${listener.host_name} (${listener.traddr}:${listener.trsvcid})`
+      ],
       submitActionObservable: () =>
         this.taskWrapper.wrapTaskAroundCall({
           task: new FinishedTask('nvmeof/listener/delete', {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
index a4a98f2944124..ceafd6c538613 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
@@ -104,7 +104,8 @@ export class NvmeofService {
       {
         observe: 'response',
         params: {
-          trsvcid
+          trsvcid,
+          force: 'true'
         }
       }
     );
-- 
2.39.5