fix: GEN-1856 encode and escape search value for the tag search (#18285)

* fix: GEN-1856 encode and escape search value for the tag * fix test * add missing import
open-metadata · Oct 17, 2024 · e5669ae · e5669ae
1 parent 29b5c77
commit e5669ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts
@@ -16,6 +16,12 @@ import tagClassBase, { TagClassBase } from './TagClassBase';
 
 jest.mock('../rest/searchAPI');
 
+
+jest.mock('./StringsUtils', () => ({
+  getEncodedFqn: jest.fn().mockReturnValue('test'),
+  escapeESReservedCharacters: jest.fn().mockReturnValue('test'),
+}));
+
 describe('TagClassBase', () => {
   beforeEach(() => {
     (searchQuery as jest.Mock).mockClear();

diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts
@@ -13,11 +13,14 @@
 import { PAGE_SIZE } from '../constants/constants';
 import { SearchIndex } from '../enums/search.enum';
 import { searchQuery } from '../rest/searchAPI';
+import { escapeESReservedCharacters, getEncodedFqn } from './StringsUtils';
 
 class TagClassBase {
   public async getTags(searchText: string, page: number) {
+    // this is to esacpe and encode any chars which is known by ES search internally
+    const encodedValue = getEncodedFqn(escapeESReservedCharacters(searchText));
     const res = await searchQuery({
-      query: `*${searchText}*`,
+      query: `*${encodedValue}*`,
       filters: 'disabled:false',
       pageNumber: page,
       pageSize: PAGE_SIZE,