feat(ui): fix query parameter issues. Fixes argoproj#1214

Signed-off-by: Sairam Arunachalam <sair.aruna@gmail.com>
sairam91 · Oct 17, 2024 · c254b7f · c254b7f
1 parent 46c3503
commit c254b7f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/ui/src/app/shared/history.ts b/ui/src/app/shared/history.ts
@@ -6,23 +6,22 @@ import * as nsUtils from './namespaces';
  * Only "truthy" values are put into the query parameters. I.e. "falsey" values include null, undefined, false, "", 0.
  */
 export function historyUrl(path: string, params: {[key: string]: any}) {
-    const queryParams: string[] = [];
-    let extraSearchParams: URLSearchParams;
+    const queryParams = new URLSearchParams();
     Object.entries(params)
         .filter(([, v]) => v !== null)
         .forEach(([k, v]) => {
             const searchValue = '{' + k + '}';
             if (path.includes(searchValue)) {
                 path = path.replace(searchValue, v != null ? v : '');
             } else if (k === 'extraSearchParams') {
-                extraSearchParams = v;
+                (v as URLSearchParams).forEach((value, key) => queryParams.set(key, value));
             } else if (v) {
-                queryParams.push(k + '=' + v);
+                queryParams.set(k, v);
             }
             if (k === 'namespace') {
                 nsUtils.setCurrentNamespace(v);
             }
         });
-    const extraString = extraSearchParams ? '&' + extraSearchParams.toString() : '';
-    return uiUrl(path.replace(/{[^}]*}/g, '')) + '?' + queryParams.join('&') + extraString;
+
+    return uiUrl(path.replace(/{[^}]*}/g, '')) + '?' + queryParams.toString();
 }