From 39ec7a287519f031787e0b5d451b4946d33dcef6 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 23 Feb 2023 13:09:27 +0100
Subject: [PATCH] Fix merge conflicts

---
 src/plugins/saved_objects_finder/kibana.jsonc                 | 4 +---
 .../public/finder/saved_object_finder.tsx                     | 2 +-
 test/functional/services/dashboard/add_panel.ts               | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/saved_objects_finder/kibana.jsonc b/src/plugins/saved_objects_finder/kibana.jsonc
index bfe35d688b9cf..6fd36d8402c18 100644
--- a/src/plugins/saved_objects_finder/kibana.jsonc
+++ b/src/plugins/saved_objects_finder/kibana.jsonc
@@ -6,8 +6,6 @@
     "id": "savedObjectsFinder",
     "server": true,
     "browser": true,
-    "requiredBundles": [
-      "savedObjects"
-    ]
+    "requiredBundles": []
   }
 }
diff --git a/src/plugins/saved_objects_finder/public/finder/saved_object_finder.tsx b/src/plugins/saved_objects_finder/public/finder/saved_object_finder.tsx
index 777952f34e3e3..8797786e7fbd6 100644
--- a/src/plugins/saved_objects_finder/public/finder/saved_object_finder.tsx
+++ b/src/plugins/saved_objects_finder/public/finder/saved_object_finder.tsx
@@ -159,7 +159,7 @@ export class SavedObjectFinderUi extends React.Component<
           attributes: { name, title },
         } = savedObject;
         const titleToUse = typeof title === 'string' ? title : '';
-        const nameToUse = name && typeof name === 'string' ? name : titleToUse;
+        const nameToUse = name ? name : titleToUse;
         return {
           ...savedObject,
           version: savedObject.version,
diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts
index bbf046cc9ca2d..d901c3a46baa2 100644
--- a/test/functional/services/dashboard/add_panel.ts
+++ b/test/functional/services/dashboard/add_panel.ts
@@ -94,7 +94,6 @@ export class DashboardAddPanelService extends FtrService {
     for (let i = 0; i < listItems.length; i++) {
       const listItem = await listItems[i].findByClassName('euiSelectableListItem__text');
       const text = await listItem.getVisibleText();
-      this.log.debug('**** ' + text + ' ****');
       if (text.includes(type)) {
         await listItem.click();
         await this.toggleFilterPopover();
@@ -250,7 +249,6 @@ export class DashboardAddPanelService extends FtrService {
     await this.toggleFilter(embeddableType);
     await this.filterEmbeddableNames(`"${embeddableName.replace('-', ' ')}"`);
     await this.testSubjects.click(`savedObjectTitle${embeddableName.split(' ').join('-')}`);
-    this.log.debug('*****' + 'Clicked' + '******');
     await this.testSubjects.exists('addObjectToDashboardSuccess');
     await this.closeAddPanel();
     return embeddableName;