From: Tiago Melo <tmelo@suse.com>
Date: Tue, 23 Jun 2020 10:40:23 +0000 (+0000)
Subject: mgr/dashboard: Fix title of disabled table actions
X-Git-Tag: v16.1.0~1875^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce344424766faf1bead50c973b81d8da9be1fe3f;p=ceph.git

mgr/dashboard: Fix title of disabled table actions

Fix regression introduced in a1fac664f5b0fa1c8b78de3440e99ee68d34f512.
Title attribute was unintentionally removed from the table actions.

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

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts
index bc0bd1435c11..44532b666781 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts
@@ -57,6 +57,7 @@ export abstract class PageHelper {
       this.navigateTo();
       this.getFirstTableCell(name).click();
     }
+    cy.contains('Creating...').should('not.exist');
     cy.contains('button', 'Edit').click();
     this.expectBreadcrumbText('Edit');
   }
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 3086a1a5a2ac..871939ec050f 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
@@ -93,7 +93,7 @@ export class RbdSnapshotActionsModel {
   }
 
   getCloneDisableDesc(featuresName: string[]): string | undefined {
-    if (!featuresName.includes('layering')) {
+    if (!featuresName?.includes('layering')) {
       return this.i18n('Parent image must support Layering');
     }
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html
index 68ae24696a5f..c8061057154e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html
@@ -1,12 +1,12 @@
 <div class="btn-group">
   <ng-container *ngIf="getCurrentButton() as action">
     <button type="button"
+            title="{{ useDisableDesc(action) }}"
             class="btn btn-{{btnColor}}"
             [ngClass]="{'disabled': disableSelectionAction(action)}"
             (click)="useClickAction(action)"
             [routerLink]="useRouterLink(action)"
             [preserveFragment]="action.preserveFragment ? '' : null">
-
       <i [ngClass]="[action.icon]"></i>
       <span>{{ action.name }}</span>
     </button>
@@ -28,6 +28,7 @@
       <ng-container *ngFor="let action of dropDownActions">
         <button ngbDropdownItem
                 class="{{ toClassName(action['name']) }}"
+                title="{{ useDisableDesc(action) }}"
                 (click)="useClickAction(action)"
                 [routerLink]="useRouterLink(action)"
                 [preserveFragment]="action.preserveFragment ? '' : null"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.scss
index 8c8366f5b349..11419cee61b4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.scss
@@ -1,4 +1,4 @@
-.dropdown-menu > .disabled > a {
+button.disabled {
   cursor: default !important;
   pointer-events: auto;
 }