Skip to content

Commit 0b59fc4

Browse files
committed
chore(*): using column sortStrategy for sorting
1 parent 5f4f56c commit 0b59fc4

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import { DisplayDensity } from '../../../core/density';
2929
import { GridSelectionMode } from '../../common/enums';
3030
import { GridBaseAPIService } from '../../api.service';
3131
import { SortingDirection } from '../../../data-operations/sorting-expression.interface';
32-
import { IgxSorting } from '../../../data-operations/sorting-strategy';
3332

3433
/**
3534
* @hidden
@@ -559,14 +558,8 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
559558
this.addItems(shouldUpdateSelection);
560559
}
561560

562-
const sorting = new IgxSorting();
563-
const expressions = [{
564-
dir: SortingDirection.Asc,
565-
fieldName: 'value',
566-
ignoreCase: this.column.filteringIgnoreCase,
567-
strategy: this.column.sortStrategy
568-
}];
569-
this.listData = sorting.sort(this.listData, expressions);
561+
this.listData = this.column.sortStrategy.sort(this.listData, 'value', SortingDirection.Asc, this.column.sortingIgnoreCase,
562+
(obj, key) => obj[key]);
570563

571564
if (this.containsNullOrEmpty) {
572565
this.addBlanksItem(shouldUpdateSelection);
@@ -709,7 +702,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
709702
this.listData.unshift(blanks);
710703
}
711704

712-
private getFilterItemLabel(element: any, applyFormatter: boolean = true) {
705+
private getFilterItemLabel(element: any) {
713706
if (this.column.dataType === DataType.Date) {
714707
return element && element.label ? element.label : this.column.formatter ?
715708
this.column.formatter(element) :

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,7 +4822,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
48224822
fix.detectChanges();
48234823

48244824
verifyExcelStyleFilterAvailableOptions(fix,
4825-
['Select All', 'Custom', 'a', 'custoM', 'custom'],
4825+
['Select All', 'a', 'Custom', 'custoM', 'custom'],
48264826
[true, true, true, true, true]);
48274827
}));
48284828

@@ -5153,7 +5153,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
51535153
expect(listItems[3].innerText).toBe('Yes', 'incorrect list item label');
51545154
}));
51555155

5156-
it('Should sort items in excel style search case INsensitive', fakeAsync(() => {
5156+
it('Should sort items in excel style search correctly', fakeAsync(() => {
51575157
const data = [
51585158
{
51595159
Downloads: 254,
@@ -5183,12 +5183,12 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
51835183
fix.componentInstance.data = data;
51845184
fix.detectChanges();
51855185

5186-
// Open excel style custom filtering dialog.
5186+
// Open excel style custom filtering dialog for string column
51875187
GridFunctions.clickExcelFilterIcon(fix, 'AnotherField');
51885188
tick(100);
51895189
fix.detectChanges();
51905190

5191-
// Verify items order
5191+
// Verify items order is case INsensitive
51925192
verifyExcelStyleFilterAvailableOptions(fix,
51935193
['Select All', 'aWord', 'BWord'],
51945194
[true, true, true]);

0 commit comments

Comments
 (0)