Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ACA-4407] unit test for data table custom header #7004

Merged
merged 2 commits into from
May 10, 2021
Merged

[ACA-4407] unit test for data table custom header #7004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48fbde7
[ACA-4407] unit test for data table custom header
May 10, 2021
dd968e1
* fix icon size
May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ib/permission-manager/components/permission-container/permission-container.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
.adf-authority-icon-column {
min-width: 40px;
}

.adf-datatable-selected > svg {
width: 40px;
height: 40px;
}
}
}
}
8 changes: 0 additions & 8 deletions ...ices/src/lib/permission-manager/components/permission-list/permission-list.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,8 @@
overflow: hidden;
flex: 1 1 auto;
}

&-datatable-list {
.adf-datatable-selected > svg {
width: 40px;
height: 40px;
}
}
}


[aria-sort='Ascending'] adf-user-role-column,
[aria-sort='Descending'] adf-user-role-column {
padding-left: 10px;
Expand Down
37 changes: 34 additions & 3 deletions lib/core/datatable/components/datatable/datatable.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ import { TranslateModule } from '@ngx-translate/core';
class CustomColumnTemplateComponent {
@ViewChild('tmplRef', { static: true }) templateRef: TemplateRef<any>;
}
@Component({
selector: 'adf-custom-column-header-component',
template: `
<ng-template #tmplRef>
CUSTOM HEADER
</ng-template>
`
})
class CustomColumnHeaderComponent {
@ViewChild('tmplRef', { static: true }) templateRef: TemplateRef<any>;
}

class FakeDataRow implements DataRow {
isDropTarget = false;
Expand Down Expand Up @@ -74,7 +85,7 @@ describe('DataTable', () => {
TranslateModule.forRoot(),
CoreTestingModule
],
schemas: [NO_ERRORS_SCHEMA]
declarations: [CustomColumnHeaderComponent]
});

beforeEach(() => {
Expand Down Expand Up @@ -1306,8 +1317,8 @@ describe('DataTable', () => {
spyOn(dataTable, 'resolverFn').and.callFake(resolverFn);
fixture.detectChanges();

const id1 = element.querySelector('[data-automation-id="text_1');
const id2 = element.querySelector('[data-automation-id="text_2');
const id1 = element.querySelector('[data-automation-id="text_1"]');
const id2 = element.querySelector('[data-automation-id="text_2"]');
const namesId1 = element.querySelector('[data-automation-id="text_foo - bar"]');
const namesId2 = element.querySelector('[data-automation-id="text_bar - baz"]');

Expand All @@ -1333,6 +1344,26 @@ describe('DataTable', () => {
const expectedNewDataColumns = [new ObjectDataColumn(newDataColumnsSchema)];
expect(dataTable.data.getColumns()).toEqual(expectedNewDataColumns);
});

it('should render the custom column header', () => {
const customHeader = TestBed.createComponent(CustomColumnHeaderComponent).componentInstance.templateRef;
dataTable.data = new ObjectDataTableAdapter([
{ id: 1, name: 'foo' },
{ id: 2, name: 'bar' }
],
[
new ObjectDataColumn({ key: 'id', title: 'ID' }),
new ObjectDataColumn({ key: 'name', title: 'Name', header: customHeader })
]
);
fixture.detectChanges();

const idColumn = element.querySelector('[data-automation-id="auto_id_id"]');
const nameColumn = element.querySelector('[data-automation-id="auto_id_name"]');

expect(idColumn.innerText).toContain('ID');
expect(nameColumn.innerText).toContain('CUSTOM HEADER');
});
});

describe('Accesibility', () => {
Expand Down