ui: Fix handling of MCP resource template parameters (#23117)

* Fix handling of MCP resource template parameters

* Fix formatting for uri-template.test.ts

---------

Co-authored-by: kuba <redacted>

diff --git a/tools/ui/src/lib/utils/uri-template.ts b/tools/ui/src/lib/utils/uri-template.ts
index 7665c98c9297a23fe2ffed310a9ab7e8382ffc42..eb8dbfb3632c297f2c1f13d33992a8ae87d03fa3 100644 (file)
--- a/tools/ui/src/lib/utils/uri-template.ts
+++ b/tools/ui/src/lib/utils/uri-template.ts
@@ -160,7 +160,7 @@ export function expandTemplate(template: string, values: Record<string, string>)
                                                                (name: string, i: number) =>
                                                                        `${encodeURIComponent(name)}=${encodeURIComponent(expandedParts[i])}`
                                                        )
-                                                       .join(URI_TEMPLATE_SEPARATORS.COMMA)
+                                                       .join(URI_TEMPLATE_SEPARATORS.QUERY_CONTINUATION)
                                        );
                                case URI_TEMPLATE_OPERATORS.FORM_CONTINUATION:
                                        // Form-style query continuation

diff --git a/tools/ui/tests/unit/uri-template.test.ts b/tools/ui/tests/unit/uri-template.test.ts
index 6221279231a3bfbad9354f02511e91f188d807dc..23645af3f5fc50ab1a25bc931c366d315d13e3c8 100644 (file)
--- a/tools/ui/tests/unit/uri-template.test.ts
+++ b/tools/ui/tests/unit/uri-template.test.ts
@@ -107,6 +107,14 @@ describe('expandTemplate', () => {
                expect(result).toBe('http://example.com?q=search%20term');
        });
 
+       it('expands multiple query parameters', () => {
+               const result = expandTemplate('http://example.com{?q,sort}', {
+                       q: 'search term',
+                       sort: 'descending'
+               });
+               expect(result).toBe('http://example.com?q=search%20term&sort=descending');
+       });
+
        it('keeps static parts unchanged', () => {
                const result = expandTemplate('http://example.com/static', {});
                expect(result).toBe('http://example.com/static');