From 6f55e273216cf2447fd600e08013eed39174e029 Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Fri, 3 Apr 2020 10:23:37 +0200
Subject: [PATCH] mgr/dashboard: Update bootstrap

Fixes: http://tracker.ceph.com/issues/39326

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 07f28050dba61b851f149a2ed3b63cf5349c04cd)

nautilus: mgr/dashboard: Tabs does not handle click events
Fixes: https://tracker.ceph.com/issues/44809
Conflicts:
	src/pybind/mgr/dashboard/frontend/angular.json
	src/pybind/mgr/dashboard/frontend/package-lock.json
	src/pybind/mgr/dashboard/frontend/package.json
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.scss
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts
	src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts
	src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
	src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
	src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-notification.ts
	src/pybind/mgr/dashboard/frontend/src/styles.scss
- all those files are not needed to fix the tab select issue.
---
 .../src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.html   | 4 ++--
 .../ceph/cephfs/cephfs-detail/cephfs-detail.component.html    | 2 +-
 .../src/app/core/auth/user-tabs/user-tabs.component.html      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.html
index ac4bcf1a51a5..e1e43c291a5c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.html
@@ -2,11 +2,11 @@
   <tab heading="Overview"
        i18n-heading
        [active]="url === '/block/iscsi/overview'"
-       (select)="navigateTo('/block/iscsi/overview')">
+       (selectTab)="navigateTo('/block/iscsi/overview')">
   </tab>
   <tab heading="Targets"
        i18n-heading
        [active]="url === '/block/iscsi/targets'"
-       (select)="navigateTo('/block/iscsi/targets')">
+       (selectTab)="navigateTo('/block/iscsi/targets')">
   </tab>
 </tabset>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
index 73a385bee6a0..f8a5217f9746 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
@@ -35,7 +35,7 @@
   </tab>
   <tab i18n-heading
        heading="Clients: {{ clientCount }}"
-       (select)="clientsSelect=true"
+       (selectTab)="clientsSelect=true"
        (deselect)="clientsSelect=false">
     <cd-cephfs-clients [id]="id"
                        *ngIf="clientsSelect">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html
index 4e0684d93d3b..b707992a9635 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html
@@ -2,11 +2,11 @@
   <tab heading="Users"
        i18n-heading
        [active]="url === '/user-management/users'"
-       (select)="navigateTo('/user-management/users')">
+       (selectTab)="navigateTo('/user-management/users')">
   </tab>
   <tab heading="Roles"
        i18n-heading
        [active]="url === '/user-management/roles'"
-       (select)="navigateTo('/user-management/roles')">
+       (selectTab)="navigateTo('/user-management/roles')">
   </tab>
 </tabset>
-- 
2.47.3