External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 02:01:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4841 from mabashian/4768-search-keys-parentheses

Browse Source 
Fixed regex that was breaking on parenthesis
This commit is contained in:
Michael Abashian
2017-01-20 10:05:52 -05:00
committed by GitHub
parent 2b4cede9ac 72e4ac8c66
commit b2b18dd958
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/shared/smart-search/smart-search.service.js
View File

@@ -1,7 +1,7 @@
export default [function() { export default [function() {
return { return {
splitSearchIntoTerms(searchString) { splitSearchIntoTerms(searchString) {
return searchString.match(/(?:[^\s("')]+|"[^"]*"|'[^']*')+/g); return searchString.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g);
}, },
splitTermIntoParts(searchTerm) { splitTermIntoParts(searchTerm) {
let breakOnColon = searchTerm.match(/(?:[^:"]+|"[^"]*")+/g); let breakOnColon = searchTerm.match(/(?:[^:"]+|"[^"]*")+/g);

2
awx/ui/tests/spec/smart-search/smart-search.service-test.js
View File

@@ -25,6 +25,8 @@ describe('Service: SmartSearch', () => {
expect(SmartSearchService.splitSearchIntoTerms('name:\'foo bar\' description:\'bar foo\'')).toEqual(["name:\'foo bar\'", "description:\'bar foo\'"]); expect(SmartSearchService.splitSearchIntoTerms('name:\'foo bar\' description:\'bar foo\'')).toEqual(["name:\'foo bar\'", "description:\'bar foo\'"]);
expect(SmartSearchService.splitSearchIntoTerms('name:\"foo bar\" description:\'bar foo\'')).toEqual(["name:\"foo bar\"", "description:\'bar foo\'"]); expect(SmartSearchService.splitSearchIntoTerms('name:\"foo bar\" description:\'bar foo\'')).toEqual(["name:\"foo bar\"", "description:\'bar foo\'"]);
expect(SmartSearchService.splitSearchIntoTerms('name:\"foo bar\" foo')).toEqual(["name:\"foo bar\"", "foo"]); expect(SmartSearchService.splitSearchIntoTerms('name:\"foo bar\" foo')).toEqual(["name:\"foo bar\"", "foo"]);
expect(SmartSearchService.splitSearchIntoTerms('inventory:¯\_(ツ)_/¯')).toEqual(["inventory:¯\_(ツ)_/¯"]);
expect(SmartSearchService.splitSearchIntoTerms('inventory:¯\_(ツ)_/¯ inventory.name:¯\_(ツ)_/¯')).toEqual(["inventory:¯\_(ツ)_/¯", "inventory.name:¯\_(ツ)_/¯"]);
}); });
}); });