Added svg, icon path in the search results and refine search term

elastic · Feb 11, 2024 · 6c9e46a · 6c9e46a
1 parent 944e05d
commit 6c9e46a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/index.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/index.svg
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -344,7 +344,7 @@ export class EnterpriseSearchPlugin implements Plugin {
 
     if (globalSearch) {
       globalSearch.registerResultProvider(getSearchResultProvider(http.basePath, config));
-      globalSearch.registerResultProvider(getIndicesSearchResultProvider());
+      globalSearch.registerResultProvider(getIndicesSearchResultProvider(http.basePath));
     }
   }
 

diff --git a/x-pack/plugins/enterprise_search/server/utils/indices_search_result_provider.test.ts b/x-pack/plugins/enterprise_search/server/utils/indices_search_result_provider.test.ts
@@ -14,7 +14,11 @@ import { ENTERPRISE_SEARCH_CONTENT_PLUGIN } from '../../common/constants';
 import { getIndicesSearchResultProvider } from './indices_search_result_provider';
 
 describe('Enterprise Search - indices search provider', () => {
-  const indicesSearchResultProvider = getIndicesSearchResultProvider();
+  const basePathMock = {
+    prepend: (input: string) => `/kbn${input}`,
+  } as any;
+
+  const indicesSearchResultProvider = getIndicesSearchResultProvider(basePathMock);
 
   const regularIndexResponse = {
     'search-github-api': {
@@ -50,6 +54,7 @@ describe('Enterprise Search - indices search provider', () => {
       path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/search_indices/search-github-api`,
       prependBasePath: true,
     },
+    icon: '/kbn/plugins/enterpriseSearch/assets/source_icons/index.svg',
   };
 
   const msftIndex = {
@@ -61,6 +66,7 @@ describe('Enterprise Search - indices search provider', () => {
       path: `${ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL}/search_indices/search-msft-sql-index`,
       prependBasePath: true,
     },
+    icon: '/kbn/plugins/enterpriseSearch/assets/source_icons/index.svg',
   };
 
   beforeEach(() => {});

diff --git a/x-pack/plugins/enterprise_search/server/utils/indices_search_result_provider.ts b/x-pack/plugins/enterprise_search/server/utils/indices_search_result_provider.ts
@@ -7,6 +7,7 @@
 
 import { from, takeUntil } from 'rxjs';
 
+import { IBasePath } from '@kbn/core-http-server';
 import {
   GlobalSearchProviderResult,
   GlobalSearchResultProvider,
@@ -17,7 +18,7 @@ import { ENTERPRISE_SEARCH_CONTENT_PLUGIN } from '../../common/constants';
 
 import { getIndexData } from '../lib/indices/utils/get_index_data';
 
-export function getIndicesSearchResultProvider(): GlobalSearchResultProvider {
+export function getIndicesSearchResultProvider(basePath: IBasePath): GlobalSearchResultProvider {
   return {
     find: ({ term, types, tags }, { aborted$, client, maxResults }) => {
       if (!client || !term || tags || (types && !types.includes('indices'))) {
@@ -44,6 +45,7 @@ export function getIndicesSearchResultProvider(): GlobalSearchResultProvider {
             return {
               id: indexName,
               title: indexName,
+              icon: basePath.prepend('/plugins/enterpriseSearch/assets/source_icons/index.svg'),
               type: i18n.translate('xpack.enterpriseSearch.searchIndexProvider.type.name', {
                 defaultMessage: 'Index',
               }),

diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
@@ -52,6 +52,15 @@ describe('resultToOption', () => {
     );
   });
 
+  it('uses icon for `index` type', () => {
+    const input = createSearchResult({ type: 'index', icon: 'index-icon' });
+    expect(resultToOption(input, [])).toEqual(
+      expect.objectContaining({
+        icon: { type: 'index-icon' },
+      })
+    );
+  });
+
   it('does not use icon for other types', () => {
     const input = createSearchResult({ type: 'dashboard', icon: 'dash-icon' });
     expect(resultToOption(input, [])).toEqual(

diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
@@ -25,7 +25,8 @@ export const resultToOption = (
     type === 'application' ||
     type === 'integration' ||
     type.toLowerCase() === 'enterprise search' ||
-    type.toLowerCase() === 'search';
+    type.toLowerCase() === 'search' ||
+    type.toLowerCase() === 'index';
   const option: EuiSelectableTemplateSitewideOption = {
     key: id,
     label: title,