From 55a3902e6d12082dd1283749416efeac93cece55 Mon Sep 17 00:00:00 2001
From: Tiago Melo <tspmelo@gmail.com>
Date: Tue, 31 Jul 2018 16:58:11 +0100
Subject: [PATCH] mgr/dashboard: Replace current delete icons with "fa-times"

This will allow us to better differentiate a actual delete from a move to trash.

Signed-off-by: Tiago Melo <tmelo@suse.com>
---
 .../src/app/ceph/block/rbd-list/rbd-list.component.ts       | 2 +-
 .../block/rbd-snapshot-list/rbd-snapshot-actions.model.ts   | 2 +-
 .../ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts   | 2 +-
 .../app/ceph/rgw/rgw-user-form/rgw-user-form.component.html | 6 +++---
 .../app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts   | 2 +-
 .../src/app/core/auth/role-list/role-list.component.ts      | 2 +-
 .../src/app/core/auth/user-list/user-list.component.ts      | 2 +-
 .../deletion-modal/deletion-modal.component.spec.ts         | 4 ++--
 .../datatable/table-actions/table-actions.component.spec.ts | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts
index 62a552f2d575a..4630cf0974f42 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts
@@ -95,7 +95,7 @@ export class RbdListComponent implements OnInit {
     };
     const deleteAction: CdTableAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       click: () => this.deleteRbdModal(),
       name: 'Delete'
     };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts
index 42ce1a28c95df..7b6907e24be2e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts
@@ -50,7 +50,7 @@ export class RbdSnapshotActionsModel {
   };
   deleteSnap: CdTableAction = {
     permission: 'delete',
-    icon: 'fa-trash-o',
+    icon: 'fa-times',
     disable: (selection: CdTableSelection) =>
       selection.hasSingleSelection && !selection.first().is_protected,
     name: 'Delete'
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
index f43e05293ba11..b7ced8049b2c9 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
@@ -62,7 +62,7 @@ export class RgwBucketListComponent {
     };
     const deleteAction: CdTableAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       click: () => this.deleteAction(),
       name: 'Delete'
     };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index 45b4f0ae61f7f..b4b5e60af608a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -265,7 +265,7 @@
                           i18n-tooltip
                           tooltip="Delete"
                           (click)="deleteSubuser(i)">
-                    <i class="fa fa-trash-o"></i>
+                    <i class="fa fa-times"></i>
                   </button>
                 </span>
               </div>
@@ -322,7 +322,7 @@
                           i18n-tooltip
                           tooltip="Delete"
                           (click)="deleteS3Key(i)">
-                    <i class="fa fa-trash-o"></i>
+                    <i class="fa fa-times"></i>
                   </button>
                 </span>
               </div>
@@ -412,7 +412,7 @@
                           i18n-tooltip
                           tooltip="Delete"
                           (click)="deleteCapability(i)">
-                    <i class="fa fa-trash-o"></i>
+                    <i class="fa fa-times"></i>
                   </button>
                 </span>
               </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
index cc9edcc2693b4..485ccf214ffeb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
@@ -78,7 +78,7 @@ export class RgwUserListComponent {
     };
     const deleteAction: CdTableAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       click: () => this.deleteAction(),
       name: 'Delete'
     };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts
index dcb43df514a4f..e0857fe5777de 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts
@@ -56,7 +56,7 @@ export class RoleListComponent implements OnInit {
     };
     const deleteAction: CdTableAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       disable: () => !this.selection.hasSingleSelection || this.selection.first().system,
       click: () => this.deleteRoleModal(),
       name: 'Delete'
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts
index 5fd4abeb3d0c4..bdce37578083e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts
@@ -53,7 +53,7 @@ export class UserListComponent implements OnInit {
     };
     const deleteAction: CdTableAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       click: () => this.deleteUserModal(),
       name: 'Delete'
     };
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts
index 7e27c85ba4f23..75635444f770c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts
@@ -20,7 +20,7 @@ export class MockModule {}
     <button type="button"
         class="btn btn-sm btn-primary"
         (click)="openCtrlDriven()">
-      <i class="fa fa-fw fa-trash"></i>Deletion Ctrl-Test
+      <i class="fa fa-fw fa-times"></i>Deletion Ctrl-Test
       <ng-template #ctrlDescription>
         The spinner is handled by the controller if you have use the modal as ViewChild in order to
         use it's functions to stop the spinner or close the dialog.
@@ -30,7 +30,7 @@ export class MockModule {}
     <button type="button"
             class="btn btn-sm btn-primary"
             (click)="openModalDriven()">
-      <i class="fa fa-fw fa-trash"></i>Deletion Modal-Test
+      <i class="fa fa-fw fa-times"></i>Deletion Modal-Test
       <ng-template #modalDescription>
         The spinner is handled by the modal if your given deletion function returns a Observable.
       </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts
index 970bb421ec1a7..cdd1cee67aced 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts
@@ -64,7 +64,7 @@ describe('TableActionsComponent', () => {
     };
     deleteAction = {
       permission: 'delete',
-      icon: 'fa-trash-o',
+      icon: 'fa-times',
       buttonCondition: (selection: CdTableSelection) => selection.hasSelection,
       disable: (selection: CdTableSelection) =>
         !selection.hasSelection || selection.first().cdExecuting,
-- 
2.39.5