From 0f16e707b964d2755303fcdaf48b1368126159fb Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Fri, 15 Nov 2024 12:29:56 +0200
Subject: [PATCH] Encode commas in clauses and labelKey / labelValue pairs

---
 assets/js/dashboard/util/url.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/assets/js/dashboard/util/url.ts b/assets/js/dashboard/util/url.ts
index 820fe3b4c837..7e456f7ced9e 100644
--- a/assets/js/dashboard/util/url.ts
+++ b/assets/js/dashboard/util/url.ts
@@ -73,18 +73,22 @@ export function trimURL(url: string, maxLength: number): string {
   }
 }
 
-export function encodeURIComponentPermissive(input: string): string {
-  return (
-    encodeURIComponent(input)
-      /* @ts-expect-error API supposedly not present in compilation target */
-      .replaceAll('%2C', ',')
-      .replaceAll('%3A', ':')
-      .replaceAll('%2F', '/')
-  )
+export function encodeURIComponentPermissive(
+  input: string,
+  permittedCharacters: string
+): string {
+  return Array.from(permittedCharacters)
+    .map((character) => [encodeURIComponent(character), character])
+    .reduce(
+      (acc, [encodedCharacter, character]) =>
+        /* @ts-expect-error API supposedly not present in compilation target, but works in major browsers */
+        acc.replaceAll(encodedCharacter, character),
+      encodeURIComponent(input)
+    )
 }
 
 export function encodeSearchParamEntry([k, v]: [string, string]): string {
-  return `${encodeURIComponentPermissive(k)}=${encodeURIComponentPermissive(v)}`
+  return `${encodeURIComponentPermissive(k, ',:/')}=${encodeURIComponentPermissive(v, ',:/')}`
 }
 
 export function isSearchEntryDefined(
@@ -114,7 +118,7 @@ export function stringifySearch(
   return encodedSearchEntries.length ? `?${encodedSearchEntries.join('&')}` : ''
 }
 function serializeLabelsEntry([k, v]: [string, string]) {
-  return `${encodeURIComponentPermissive(k)},${encodeURIComponentPermissive(v)}`
+  return `${encodeURIComponentPermissive(k, ':/')},${encodeURIComponentPermissive(v, ':/')}`
 }
 
 function parseLabelsEntry(labelString: string) {
@@ -126,7 +130,7 @@ function serializeFilter(f: Filter) {
   const serializedFilter = [
     operator,
     dimension,
-    ...clauses.map((c) => encodeURIComponentPermissive(c.toString()))
+    ...clauses.map((c) => encodeURIComponentPermissive(c.toString(), ':/'))
   ].join(',')
   return serializedFilter
 }