From 6be15fbae89af921421f24a7e329f0923296c178 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 27 Aug 2020 17:31:48 +0000 Subject: [PATCH] mgr/dashboard: Fix stale table actions If we don't emit the select event, the action button can become stale and not update when the data changes. This fixes a regression introduced in 31e9bbb9b308277d2f89390d5ff62f13457d69cb Fixes: https://tracker.ceph.com/issues/47175 Signed-off-by: Tiago Melo (cherry picked from commit c9a73185a9d8348d0a5e72b76b6bcabd5ac34da8) Conflicts: 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.ts One of the methods used still requires 1 parameter in nautilus --- .../src/app/shared/datatable/table/table.component.html | 2 +- .../src/app/shared/datatable/table/table.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html index 292db1cb157b..616ba25001e4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html @@ -87,7 +87,7 @@ [cssClasses]="paginationClasses" [selectionType]="selectionType" [selected]="selection.selected" - (select)="onSelect()" + (select)="onSelect($event)" [sorts]="userConfig.sorts" (sort)="changeSorting($event)" [columns]="tableColumns" diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts index d85593c937c0..57fa7aad7680 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts @@ -451,7 +451,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O return; } this.selection.selected = newSelected; - this.onSelect(); + this.onSelect(this.selection); } onSelect($event: any) { @@ -459,8 +459,8 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O // https://github.com/swimlane/ngx-datatable/issues/899 if (_.has($event, 'selected')) { this.selection.selected = $event['selected']; - this.updateSelection.emit(_.clone(this.selection)); } + this.updateSelection.emit(_.clone(this.selection)); } toggleColumn($event: any) { -- 2.47.3