fix #327 again

Author: cars10

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.10.1
+
+* fix another encoding issue, fixes again [#327](https://github.com/cars10/elasticvue/issues/327)
+
 ## 1.10.0
 
 * fix encoding issue in rest query interface, fixes [#327](https://github.com/cars10/elasticvue/issues/327)

src/composables/components/rest/RestQueryForm.ts

@@ -9,7 +9,7 @@ import { fetchMethod } from '../../../helpers/fetch'
 import { IdbRestQueryTab, IdbRestQueryTabRequest } from '../../../db/types.ts'
 import { debounce } from '../../../helpers/debounce.ts'
 import { parseKibana } from '../../../helpers/parseKibana.ts'
-import { cleanRestPath } from '../../../helpers/cleanRestPath.ts'
+import { cleanIndexName } from '../../../helpers/cleanIndexName.ts'
 
 type RestQueryFormProps = {
   tab: IdbRestQueryTab
@@ -48,7 +48,7 @@ export const useRestQueryForm = (props: RestQueryFormProps, emit: any) => {
 
     let url = connectionStore.activeCluster.uri
     if (!url.endsWith('/') && !props.tab.request.path.startsWith('/')) url += '/'
-    url += cleanRestPath(props.tab.request.path)
+    url += cleanIndexName(props.tab.request.path)
 
     try {
       const fetchResponse = await fetchMethod(url, options)

src/helpers/cleanIndexName.ts

@@ -1,6 +1,11 @@
 export const cleanIndexName = (index: string) => {
-  return index.replace(/%/g, '%25').replace(/<.*?>/g, (match) => {
-    return match
+  // First encode % characters that are NOT part of URL-encoded sequences
+  // URL-encoded sequences are % followed by exactly 2 hex digits
+  let result = index.replace(/%(?![\dA-Fa-f]{2})/g, '%25')
+  
+  // Then encode characters only within datemath expressions (<...>)
+  result = result.replace(/<([^>]*)>/g, (_, content) => {
+    const encodedContent = content
       .replace(/</g, '%3C')
       .replace(/>/g, '%3E')
       .replace(/\//g, '%2F')
@@ -10,5 +15,8 @@ export const cleanIndexName = (index: string) => {
       .replace(/\+/g, '%2B')
       .replace(/:/g, '%3A')
       .replace(/,/g, '%2C')
+    return `%3C${encodedContent}%3E`
   })
+  
+  return result
 }

src/helpers/cleanRestPath.ts

@@ -36,4 +36,25 @@ describe.concurrent('helpers/cleanIndexName.ts', () => {
     const cleanedName = 'movies/kube+foo/bar'
     expect(cleanIndexName(indexName)).toBe(cleanedName)
   })
+
+  it('should not double-encode already URL-encoded characters', () => {
+    const testCases = [
+      {
+        input: 'my-index/_doc/my%2Fdocument%2Fid',
+        expected: 'my-index/_doc/my%2Fdocument%2Fid'
+      },
+      {
+        input: 'my-index-<{now/d}>/_doc/my%2Fdocument%2Fid',
+        expected: 'my-index-%3C%7Bnow%2Fd%7D%3E/_doc/my%2Fdocument%2Fid'
+      },
+      {
+        input: '_cluster/health',
+        expected: '_cluster/health'
+      }
+    ]
+    
+    testCases.forEach(({ input, expected }) => {
+      expect(cleanIndexName(input)).toBe(expected)
+    })
+  })
 })