Skip to content

Commit 6896704

Browse files
nsdeschenesnsdeschenes
authored
feat(search-bar): Update parser for starts and ends with (#91525)
This PR adds in two checks for `startsWith` and `endsWith` to `TokenConverter.tokenValueText` method to check for given text values that either start with an asterisk or ends with an asterisk. This PR also updates the related test fixtures, as well as adding in test fixtures for the two new checks.
1 parent e4f468e commit 6896704

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+676
-190
lines changed

‎fixtures/search-syntax/aggregate_rel_time_filter.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@
6767
"negated": false,
6868
"key": {"type": "keySimple", "value": "random", "quoted": false},
6969
"operator": "",
70-
"value": {"type": "valueText", "value": "-2w", "quoted": false, "contains": false}
70+
"value": {
71+
"type": "valueText",
72+
"value": "-2w",
73+
"quoted": false,
74+
"wildcard": false
75+
}
7176
},
7277
{"type": "spaces", "value": ""}
7378
]

‎fixtures/search-syntax/basic_fallthrough.json

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "<hello",
1515
"quoted": false,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": ""}
@@ -33,7 +33,7 @@
3333
"type": "valueText",
3434
"value": "<512.1.0",
3535
"quoted": false,
36-
"contains": false
36+
"wildcard": false
3737
}
3838
},
3939
{"type": "spaces", "value": ""}
@@ -53,7 +53,7 @@
5353
"type": "valueText",
5454
"value": "2018-01-01",
5555
"quoted": false,
56-
"contains": false
56+
"wildcard": false
5757
}
5858
},
5959
{"type": "spaces", "value": ""}
@@ -69,7 +69,12 @@
6969
"negated": false,
7070
"key": {"type": "keySimple", "value": "random", "quoted": false},
7171
"operator": "",
72-
"value": {"type": "valueText", "value": "+7d", "quoted": false, "contains": false}
72+
"value": {
73+
"type": "valueText",
74+
"value": "+7d",
75+
"quoted": false,
76+
"wildcard": false
77+
}
7378
},
7479
{"type": "spaces", "value": ""}
7580
]
@@ -88,7 +93,7 @@
8893
"type": "valueText",
8994
"value": ">2018-01-01",
9095
"quoted": false,
91-
"contains": false
96+
"wildcard": false
9297
}
9398
},
9499
{"type": "spaces", "value": ""}
@@ -108,7 +113,7 @@
108113
"type": "valueText",
109114
"value": "hello",
110115
"quoted": false,
111-
"contains": false
116+
"wildcard": false
112117
}
113118
},
114119
{"type": "spaces", "value": ""}
@@ -124,7 +129,12 @@
124129
"negated": false,
125130
"key": {"type": "keySimple", "value": "random", "quoted": false},
126131
"operator": "",
127-
"value": {"type": "valueText", "value": "123", "quoted": false, "contains": false}
132+
"value": {
133+
"type": "valueText",
134+
"value": "123",
135+
"quoted": false,
136+
"wildcard": false
137+
}
128138
},
129139
{"type": "spaces", "value": ""}
130140
]

‎fixtures/search-syntax/custom_explicit_tag.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"type": "valueText",
1818
"value": "apple",
1919
"quoted": false,
20-
"contains": false
20+
"wildcard": false
2121
}
2222
},
2323
{"type": "spaces", "value": " "},
@@ -31,7 +31,7 @@
3131
"type": "valueText",
3232
"value": "1.2.1",
3333
"quoted": false,
34-
"contains": false
34+
"wildcard": false
3535
}
3636
},
3737
{"type": "spaces", "value": " "},
@@ -45,7 +45,12 @@
4545
"key": {"type": "keySimple", "value": "project_id", "quoted": false}
4646
},
4747
"operator": "",
48-
"value": {"type": "valueText", "value": "123", "quoted": false, "contains": false}
48+
"value": {
49+
"type": "valueText",
50+
"value": "123",
51+
"quoted": false,
52+
"wildcard": false
53+
}
4954
},
5055
{"type": "spaces", "value": ""}
5156
]

‎fixtures/search-syntax/custom_tag.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "apple",
1515
"quoted": false,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": " "},
@@ -27,7 +27,7 @@
2727
"type": "valueText",
2828
"value": "1.2.1",
2929
"quoted": false,
30-
"contains": false
30+
"wildcard": false
3131
}
3232
},
3333
{"type": "spaces", "value": ""}
@@ -43,7 +43,12 @@
4343
"negated": false,
4444
"key": {"type": "keySimple", "value": "p95", "quoted": false},
4545
"operator": "",
46-
"value": {"type": "valueText", "value": ">5s", "quoted": false, "contains": false}
46+
"value": {
47+
"type": "valueText",
48+
"value": ">5s",
49+
"quoted": false,
50+
"wildcard": false
51+
}
4752
},
4853
{"type": "spaces", "value": ""}
4954
]
@@ -58,7 +63,12 @@
5863
"negated": false,
5964
"key": {"type": "keySimple", "value": "p95", "quoted": false},
6065
"operator": "",
61-
"value": {"type": "valueText", "value": ">5k", "quoted": false, "contains": false}
66+
"value": {
67+
"type": "valueText",
68+
"value": ">5k",
69+
"quoted": false,
70+
"wildcard": false
71+
}
6272
},
6373
{"type": "spaces", "value": ""}
6474
]

‎fixtures/search-syntax/disallow_wildcard_filter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"quoted": false,
5959
"type": "valueText",
6060
"value": "*",
61-
"contains": false
61+
"wildcard": false
6262
}
6363
}
6464
],
@@ -96,7 +96,7 @@
9696
"type": "valueText",
9797
"value": "*",
9898
"quoted": false,
99-
"contains": false
99+
"wildcard": false
100100
},
101101
"invalid": {
102102
"type": "wildcard-not-allowed",

‎fixtures/search-syntax/duration_on_non_duration_field.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "500s",
1515
"quoted": false,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": ""}

‎fixtures/search-syntax/empty_filter_value.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
"negated": false,
1010
"key": {"type": "keySimple", "value": "device.family", "quoted": false},
1111
"operator": "",
12-
"value": {"type": "valueText", "value": "", "quoted": true, "contains": false}
12+
"value": {
13+
"type": "valueText",
14+
"value": "",
15+
"quoted": true,
16+
"wildcard": false
17+
}
1318
},
1419
{"type": "spaces", "value": ""}
1520
]
@@ -28,7 +33,12 @@
2833
},
2934
"key": {"type": "keySimple", "value": "device.family", "quoted": false},
3035
"operator": "",
31-
"value": {"type": "valueText", "value": "", "quoted": false, "contains": false}
36+
"value": {
37+
"type": "valueText",
38+
"value": "",
39+
"quoted": false,
40+
"wildcard": false
41+
}
3242
},
3343
{"type": "spaces", "value": ""}
3444
]

‎fixtures/search-syntax/empty_spaces_stripped_correctly.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "transaction",
1515
"quoted": false,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": " "},
@@ -27,7 +27,7 @@
2727
"type": "valueText",
2828
"value": "/organizations/:orgId/discover/results/",
2929
"quoted": false,
30-
"contains": false
30+
"wildcard": false
3131
}
3232
},
3333
{"type": "spaces", "value": ""}

‎fixtures/search-syntax/escaped_quote_value.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "\\\"",
1515
"quoted": false,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": ""}
@@ -33,7 +33,7 @@
3333
"type": "valueText",
3434
"value": "te\\\"st",
3535
"quoted": false,
36-
"contains": false
36+
"wildcard": false
3737
}
3838
},
3939
{"type": "spaces", "value": ""}
@@ -50,7 +50,12 @@
5050
"negated": false,
5151
"key": {"type": "keySimple", "value": "url", "quoted": false},
5252
"operator": "",
53-
"value": {"type": "valueText", "value": "te", "quoted": true, "contains": false}
53+
"value": {
54+
"type": "valueText",
55+
"value": "te",
56+
"quoted": true,
57+
"wildcard": false
58+
}
5459
},
5560
{"type": "spaces", "value": ""},
5661
{"type": "freeText", "value": "st", "quoted": false, "invalid": null},

‎fixtures/search-syntax/escaped_quotes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "valueText",
1414
"value": "a\\\"thing\\\"",
1515
"quoted": true,
16-
"contains": false
16+
"wildcard": false
1717
}
1818
},
1919
{"type": "spaces", "value": ""}
@@ -33,7 +33,7 @@
3333
"type": "valueText",
3434
"value": "a\\\"\\\"release",
3535
"quoted": true,
36-
"contains": false
36+
"wildcard": false
3737
}
3838
},
3939
{"type": "spaces", "value": ""}

‎fixtures/search-syntax/explicit_number_tag.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
"key": {"type": "keySimple", "value": "foo", "quoted": false}
1414
},
1515
"operator": "",
16-
"value": {"type": "valueText", "value": "456", "quoted": false, "contains": false}
16+
"value": {
17+
"type": "valueText",
18+
"value": "456",
19+
"quoted": false,
20+
"wildcard": false
21+
}
1722
},
1823
{"type": "spaces", "value": " "},
1924
{
@@ -26,7 +31,7 @@
2631
"type": "valueText",
2732
"value": "1.2.1",
2833
"quoted": false,
29-
"contains": false
34+
"wildcard": false
3035
}
3136
},
3237
{"type": "spaces", "value": " "},
@@ -40,7 +45,12 @@
4045
"key": {"type": "keySimple", "value": "project_id", "quoted": false}
4146
},
4247
"operator": "",
43-
"value": {"type": "valueText", "value": "123", "quoted": false, "contains": false}
48+
"value": {
49+
"type": "valueText",
50+
"value": "123",
51+
"quoted": false,
52+
"wildcard": false
53+
}
4454
},
4555
{"type": "spaces", "value": ""}
4656
]

‎fixtures/search-syntax/explicit_number_tags_in_filter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"type": "valueText",
2323
"value": "123",
2424
"quoted": false,
25-
"contains": false
25+
"wildcard": false
2626
}
2727
},
2828
{
@@ -31,7 +31,7 @@
3131
"type": "valueText",
3232
"value": "456",
3333
"quoted": false,
34-
"contains": false
34+
"wildcard": false
3535
}
3636
}
3737
]

‎fixtures/search-syntax/explicit_string_tag.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"type": "valueText",
1818
"value": "apple",
1919
"quoted": false,
20-
"contains": false
20+
"wildcard": false
2121
}
2222
},
2323
{"type": "spaces", "value": " "},
@@ -31,7 +31,7 @@
3131
"type": "valueText",
3232
"value": "1.2.1",
3333
"quoted": false,
34-
"contains": false
34+
"wildcard": false
3535
}
3636
},
3737
{"type": "spaces", "value": " "},
@@ -45,7 +45,12 @@
4545
"key": {"type": "keySimple", "value": "project_id", "quoted": false}
4646
},
4747
"operator": "",
48-
"value": {"type": "valueText", "value": "123", "quoted": false, "contains": false}
48+
"value": {
49+
"type": "valueText",
50+
"value": "123",
51+
"quoted": false,
52+
"wildcard": false
53+
}
4954
},
5055
{"type": "spaces", "value": ""}
5156
]

0 commit comments

Comments
 (0)