Skip to content

fix(esf): discard filter in esf menu on cancel button click #15242

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

Merged
merged 2 commits into from
Jan 17, 2025
Merged

fix(esf): discard filter in esf menu on cancel button click #15242

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
db42404
fix(esf): discard filter in esf menu on cancel button click
teodosiah Jan 15, 2025
1b4b57d
Merge branch '18.2.x' into thristodorova/fix-15053-18.2.x
gedinakova Jan 17, 2025
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
2 changes: 1 addition & 1 deletion ...teui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h4 class="ig-typography__h6">
<div class="igx-excel-filter__cancel">
<button type="button"
igxButton="flat"
(click)="closeDialog()">
(click)="cancelDialog()">
{{ grid.resourceStrings.igx_grid_excel_cancel }}
</button>
</div>
Expand Down
7 changes: 7 additions & 0 deletions ...niteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { IgxOverlayService } from '../../../services/overlay/overlay';
import { IgxIconComponent } from '../../../icon/icon.component';
import { IgxButtonDirective } from '../../../directives/button/button.directive';
import { NgClass, NgIf, NgFor } from '@angular/common';
import { BaseFilteringComponent } from './base-filtering.component';

/**
* @hidden
Expand Down Expand Up @@ -96,6 +97,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
protected overlayService: IgxOverlayService,
private cdr: ChangeDetectorRef,
protected platform: PlatformUtil,
public esf: BaseFilteringComponent
) { }

public ngAfterViewInit(): void {
Expand Down Expand Up @@ -151,6 +153,11 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
}
}

public cancelDialog() {
this.esf.cancel();
this.closeDialog();
}

public onApplyButtonClick() {
this.expressionsList = this.expressionsList.filter(
element => element.expression.condition &&
Expand Down
23 changes: 23 additions & 0 deletions projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7012,6 +7012,29 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {

}));

it('should discard filters through esf menu properly on cancel button click', fakeAsync(() => {
grid.filter('ProductName', 'Ignite', IgxStringFilteringOperand.instance().condition('contains'));
fix.detectChanges();

expect(fix.debugElement.nativeElement.querySelector('.igx-excel-filter__filter-number').textContent).toContain('(1)');
expect(grid.filteredData.length).toEqual(2);
tick(200);
fix.detectChanges();

GridFunctions.clickExcelFilterCascadeButton(fix);
tick();
fix.detectChanges();

GridFunctions.clickOperatorFromCascadeMenu(fix, 0);
tick(100);
fix.detectChanges();
GridFunctions.setOperatorESF(fix, 1, 0);
GridFunctions.setInputValueESF(fix, 1, 'Angular');
GridFunctions.clickCancelExcelStyleCustomFiltering(fix);

expect(fix.debugElement.nativeElement.querySelector('.igx-excel-filter__filter-number').textContent).toContain('(1)');
expect(grid.filteredData.length).toEqual(2);
}));
});
});

Expand Down
Loading