Skip to content

Commit 6177223

Browse files
committed
fix(esf): don't duplicate records in esf menu when filteringIgnoreCase is true
1 parent 4671176 commit 6177223

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,13 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
720720

721721
this.uniqueValues.forEach(element => {
722722
if (element !== undefined && element !== null && element !== '') {
723+
if (this.column.dataType === DataType.String &&
724+
this.column.filteringIgnoreCase &&
725+
this.listData.length > 0 &&
726+
this.listData.map(el => el.label.toLowerCase()).indexOf(element.toLowerCase()) !== -1) {
727+
return;
728+
}
729+
723730
const filterListItem = new FilterListItem();
724731
if (this.column.filteringExpressionsTree) {
725732
if (shouldUpdateSelection) {

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4336,6 +4336,33 @@ 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+
expect(listItems.length).toBe(3, 'incorrect rendered list items count');
4351+
}));
4352+
4353+
it('Should not ignore duplicate records when column\'\s filteringIgnoreCase is false', fakeAsync(() => {
4354+
const column = grid.getColumnByName('AnotherField');
4355+
column.filteringIgnoreCase = false;
4356+
expect(column.filteringIgnoreCase).toBeFalse();
4357+
4358+
GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'AnotherField');
4359+
tick(100);
4360+
fix.detectChanges();
4361+
4362+
const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
4363+
const listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
4364+
expect(listItems.length).toBe(5, 'incorrect rendered list items count');
4365+
}));
43394366
});
43404367

43414368
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)