[Console] Preserve spaces in URL query strings

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: kapral18

src/platform/plugins/shared/console/public/application/containers/editor/utils/tokens_utils.test.ts

@@ -31,6 +31,31 @@ describe('tokens_utils', () => {
       const result = removeTrailingWhitespaces(url);
       expect(result).toBe(url);
     });
+    it(`doesn't treat a question mark inside quotes as query string start`, () => {
+      const url = '_search/"?literal" trailing_text';
+      const result = removeTrailingWhitespaces(url);
+      expect(result).toBe('_search/"?literal"');
+    });
+    it(`does not strip unquoted spaces inside query values (the reported bug case)`, () => {
+      const url = 'myindex/_search?q=type:organisation AND elastic';
+      const result = removeTrailingWhitespaces(url);
+      expect(result).toBe(url);
+    });
+    it(`still detects and strips inline comment after unquoted query spaces`, () => {
+      const url = 'myindex/_search?q=type:organisation AND elastic // filter orgs';
+      const result = removeTrailingWhitespaces(url);
+      expect(result).toBe('myindex/_search?q=type:organisation AND elastic');
+    });
+    it(`still detects inline comment after mixed whitespace in query values`, () => {
+      const url = 'myindex/_search?q=type:organisation AND elastic \t// filter orgs';
+      const result = removeTrailingWhitespaces(url);
+      expect(result).toBe('myindex/_search?q=type:organisation AND elastic');
+    });
+    it(`still detects and strips hash comment after unquoted query spaces`, () => {
+      const url = 'myindex/_search?q=type:organisation AND elastic # filter orgs';
+      const result = removeTrailingWhitespaces(url);
+      expect(result).toBe('myindex/_search?q=type:organisation AND elastic');
+    });
   });
 
   describe('parseLine', () => {
@@ -48,6 +73,15 @@ describe('tokens_utils', () => {
       expect(urlPathTokens).toEqual(['_search']);
       expect(urlParamsTokens[0]).toEqual(['query', '"test1 test2 test3"']);
     });
+    it('preserves unquoted spaces inside query values', () => {
+      const { method, url, urlPathTokens, urlParamsTokens } = parseLine(
+        'GET myindex/_search?q=type:organisation AND elastic'
+      );
+      expect(method).toBe('GET');
+      expect(url).toBe('myindex/_search?q=type:organisation AND elastic');
+      expect(urlPathTokens).toEqual(['myindex', '_search']);
+      expect(urlParamsTokens[0]).toEqual(['q', 'type:organisation AND elastic']);
+    });
     it('works with multiple whitespaces', () => {
       const { method, url, urlPathTokens, urlParamsTokens } = parseLine(
         ' GET   _search?query="test1     test2    test3"    //   comment'

src/platform/plugins/shared/console/public/application/containers/editor/utils/tokens_utils.ts

@@ -416,14 +416,30 @@ export const parseBody = (value: string): string[] => {
 export const removeTrailingWhitespaces = (url: string): string => {
   let index = 0;
   let whitespaceIndex = -1;
-  let isQueryParam = false;
+  let isInQuotes = false;
+  let seenQuestionMark = false;
   let char = url[index];
   while (char) {
     if (char === '"') {
-      isQueryParam = !isQueryParam;
-    } else if (char === ' ' && !isQueryParam) {
-      whitespaceIndex = index;
-      break;
+      isInQuotes = !isInQuotes;
+    } else if (char === '?' && !isInQuotes) {
+      seenQuestionMark = true;
+    } else if (char === ' ' && !isInQuotes) {
+      if (!seenQuestionMark) {
+        whitespaceIndex = index;
+        break;
+      }
+      let commentIndex = index;
+      while (whitespacesRegex.test(url[commentIndex])) {
+        commentIndex++;
+      }
+      if (
+        url[commentIndex] === '#' ||
+        (url[commentIndex] === '/' && url[commentIndex + 1] === '/')
+      ) {
+        whitespaceIndex = index;
+        break;
+      }
     }
     index++;
     char = url[index];