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

[AAE-4077] - TaskCloud: Refactor priority (#6385)

Browse Source 
* [AAE-4077] - TaskCloud: Refactor priority

* export default priority values

* Fix e2e tests

* fix navigation from task-list

* Update task-list-properties-sort.e2e.ts

* Fix lint

Co-authored-by: Cano <david.cano.nieto@gmail.com>
This commit is contained in:
Silviu Popa
2020-11-26 19:38:40 +02:00
committed by GitHub
parent 5086620991
commit f73dece82d
13 changed files with 99 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/core/datatable/components/datatable/datatable.component.html
View File

@@ -137,8 +137,8 @@
<div *ngSwitchCase="'icon'" class="adf-cell-value">
<mat-icon>{{ data.getValue(row, col) }}</mat-icon>
</div>
<div *ngSwitchCase="'date'" class="adf-cell-value" [attr.tabindex]="data.getValue(row, col)? 0 : -1"
[attr.data-automation-id]="'date_' + (data.getValue(row, col) | adfLocalizedDate: 'medium') ">
<div *ngSwitchCase="'date'" class="adf-cell-value" [attr.tabindex]="data.getValue(row, col, resolverFn)? 0 : -1"
[attr.data-automation-id]="'date_' + (data.getValue(row, col, resolverFn) | adfLocalizedDate: 'medium') ">
<adf-date-cell class="adf-datatable-center-date-column-ie"
[data]="data"
[column]="col"
@@ -147,8 +147,8 @@
[tooltip]="getCellTooltip(row, col)">
</adf-date-cell>
</div>
<div *ngSwitchCase="'location'" [attr.tabindex]="data.getValue(row, col)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'location' + data.getValue(row, col)">
<div *ngSwitchCase="'location'" [attr.tabindex]="data.getValue(row, col, resolverFn)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'location' + data.getValue(row, col, resolverFn)">
<adf-location-cell
[data]="data"
[column]="col"
@@ -157,8 +157,8 @@
[tooltip]="getCellTooltip(row, col)">
</adf-location-cell>
</div>
<div *ngSwitchCase="'fileSize'" [attr.tabindex]="data.getValue(row, col)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'fileSize_' + data.getValue(row, col)">
<div *ngSwitchCase="'fileSize'" [attr.tabindex]="data.getValue(row, col, resolverFn)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'fileSize_' + data.getValue(row, col, resolverFn)">
<adf-filesize-cell class="adf-datatable-center-size-column-ie"
[data]="data"
[column]="col"
@@ -167,8 +167,8 @@
[tooltip]="getCellTooltip(row, col)">
</adf-filesize-cell>
</div>
<div *ngSwitchCase="'text'" [attr.tabindex]="data.getValue(row, col)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'text_' + data.getValue(row, col)">
<div *ngSwitchCase="'text'" [attr.tabindex]="data.getValue(row, col, resolverFn)? 0 : -1" class="adf-cell-value"
[attr.data-automation-id]="'text_' + data.getValue(row, col, resolverFn)">
<adf-datatable-cell
[copyContent]="col.copyContent"
[data]="data"
@@ -178,7 +178,7 @@
[tooltip]="getCellTooltip(row, col)">
</adf-datatable-cell>
</div>
<div *ngSwitchCase="'json'" [attr.tabindex]="data.getValue(row, col)? 0 : -1" class="adf-cell-value">
<div *ngSwitchCase="'json'" [attr.tabindex]="data.getValue(row, col, resolverFn)? 0 : -1" class="adf-cell-value">
<adf-json-cell
[editable]="col.editable"
[data]="data"

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

@@ -1268,15 +1268,15 @@ describe('DataTable', () => {
const id1 = element.querySelector('[data-automation-id="text_1');
const id2 = element.querySelector('[data-automation-id="text_2');
const names = element.querySelectorAll('[data-automation-id="text_undefined"]');
const namesId1 = element.querySelector('[data-automation-id="text_foo - bar"]');
const namesId2 = element.querySelector('[data-automation-id="text_bar - baz"]');
expect(id1.innerText).toEqual('1');
expect(names[0].innerText).toEqual('foo - bar');
expect(namesId1.innerText).toEqual('foo - bar');
expect(id2.innerText).toEqual('2');
expect(names[1].innerText).toEqual('bar - baz');
expect(namesId2.innerText).toEqual('bar - baz');
expect(dataTable.data.getRows().length).toEqual(2);
expect(dataTable.resolverFn).toHaveBeenCalledTimes(4);
});
it('should update data columns when columns input changes', () => {