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(filtering): handle multiple events firing for column of type date #10233 #10268

Merged
merged 10 commits into from
Nov 15, 2021
Merged

fix(filtering): handle multiple events firing for column of type date #10233 #10268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e4b99c
fix(filtering): handle multiple events firing for column of type date…
zhosti Oct 11, 2021
be041f2
Merge branch 'master' into izhostov/issue-10233
zhosti Nov 4, 2021
ca3f5e7
test(grid-filtering): add grid filtering event tests for different co…
zhosti Nov 8, 2021
49ab726
Merge branch 'master' into izhostov/issue-10233
gedinakova Nov 8, 2021
0a8e776
fix(lint): fix lint errors
zhosti Nov 8, 2021
854ba65
Merge branch 'izhostov/issue-10233' of https://github.com/IgniteUI/ig…
zhosti Nov 8, 2021
0c7a0b8
test(filtering): add filtering event tests for more column types
zhosti Nov 10, 2021
240e8e6
Merge branch 'master' into izhostov/issue-10233
gedinakova Nov 10, 2021
70122d3
Merge branch 'master' into izhostov/issue-10233
gedinakova Nov 12, 2021
f0e36d5
Merge branch 'master' into izhostov/issue-10233
kdinev Nov 12, 2021
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
15 changes: 12 additions & 3 deletions projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { AbsoluteScrollStrategy } from '../../../services/overlay/scroll';
import { DisplayDensity } from '../../../core/displayDensity';
import { IgxDatePickerComponent } from '../../../date-picker/date-picker.component';
import { IgxTimePickerComponent } from '../../../time-picker/time-picker.component';
import { PlatformUtil } from '../../../core/utils';
import { isEqual, PlatformUtil } from '../../../core/utils';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';

Expand Down Expand Up @@ -70,14 +70,23 @@ export class IgxGridFilteringRowComponent implements AfterViewInit, OnDestroy {
public set value(val) {
if (!val && val !== 0) {
this.expression.searchVal = null;
this.showHideArrowButtons();
const index = this.expressionsList.findIndex(item => item.expression === this.expression);
if (index === 0 && this.expressionsList.length === 1) {
this.clearFiltering();
return;
}
} else {
const oldValue = this.expression.searchVal;
if (isEqual(oldValue, val)) {
return;
}

this.expression.searchVal = DataUtil.parseValue(this.column.dataType, val);
if (this.expressionsList.find(item => item.expression === this.expression) === undefined) {
this.addExpression(true);
}
this.filter();
}
this.filter();
}

public get displayDensity() {
Expand Down
Loading