Skip to content

fix: 6360 error when entering *+ combination in the column filter #7159

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
Jul 31, 2021
Merged

fix: 6360 error when entering *+ combination in the column filter #7159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7901a58
[hotfix/6360]
prx-lmo Jul 26, 2021
360190b
[hotfix/6360]
prx-lmo Jul 26, 2021
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
16 changes: 8 additions & 8 deletions packages/core/src/js/services/rowSearcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
var module = angular.module('ui.grid');

function escapeRegExp(str) {
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
// based on https://github.com/sindresorhus/escape-string-regexp
// Escape characters with special meaning either inside or outside character sets.
// Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
return str.replace(/[|\\{}()[\]^$+?*.]/g, '\\$&').replace(/-/g, '\\x2d');
}


Expand Down Expand Up @@ -78,13 +81,10 @@ module.service('rowSearcher', ['gridUtil', 'uiGridConstants', function (gridUtil

var term = rowSearcher.getTerm(filter);

if (/\*/.test(term)) {
var regexpFlags = '';
if (!filter.flags || !filter.flags.caseSensitive) {
regexpFlags += 'i';
}

var reText = term.replace(/(\\)?\*/g, function ($0, $1) { return $1 ? $0 : '[\\s\\S]*?'; });
if (/\*/.test(term)) {//this would check only start and end -> /^\*|\*$/
var regexpFlags = (!filter.flags || !filter.flags.caseSensitive) ? 'i' : '';
term = escapeRegExp(term);
var reText = term.replace(/\\\*/g, '.*?');//this would check only start and end -> /^\\\*|\\\*$/g
return new RegExp('^' + reText + '$', regexpFlags);
}
// Otherwise default to default condition
Expand Down