Fix command with query parameter rejected in DevTools

Signed-off-by: Hailong Cui <[email protected]>

src/plugins/console/server/routes/api/console/proxy/create_handler.ts

@@ -75,7 +75,11 @@ function toUrlPath(path: string) {
   // in JS can lead to data loss (7.0 will get munged into 7, thus losing indication of
   // measurement precision)
   if (!urlPath.includes('?pretty')) {
-    urlPath += '?pretty=true';
+    if (urlPath.includes('?')) {
+      urlPath += '&pretty=true';
+    } else {
+      urlPath += '?pretty=true';
+    }
   }
   return urlPath;
 }

src/plugins/console/server/routes/api/console/proxy/tests/query_string.test.ts

@@ -82,6 +82,14 @@ describe('Console Proxy Route', () => {
           expect(args.path).toBe('/index/id?pretty=true');
         });
       });
+
+      describe(`contains query parameter`, () => {
+        it('adds slash to path before sending request', async () => {
+          await request('GET', '_cat/tasks?v');
+          const [[args]] = opensearchClient.asCurrentUser.transport.request.mock.calls;
+          expect(args.path).toBe('/_cat/tasks?v&pretty=true');
+        });
+      });
     });
   });
 });