Skip to content

Commit 4b2b4bf

Browse files
Merge pull request #8311 from IgniteUI/ibarakov/fix-8162-9.1.x
Don't duplicate records in esf menu when filteringIgnoreCase is true
2 parents 9276e1d + e9c6b59 commit 4b2b4bf

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,15 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
615615
}
616616

617617
private generateUniqueValues(columnValues: any[]) {
618-
this.uniqueValues = Array.from(new Set(columnValues));
618+
if (this.column.dataType === DataType.String && this.column.filteringIgnoreCase) {
619+
const filteredUniqueValues = columnValues.map(s => s?.toLowerCase())
620+
.reduce((map, val, i) => map.get(val) ? map : map.set(val, columnValues[i]),
621+
new Map);
622+
623+
this.uniqueValues = Array.from(filteredUniqueValues.values());
624+
} else {
625+
this.uniqueValues = Array.from(new Set(columnValues));
626+
}
619627
}
620628

621629
private generateFilterValues(isDateColumn: boolean = false) {

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4336,6 +4336,39 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
43364336
listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
43374337
expect(listItems.length).toBe(0, 'incorrect rendered list items count');
43384338
}));
4339+
4340+
it('Should ignore duplicate records when column\'\s filteringIgnoreCase is true', fakeAsync(() => {
4341+
const column = grid.getColumnByName('AnotherField');
4342+
expect(column.filteringIgnoreCase).toBeTrue();
4343+
4344+
GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'AnotherField');
4345+
tick(100);
4346+
fix.detectChanges();
4347+
4348+
const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
4349+
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
4350+
4351+
expect(listItems.length).toBe(3, 'incorrect rendered list items count');
4352+
expect(listItems[1].innerText).toBe('Custom', 'incorrect list item label');
4353+
}));
4354+
4355+
it('Should not ignore duplicate records when column\'\s filteringIgnoreCase is false', fakeAsync(() => {
4356+
const column = grid.getColumnByName('AnotherField');
4357+
column.filteringIgnoreCase = false;
4358+
expect(column.filteringIgnoreCase).toBeFalse();
4359+
4360+
GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'AnotherField');
4361+
tick(100);
4362+
fix.detectChanges();
4363+
4364+
const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
4365+
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
4366+
4367+
expect(listItems.length).toBe(5, 'incorrect rendered list items count');
4368+
expect(listItems[1].innerText).toBe('Custom', 'incorrect list item label');
4369+
expect(listItems[3].innerText).toBe('custoM', 'incorrect list item label');
4370+
expect(listItems[4].innerText).toBe('custom', 'incorrect list item label');
4371+
}));
43394372
});
43404373

43414374
describe(null, () => {

projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ export class CustomFilter extends IgxFilteringOperand {
996996
<igx-column width="100px" [field]="'ReleaseDate'" [header]="'ReleaseDate'" headerClasses="header-release-date"
997997
[filterable]="filterable" [resizable]="resizable" dataType="date">
998998
</igx-column>
999-
<igx-column width="100px" [field]="'AnotherField'" [header]="'Anogther Field'" [filterable]="filterable"
999+
<igx-column width="100px" [field]="'AnotherField'" [header]="'Another Field'" [filterable]="filterable"
10001000
dataType="string" [filters]="customFilter">
10011001
</igx-column>
10021002
</igx-grid>`

projects/igniteui-angular/src/lib/test-utils/sample-test-data.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,15 +1515,15 @@ export class SampleTestData {
15151515
ProductName: 'Some other item with Script',
15161516
ReleaseDate: SampleTestData.timeGenerator.timedelta(SampleTestData.today, 'day', 1),
15171517
Released: null,
1518-
AnotherField: 'a'
1518+
AnotherField: 'Custom'
15191519
},
15201520
{
15211521
Downloads: 0,
15221522
ID: 7,
15231523
ProductName: null,
15241524
ReleaseDate: SampleTestData.timeGenerator.timedelta(SampleTestData.today, 'month', 1),
15251525
Released: true,
1526-
AnotherField: 'a'
1526+
AnotherField: 'custoM'
15271527
},
15281528
{
15291529
Downloads: 1000,

0 commit comments

Comments
 (0)