inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4893] Fix visibility condition in datatable action menu (#5088)

Browse Source 
* [ADF-4893] Fix visibility condition in datatable action menu

* Add filtering for when menu cache is disabled

* Fix unit test and improve code

* Fix linting

* Fix linting

* Add missing return type
This commit is contained in:
davidcanonieto
2019-10-14 15:28:24 +01:00
committed by Eugenio Romano
parent 1d7ef62095
commit 47ec01555a
3 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demo-shell/src/app/components/cloud/shared/cloud-settings.component.ts
View File

@@ -69,13 +69,13 @@ export class CloudSettingsComponent implements OnInit, OnDestroy {
setCurrentSettings(settings) {
if (settings) {
this.multiselect = settings.multiselect;
this.actionMenu = this.actionMenu;
this.contextMenu = this.contextMenu;
this.actions = this.actions;
this.testingMode = settings.testingMode;
this.selectionMode = settings.selectionMode;
this.taskDetailsRedirection = settings.taskDetailsRedirection;
this.processDetailsRedirection = settings.processDetailsRedirection;
this.actionMenu = settings.actionMenu;
this.contextMenu = settings.contextMenu;
this.actions = settings.actions;
}
}

52
lib/core/datatable/components/datatable/datatable.component.spec.ts
View File

@@ -554,6 +554,20 @@ describe('DataTable', () => {
expect(actions.length).toBe(4);
});
it('should show only visible actions', () => {
const unfilteredActions = [
{ title: 'action1', name: 'view1', visible: true },
{ title: 'action2', name: 'view2', visible: false },
{ title: 'action3', name: 'view3', visible: null },
{ title: 'action4', name: 'view4' }
];
const actions = dataTable.getVisibleActions(unfilteredActions);
expect(actions.length).toBe(2);
expect(actions[0].title).toBe('action1');
expect(actions[1].title).toBe('action4');
});
it('should initialize default adapter', () => {
const table = new DataTableComponent(null, null);
expect(table.data).toBeUndefined();
@@ -591,8 +605,8 @@ describe('DataTable', () => {
dataTable.onRowClick(row, null);
setTimeout(() => {
dataTable.onRowClick(row, null);
}
dataTable.onRowClick(row, null);
}
, 240);
});
@@ -609,9 +623,9 @@ describe('DataTable', () => {
dataTable.onRowClick(row, null);
setTimeout(() => {
dataTable.onRowClick(row, null);
dataTable.onRowClick(row, null);
}
dataTable.onRowClick(row, null);
dataTable.onRowClick(row, null);
}
, 240);
});
@@ -632,8 +646,8 @@ describe('DataTable', () => {
dataTable.onRowClick(row, null);
setTimeout(() => {
dataTable.onRowClick(row, null);
}
dataTable.onRowClick(row, null);
}
, 260);
});
@@ -752,14 +766,14 @@ describe('DataTable', () => {
it('should indicate column that has sorting applied', () => {
dataTable.data = new ObjectDataTableAdapter(
[ { name: '1' }, { name: '2' } ],
[{ name: '1' }, { name: '2' }],
[
new ObjectDataColumn({ key: 'name', sortable: true }),
new ObjectDataColumn({ key: 'other', sortable: true })
new ObjectDataColumn({ key: 'other', sortable: true })
]
);
const [col1, col2] = dataTable.getSortableColumns();
const [col1, col2] = dataTable.getSortableColumns();
dataTable.onColumnHeaderClick(col2);
@@ -769,14 +783,14 @@ describe('DataTable', () => {
it('should return false for columns that have no sorting', () => {
dataTable.data = new ObjectDataTableAdapter(
[ { name: '1' }, { name: '2' } ],
[{ name: '1' }, { name: '2' }],
[
new ObjectDataColumn({ key: 'name', sortable: false }),
new ObjectDataColumn({ key: 'other', sortable: false })
new ObjectDataColumn({ key: 'other', sortable: false })
]
);
const [col1, col2] = dataTable.getSortableColumns();
const [col1, col2] = dataTable.getSortableColumns();
expect(dataTable.isColumnSortActive(col1)).toBe(false);
expect(dataTable.isColumnSortActive(col2)).toBe(false);
@@ -796,7 +810,7 @@ describe('DataTable', () => {
dataTable.data = data;
dataTable.multiselect = true;
dataTable.ngAfterContentInit();
dataTable.onSelectAllClick(<MatCheckboxChange> {checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.selection.every((entry) => entry.isSelected));
@@ -814,13 +828,13 @@ describe('DataTable', () => {
dataTable.multiselect = true;
dataTable.ngAfterContentInit();
dataTable.onSelectAllClick(<MatCheckboxChange> {checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(true);
}
dataTable.onSelectAllClick(<MatCheckboxChange> {checked: false });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: false });
expect(dataTable.isSelectAllChecked).toBe(false);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(false);
@@ -831,7 +845,7 @@ describe('DataTable', () => {
dataTable.multiselect = true;
dataTable.ngOnChanges({ 'data': new SimpleChange('123', {}, true) });
dataTable.onSelectAllClick(<MatCheckboxChange> {checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
});
@@ -843,7 +857,7 @@ describe('DataTable', () => {
dataTable.multiselect = false;
dataTable.ngAfterContentInit();
dataTable.onSelectAllClick(<MatCheckboxChange> {checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(false);
@@ -1139,7 +1153,7 @@ describe('Accesibility', () => {
let column: DataColumn;
beforeEach(() => {
column = new ObjectDataColumn({ key: 'key' });
column = new ObjectDataColumn({ key: 'key' });
});
it('should return correct translation key when no sort is applied', () => {

8
lib/core/datatable/components/datatable/datatable.component.ts
View File

@@ -568,12 +568,16 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
const event = new DataCellEvent(row, col, []);
this.showRowActionsMenu.emit(event);
if (!this.rowMenuCacheEnabled) {
return event.value.actions;
return this.getVisibleActions(event.value.actions);
}
this.rowMenuCache[id] = event.value.actions;
}
return this.rowMenuCache[id];
return this.getVisibleActions(this.rowMenuCache[id]);
}
getVisibleActions(actions: any[]): any[] {
return actions.filter((action) => action.visible || action.visible === undefined);
}
onExecuteRowAction(row: DataRow, action: any) {