From bee03aa4e285db5a9ab6a30a18bfe48d2d3ac735 Mon Sep 17 00:00:00 2001
From: pgayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 18 Nov 2020 17:54:09 +0100
Subject: [PATCH] Add icons to the SO results

---
 .../global_search_bar/public/components/search_bar.tsx       | 5 +----
 .../providers/saved_objects/map_object_to_result.test.ts     | 2 ++
 .../server/providers/saved_objects/map_object_to_result.ts   | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
index 277397995a6663..2c0a6448c11e46 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -76,13 +76,10 @@ const resultToOption = (result: GlobalSearchResult): EuiSelectableTemplateSitewi
     label: title,
     url,
     type,
+    icon: { type: icon ?? 'empty' },
     'data-test-subj': `nav-search-option`,
   };
 
-  if (icon) {
-    option.icon = { type: icon };
-  }
-
   if (type === 'application') {
     option.meta = [{ text: meta?.categoryLabel as string }];
   } else {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
index 8798fe6694c96c..ca5dbf8026472d 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
@@ -42,6 +42,7 @@ describe('mapToResult', () => {
       name: 'dashboard',
       management: {
         defaultSearchField: 'title',
+        icon: 'dashboardApp',
         getInAppUrl: (obj) => ({ path: `/dashboard/${obj.id}`, uiCapabilitiesPath: '' }),
       },
     });
@@ -62,6 +63,7 @@ describe('mapToResult', () => {
       title: 'My dashboard',
       type: 'dashboard',
       url: '/dashboard/dash1',
+      icon: 'dashboardApp',
       score: 42,
     });
   });
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
index 14641e1aaffff4..ec55a2a78fa9e1 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
@@ -50,6 +50,7 @@ export const mapToResult = (
     // so we are forced to cast the attributes to any to access the properties associated with it.
     title: (object.attributes as any)[defaultSearchField],
     type: object.type,
+    icon: type.management?.icon ?? undefined,
     url: getInAppUrl(object).path,
     score: object.score,
   };