aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webui/src/__tests__/query.ts44
-rw-r--r--webui/src/pages/list/Filter.tsx6
2 files changed, 42 insertions, 8 deletions
diff --git a/webui/src/__tests__/query.ts b/webui/src/__tests__/query.ts
index 69e2f766..97ec75a6 100644
--- a/webui/src/__tests__/query.ts
+++ b/webui/src/__tests__/query.ts
@@ -17,11 +17,11 @@ it('parses a query with multiple filters', () => {
freetext: [''],
});
- expect(parse(`label:abc with "quotes" in freetext`)).toEqual({
+ expect(parse(`label:abc with "quotes" 'in' freetext`)).toEqual({
label: [`abc`],
with: [''],
- quotes: [''],
- in: [''],
+ '"quotes"': [''],
+ "'in'": [''],
freetext: [''],
});
});
@@ -54,11 +54,44 @@ it('parses a quoted query', () => {
expect(parse(`label:"with:quoated:colon"`)).toEqual({
label: [`"with:quoated:colon"`],
});
+
+ expect(parse(`label:'name ends after this ->' quote'`)).toEqual({
+ label: [`'name ends after this ->'`],
+ "quote'": [``],
+ });
+
+ expect(parse(`label:"name ends after this ->" quote"`)).toEqual({
+ label: [`"name ends after this ->"`],
+ 'quote"': [``],
+ });
+
+ expect(parse(`label:'this ->"<- quote belongs to label name'`)).toEqual({
+ label: [`'this ->"<- quote belongs to label name'`],
+ });
+
+ expect(parse(`label:"this ->'<- quote belongs to label name"`)).toEqual({
+ label: [`"this ->'<- quote belongs to label name"`],
+ });
+
+ expect(parse(`label:'names end with'whitespace not with quotes`)).toEqual({
+ label: [`'names end with'whitespace`],
+ not: [``],
+ with: [``],
+ quotes: [``],
+ });
+
+ expect(parse(`label:"names end with"whitespace not with quotes`)).toEqual({
+ label: [`"names end with"whitespace`],
+ not: [``],
+ with: [``],
+ quotes: [``],
+ });
});
it('should not escape nested quotes', () => {
expect(parse(`foo:'do not escape this ->'<- quote'`)).toEqual({
- foo: [`'do not escape this ->'<- quote'`],
+ foo: [`'do not escape this ->'<-`],
+ "quote'": [``],
});
expect(parse(`foo:'do not escape this ->"<- quote'`)).toEqual({
@@ -66,7 +99,8 @@ it('should not escape nested quotes', () => {
});
expect(parse(`foo:"do not escape this ->"<- quote"`)).toEqual({
- foo: [`"do not escape this ->"<- quote"`],
+ foo: [`"do not escape this ->"<-`],
+ 'quote"': [``],
});
expect(parse(`foo:"do not escape this ->'<- quote"`)).toEqual({
diff --git a/webui/src/pages/list/Filter.tsx b/webui/src/pages/list/Filter.tsx
index 84b08029..496fb3ba 100644
--- a/webui/src/pages/list/Filter.tsx
+++ b/webui/src/pages/list/Filter.tsx
@@ -36,7 +36,7 @@ export type Query = { [key: string]: string[] };
function parse(query: string): Query {
const params: Query = {};
- let re = new RegExp(/(\w+)(:('.*'|".*"|\S*))?/, 'g');
+ let re = new RegExp(/([^:\s]+)(:('[^']*'\S*|"[^"]*"\S*|\S*))?/, 'g');
let matches;
while ((matches = re.exec(query)) !== null) {
if (!params[matches[1]]) {
@@ -53,8 +53,8 @@ function parse(query: string): Query {
function quote(value: string): string {
const hasSpaces = value.includes(' ');
- const isDoubleQuotedRegEx = RegExp(/^'.*'$/);
- const isSingleQuotedRegEx = RegExp(/^".*"$/);
+ const isSingleQuotedRegEx = RegExp(/^'.*'$/);
+ const isDoubleQuotedRegEx = RegExp(/^".*"$/);
const isQuoted = () =>
isDoubleQuotedRegEx.test(value) || isSingleQuotedRegEx.test(value);