-
Notifications
You must be signed in to change notification settings - Fork 160
fix(grid): ESF search matches numeric values without locale formatting #17131
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.
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
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
acba841
Initial plan
Copilot 38d8fb3
test(grid): add reproduction test for ESF search not matching numbers…
Copilot 436df63
fix(grid): ESF search matches numeric values without locale formatting
Copilot c194f75
fix(grid): ESF search matches numeric values without locale formatting
Copilot f64877c
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev feae3bd
chore(*): fixing package-lock
1f31b1f
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev 21ad1b0
chore(*): updating demos for tests
963abd4
chore(*): extending cell-merging demo to test further
004391d
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev 3b29d85
chore(*): fixing template quotes on h-grid-updating demo
9a1079a
Merge branch 'copilot/fix-numeric-filtering-in-esf' of https://github…
8bc860d
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev a98950e
chore(h-grid-updating): fixing demo template indentation
d01aa20
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev e5e2f3c
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev dd86e81
Merge branch 'master' into copilot/fix-numeric-filtering-in-esf
kdinev cfe2463
chore(excel-style-search): Add a comment to test the behavior when hi…
mddragnev b2ce2c9
Merge branch 'copilot/fix-numeric-filtering-in-esf' of https://github…
mddragnev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -482,17 +482,26 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy { | |||||||||||||||||||||||||||||||||||||||||||||||||||||
| const matchedData = cloneHierarchicalArray(this.esf.listData, 'children'); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.displayedListData = this.hierarchicalSelectMatches(matchedData, searchVal); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.cdr.detectChanges(); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| /** | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| * There are two calls of `matchesNumericValue` in this method: one when we generate the displayedListData in hierarchicalSelectMatches method | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| * and another one when going through the tree nodes. We can avoid the second call by storing the items in a set. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| * However, if the datasource is small there is no significant difference in performance but we would be adding extra memory overhead. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| * We should test this when https://github.com/IgniteUI/igniteui-angular/issues/17144 issue is fixed with 100k or 1m records | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| */ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.tree.nodes.forEach(n => { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| n.selected = true; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if ((n.data as FilterListItem).label.toString().toLowerCase().indexOf(searchVal) > -1) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const item = n.data as FilterListItem; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (item.label.toString().toLowerCase().indexOf(searchVal) > -1 || | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.matchesNumericValue(item, searchVal)) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.expandAllParentNodes(n); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } else { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.displayedListData = this.esf.listData.filter((it, i) => (i === 0 && it.isSpecial) || | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| (it.label !== null && it.label !== undefined) && | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| !it.isBlanks && | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| it.label.toString().toLowerCase().indexOf(searchVal) > -1); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| (it.label.toString().toLowerCase().indexOf(searchVal) > -1 || | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.matchesNumericValue(it, searchVal))); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.esf.listData.forEach(i => i.isSelected = false); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.displayedListData.forEach(i => i.isSelected = true); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -724,7 +733,8 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy { | |||||||||||||||||||||||||||||||||||||||||||||||||||||
| node.expanded = false; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (element.label.toString().toLowerCase().indexOf(searchVal) > -1) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (element.label.toString().toLowerCase().indexOf(searchVal) > -1 || | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.matchesNumericValue(element, searchVal)) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| element.isSelected = true; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this.hierarchicalSelectAllChildren(element); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| this._hierarchicalSelectedItems.push(element); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -802,6 +812,23 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy { | |||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| private matchesNumericValue(item: FilterListItem, searchVal: string): boolean { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const columnDataType = this.esf.column?.dataType; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (typeof item.value !== 'number' || | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| (columnDataType !== GridColumnDataType.Number && | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| columnDataType !== GridColumnDataType.Currency && | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| columnDataType !== GridColumnDataType.Percent)) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| return false; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| let numericValue = item.value; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if (columnDataType === GridColumnDataType.Percent) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| numericValue = parseFloat((item.value * 100).toPrecision(15)); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| return numericValue.toString().toLowerCase().indexOf(searchVal) > -1; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+824
to
+829
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||
| let numericValue = item.value; | |
| if (columnDataType === GridColumnDataType.Percent) { | |
| numericValue = parseFloat((item.value * 100).toPrecision(15)); | |
| } | |
| return numericValue.toString().toLowerCase().indexOf(searchVal) > -1; | |
| // Normalize the search value: remove grouping separators, trim, and parse as number. | |
| const normalizedSearch = searchVal ? searchVal.replace(/,/g, '').trim() : ''; | |
| if (!normalizedSearch) { | |
| return false; | |
| } | |
| const parsedSearch = Number(normalizedSearch); | |
| if (Number.isNaN(parsedSearch)) { | |
| return false; | |
| } | |
| let numericValue = item.value; | |
| if (columnDataType === GridColumnDataType.Percent) { | |
| numericValue = parseFloat((item.value * 100).toPrecision(15)); | |
| } | |
| const canonicalItem = numericValue.toString(); | |
| const canonicalSearch = parsedSearch.toString(); | |
| return canonicalItem.toLowerCase().indexOf(canonicalSearch.toLowerCase()) > -1; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kdinev The only thing that comes to my mind regarding the performance is that
matchesNumericValueis called a second time here when the ESF is hierarchical. Firstly, it is called inside thehierarchicalSelectMatchesmethod when generatingdisplayedListDataand then when going through the tree nodes to expand parent nodes. What we can do is to create a set and populate it with the items and then match a record to the set so that we skip the second call. However, this is not a big deal sincematchesNumericValueis just parsing some numbers but can add up if the data is big.