chore: keep query

Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com>

Author: ferhatelmas

src/scripts/jobs-client.test.ts

@@ -8,7 +8,7 @@ import {
 } from './jobs-client'
 
 describe('resolveJobsAdminUrl', () => {
-  it('preserves base URL path prefixes and query params', () => {
+  it('preserves base URL path prefixes and adds query params', () => {
     const url = resolveJobsAdminUrl('http://localhost:54321/admin/', '/queue/overflow', {
       source: 'backup',
       groupBy: 'tenant',
@@ -18,6 +18,20 @@ describe('resolveJobsAdminUrl', () => {
       'http://localhost:54321/admin/queue/overflow?source=backup&groupBy=tenant'
     )
   })
+
+  it('preserves existing base URL query params when appending the request path', () => {
+    const url = resolveJobsAdminUrl('https://example.com/admin?region=eu', '/queue/overflow', {
+      source: 'backup',
+    })
+
+    expect(url.toString()).toBe('https://example.com/admin/queue/overflow?region=eu&source=backup')
+  })
+
+  it('appends the request path before an existing base URL fragment', () => {
+    const url = resolveJobsAdminUrl('https://example.com/admin#region=eu', '/queue/overflow')
+
+    expect(url.toString()).toBe('https://example.com/admin/queue/overflow#region=eu')
+  })
 })
 
 describe('parseJobsOptions', () => {

src/scripts/jobs-client.ts

@@ -44,7 +44,8 @@ export function resolveJobsAdminUrl(
   requestPath: string,
   query?: Record<string, string | undefined>
 ) {
-  const url = new URL(`${baseUrl.replace(/\/+$/, '')}/${requestPath.replace(/^\/+/, '')}`)
+  const url = new URL(baseUrl)
+  url.pathname = `${url.pathname.replace(/\/+$/, '')}/${requestPath.replace(/^\/+/, '')}`
 
   for (const [key, value] of Object.entries(query ?? {})) {
     if (value !== undefined) {