From 31ff364d09fae45f450c48fe5ab2d289906923a3 Mon Sep 17 00:00:00 2001
From: Jules Vautier <jules.vautier01@gmail.com>
Date: Tue, 2 Jul 2024 19:49:30 +0200
Subject: [PATCH] Fix: Remove  / when calling search endpoint (#5187)

---
 .../quickwit-ui/src/services/client.test.ts   | 45 ++++++++++++-------
 quickwit/quickwit-ui/src/services/client.ts   |  2 +-
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/quickwit/quickwit-ui/src/services/client.test.ts b/quickwit/quickwit-ui/src/services/client.test.ts
index ad4776b69b1..294b3f3d311 100644
--- a/quickwit/quickwit-ui/src/services/client.test.ts
+++ b/quickwit/quickwit-ui/src/services/client.test.ts
@@ -21,24 +21,35 @@ import { SearchRequest } from '../utils/models';
 import { Client } from './client';
 
 describe('Client unit test', () => {
-    it('Should build search URL', () => {
+    it('Should construct correct search URL', async () => {
+        // Mocking the fetch function to simulate network requests
+        const mockFetch = jest.fn(() => Promise.resolve({ ok: true, json: () => Promise.resolve({}) }));
+        (global as any).fetch = mockFetch; // eslint-disable-line @typescript-eslint/no-explicit-any
+
         const searchRequest: SearchRequest = {
-          indexId: 'my-new-fresh-index-id',
-          query: 'severity_error:ERROR',
-          startTimestamp: 100,
-          endTimestamp: 200,
-          maxHits: 20,
-          sortByField: {
-            field_name: 'timestamp',
-            order: 'Desc',
-          },
-          aggregation: false,
-          aggregationConfig: {
-            metric: null,
-            term: null,
-            histogram: null,
-          },
+            indexId: 'my-new-fresh-index-id',
+            query: 'severity_error:ERROR',
+            startTimestamp: 100,
+            endTimestamp: 200,
+            maxHits: 20,
+            sortByField: {
+              field_name: 'timestamp',
+              order: 'Desc',
+            },
+            aggregation: false,
+            aggregationConfig: {
+              metric: null,
+              term: null,
+              histogram: null,
+            },
         };
-        expect(new Client().buildSearchBody(searchRequest, null)).toBe('{"query":"severity_error:ERROR","max_hits":20,"start_timestamp":100,"end_timestamp":200,"sort_by_field":"+timestamp"}');
+
+        const client = new Client();
+        expect(client.buildSearchBody(searchRequest, null)).toBe('{"query":"severity_error:ERROR","max_hits":20,"start_timestamp":100,"end_timestamp":200,"sort_by_field":"+timestamp"}');
+
+        await client.search(searchRequest, null);
+        const expectedUrl = `${client.apiRoot()}my-new-fresh-index-id/search`;
+        expect(mockFetch).toHaveBeenCalledTimes(1);
+        expect(mockFetch).toHaveBeenCalledWith(expectedUrl, expect.any(Object));
     });
 });
diff --git a/quickwit/quickwit-ui/src/services/client.ts b/quickwit/quickwit-ui/src/services/client.ts
index 19d1ae14805..d4b92488656 100644
--- a/quickwit/quickwit-ui/src/services/client.ts
+++ b/quickwit/quickwit-ui/src/services/client.ts
@@ -40,7 +40,7 @@ export class Client {
     if (request.indexId === null || request.indexId === undefined) {
       throw Error("Search request must have and index id.")
     }
-    const url = `${this.apiRoot()}/${request.indexId}/search`;
+    const url = `${this.apiRoot()}${request.indexId}/search`;
     const body = this.buildSearchBody(request, timestamp_field);
     return this.fetch(url, this.defaultGetRequestParams(), body);
   }