Skip to content

Commit

Permalink
Merge pull request #295 from ghiscoding/bugfix/filter-preset-operator
Browse files Browse the repository at this point in the history
fix(filters): rollback a change made in PR #288 causing preset issues
  • Loading branch information
ghiscoding authored Mar 23, 2021
2 parents 7111675 + 18ffc0c commit 960f0c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/common/src/services/filter.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ export class FilterService {
let searchTerms: SearchTerm[] | undefined;
let operator: OperatorString | OperatorType | undefined;
const newFilter: Filter | undefined = this.filterFactory.createFilter(columnDef.filter);
operator = columnDef?.filter?.operator ?? newFilter?.operator;
operator = (columnDef && columnDef.filter && columnDef.filter.operator) || (newFilter && newFilter.operator);

if (this._columnFilters[columnDef.id]) {
searchTerms = this._columnFilters[columnDef.id].searchTerms || undefined;
Expand Down

0 comments on commit 960f0c7

Please sign in to comment.