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

fix(datatable): Fix for ExpressionChangedAfterItHasBeenCheckedError on datatable demo with pagination #1198

Merged
merged 6 commits into from
Aug 3, 2018
Merged

fix(datatable): Fix for ExpressionChangedAfterItHasBeenCheckedError on datatable demo with pagination #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91657c2
fix(datatable): Fix for ExpressionChangedAfterItHasBeenCheckedError o…
Jul 17, 2018
35564e3
Merge branch 'develop' into fix/datatable-ExpressionChanged-1023
jeremysmartt Jul 17, 2018
7401496
Update documentation for filter to use async
Jul 18, 2018
95fcbfa
Merge branch 'fix/datatable-ExpressionChanged-1023' of https://github…
Jul 18, 2018
2bdfcc9
Merge branch 'develop' into fix/datatable-ExpressionChanged-1023
jeremysmartt Jul 26, 2018
9ec8864
Merge branch 'develop' into fix/datatable-ExpressionChanged-1023
jeremysmartt Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/app/components/components/data-table/data-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,19 @@ <h3>No results to display.</h3>
// .. do something with event.row
}

filter(): void {
async filter(): Promise<void> {
let newData: any[] = this.data;
let excludedColumns: string[] = this.columns
let excludedColumns: string[] = await this.columns
.filter((column: ITdDataTableColumn) => {
return ((column.filter === undefined && column.hidden === true) ||
(column.filter !== undefined && column.filter === false));
}).map((column: ITdDataTableColumn) => {
return column.name;
});
newData = this._dataTableService.filterData(newData, this.searchTerm, true, excludedColumns);
newData = await this._dataTableService.filterData(newData, this.searchTerm, true, excludedColumns);
this.filteredTotal = newData.length;
newData = this._dataTableService.sortData(newData, this.sortBy, this.sortOrder);
newData = this._dataTableService.pageData(newData, this.fromRow, this.currentPage * this.pageSize);
newData = await this._dataTableService.sortData(newData, this.sortBy, this.sortOrder);
newData = await this._dataTableService.pageData(newData, this.fromRow, this.currentPage * this.pageSize);
this.filteredData = newData;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/app/components/components/data-table/data-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,19 @@ export class DataTableDemoComponent implements OnInit {
this.filter();
}

filter(): void {
async filter(): Promise<void> {
let newData: any[] = this.data;
let excludedColumns: string[] = this.columns
let excludedColumns: string[] = await this.columns
.filter((column: ITdDataTableColumn) => {
return ((column.filter === undefined && column.hidden === true) ||
(column.filter !== undefined && column.filter === false));
}).map((column: ITdDataTableColumn) => {
return column.name;
});
newData = this._dataTableService.filterData(newData, this.searchTerm, true, excludedColumns);
newData = await this._dataTableService.filterData(newData, this.searchTerm, true, excludedColumns);
this.filteredTotal = newData.length;
newData = this._dataTableService.sortData(newData, this.sortBy, this.sortOrder);
newData = this._dataTableService.pageData(newData, this.fromRow, this.currentPage * this.pageSize);
newData = await this._dataTableService.sortData(newData, this.sortBy, this.sortOrder);
newData = await this._dataTableService.pageData(newData, this.fromRow, this.currentPage * this.pageSize);
this.filteredData = newData;
}

Expand Down