From acfd7551fa5319d24863ba2cf6f5940d45ca34ac Mon Sep 17 00:00:00 2001
From: Ricardo Marques <rimarques@suse.com>
Date: Thu, 21 Nov 2019 11:16:16 +0000
Subject: [PATCH] mgr/dashboard: Cross sign button not working for some modals

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

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---
 .../iscsi-target-image-settings-modal.component.html            | 2 +-
 .../iscsi-target-iqn-settings-modal.component.html              | 2 +-
 .../pool-edit-mode-modal/pool-edit-mode-modal.component.html    | 2 +-
 .../pool-edit-peer-modal/pool-edit-peer-modal.component.html    | 2 +-
 .../rbd-trash-move-modal/rbd-trash-move-modal.component.html    | 2 +-
 .../rbd-trash-purge-modal/rbd-trash-purge-modal.component.html  | 2 +-
 .../rbd-trash-restore-modal.component.html                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
index dc79680cf17fc..8eec60a7db2af 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container class="modal-title">
     <ng-container i18n>Configure</ng-container>&nbsp;
     <small>{{ image }}</small>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
index 3382b616124f8..6671d84bd1756 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container class="modal-title"
                 i18n>Advanced Settings</ng-container>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
index 97dada071478a..a35eda7ad0775 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container i18n
                 class="modal-title">Edit pool mirror mode</ng-container>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
index 2e64b0b95b312..4fd9985a96bd7 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container class="modal-title"
                 i18n>{mode, select, edit {Edit} other {Add}}
   pool mirror peer</ng-container>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
index 06d913bc3c64b..7d166707cac3c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container i18n
                 class="modal-title">Move an image to trash</ng-container>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
index 6c26f4a731c10..d416717577694 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container i18n
                 class="modal-title">Purge Trash</ng-container>
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
index 522ce00a86cc4..c1964e0be7309 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
@@ -1,4 +1,4 @@
-<cd-modal>
+<cd-modal [modalRef]="modalRef">
   <ng-container i18n
                 class="modal-title">Restore Image</ng-container>
 
-- 
2.39.5