Skip to content

[Drilldowns] Fix date math plus sign encoding #230469

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
kowalczyk-krzysztof merged 1 commit into from
Aug 5, 2025
Merged

[Drilldowns] Fix date math plus sign encoding #230469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions ...m/plugins/shared/ui_actions_enhanced/public/drilldowns/url_drilldown/url_template.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,29 @@ test('should compile url without variables', async () => {
expect(await compile(url, {})).toBe(url);
});

test('by default, encodes URI', async () => {
const url = 'https://elastic.co?foo=head%26shoulders';
expect(await compile(url, {})).not.toBe(url);
expect(await compile(url, {})).toBe('https://elastic.co?foo=head%2526shoulders');
});
describe('encoding', () => {
test('by default, encodes URI', async () => {
const url = 'https://elastic.co?foo=head%26shoulders';
expect(await compile(url, {})).not.toBe(url);
expect(await compile(url, {})).toBe('https://elastic.co?foo=head%2526shoulders');
});

test('when URI encoding is disabled, should not encode URI', async () => {
const url =
'https://xxxxx.service-now.com/nav_to.do?uri=incident.do%3Fsys_id%3D-1%26sysparm_query%3Dshort_description%3DHello';
expect(await compile(url, {}, false)).toBe(url);
});

test('when URI encoding is disabled, should not encode URI', async () => {
const url =
'https://xxxxx.service-now.com/nav_to.do?uri=incident.do%3Fsys_id%3D-1%26sysparm_query%3Dshort_description%3DHello';
expect(await compile(url, {}, false)).toBe(url);
test(`should encode "+" when it's part of date math expression`, async () => {
const url = `https://elastic.co??_g=(time:(from:'2025-06-23T03:00:29.080Z||-2m',to:'2025-06-23T03:00:29.080Z||+2m'))`;
const result = `https://elastic.co??_g=(time:(from:'2025-06-23T03:00:29.080Z%7C%7C-2m',to:'2025-06-23T03:00:29.080Z%7C%7C%2B2m'))`;
expect(await compile(url, {}, true)).toBe(result);
});

test(`should not encode "+" when it's not part of date math expression`, async () => {
const url = `https://elastic.co??_g=foo+bar`;
expect(await compile(url, {}, true)).toBe(url);
});
});

test('should fail on unknown syntax', async () => {
Expand Down
4 changes: 3 additions & 1 deletion ...atform/plugins/shared/ui_actions_enhanced/public/drilldowns/url_drilldown/url_template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/
const dateMathPlusSignRegex = /(%7C%7C[^%+]*?)\+/g; // "||+" after "||" is encoded as "%7C%7C"

export async function compile(
urlTemplate: string,
Expand All @@ -22,7 +23,8 @@ export async function compile(
let processedUrl: string = handlebarsTemplate(context);

if (doEncode) {
processedUrl = encodeURI(processedUrl);
// Replace "+" with "%2B" only if it's after a pipe "||", which means it's part of a date math expression
processedUrl = encodeURI(processedUrl).replace(dateMathPlusSignRegex, '$1%2B');
}

return processedUrl;
Expand Down