From 2d11aeb14a073b594cada219d39c422c19e13a8f Mon Sep 17 00:00:00 2001
From: Suchit Sahoo <suchsah@amazon.com>
Date: Thu, 5 Sep 2024 19:53:45 +0000
Subject: [PATCH] Fixed Test failures

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>
---
 .../header/__snapshots__/header.test.tsx.snap | 27 +++++-----
 .../header_breadcrumbs.test.tsx.snap          | 11 +++-
 .../open_search_panel.test.tsx.snap           |  3 ++
 .../finder/saved_object_finder.test.tsx       | 53 +++++++++++++++++++
 .../public/finder/saved_object_finder.tsx     |  5 +-
 5 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index d9b543a32627..2ef852b3f246 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -4352,12 +4352,14 @@ exports[`Header handles visibility and lock changes 1`] = `
                 className="euiHeaderBreadcrumbs"
                 data-test-subj="breadcrumbs"
                 max={10}
+                simplify={false}
                 truncate={true}
               >
                 <nav
                   aria-label="breadcrumb"
                   className="euiBreadcrumbs euiHeaderBreadcrumbs euiBreadcrumbs--truncate"
                   data-test-subj="breadcrumbs"
+                  simplify={false}
                 >
                   <div
                     className="euiBreadcrumbWall euiBreadcrumbWall--single"
@@ -12755,12 +12757,14 @@ exports[`Header renders condensed header 1`] = `
                 className="euiHeaderBreadcrumbs"
                 data-test-subj="breadcrumbs"
                 max={10}
+                simplify={false}
                 truncate={true}
               >
                 <nav
                   aria-label="breadcrumb"
                   className="euiBreadcrumbs euiHeaderBreadcrumbs euiBreadcrumbs--truncate"
                   data-test-subj="breadcrumbs"
+                  simplify={false}
                 >
                   <div
                     className="euiBreadcrumbWall euiBreadcrumbWall--single"
@@ -17632,7 +17636,7 @@ exports[`Header renders page header with application title 1`] = `
                 max={10}
                 simplify={true}
               >
-                <EuiSimplifiedBreadcrumbs
+                <EuiBreadcrumbs
                   breadcrumbs={
                     Array [
                       Object {
@@ -17641,26 +17645,28 @@ exports[`Header renders page header with application title 1`] = `
                       },
                     ]
                   }
-                  className="euiHeaderBreadcrumbs euiHeaderBreadcrumbs--simplified"
+                  className="euiHeaderBreadcrumbs"
                   data-test-subj="breadcrumbs"
                   max={10}
+                  simplify={true}
                   truncate={true}
                 >
                   <nav
                     aria-label="breadcrumb"
-                    className="euiSimplifiedBreadcrumbs euiHeaderBreadcrumbs euiHeaderBreadcrumbs--simplified euiSimplifiedBreadcrumbs--truncate"
+                    className="euiBreadcrumbs euiHeaderBreadcrumbs euiBreadcrumbs--truncate"
                     data-test-subj="breadcrumbs"
+                    simplify={true}
                   >
                     <div
-                      className="euiSimplifiedBreadcrumbWall euiSimplifiedBreadcrumbWall--single"
+                      className="euiBreadcrumbWall euiBreadcrumbWall--single"
                     >
                       <div
-                        className="euiSimplifiedBreadcrumbWrapper euiSimplifiedBreadcrumbWrapper--first euiSimplifiedBreadcrumbWrapper--last"
+                        className="euiBreadcrumbWrapper euiBreadcrumbWrapper--first euiBreadcrumbWrapper--last"
                       >
                         <EuiInnerText>
                           <span
                             aria-current="page"
-                            className="euiSimplifiedBreadcrumb euiSimplifiedBreadcrumb--last"
+                            className="euiBreadcrumb euiBreadcrumb--last"
                             data-test-subj="breadcrumb first"
                             title="test"
                           >
@@ -17669,13 +17675,8 @@ exports[`Header renders page header with application title 1`] = `
                         </EuiInnerText>
                       </div>
                     </div>
-                    <EuiBreadcrumbSeparator>
-                      <div
-                        className="euiBreadcrumbSeparator"
-                      />
-                    </EuiBreadcrumbSeparator>
                   </nav>
-                </EuiSimplifiedBreadcrumbs>
+                </EuiBreadcrumbs>
               </EuiHeaderBreadcrumbs>
             </HeaderBreadcrumbs>
           </div>
@@ -22034,12 +22035,14 @@ exports[`Header toggles primary navigation menu when clicked 1`] = `
                 className="euiHeaderBreadcrumbs"
                 data-test-subj="breadcrumbs"
                 max={10}
+                simplify={false}
                 truncate={true}
               >
                 <nav
                   aria-label="breadcrumb"
                   className="euiBreadcrumbs euiHeaderBreadcrumbs euiBreadcrumbs--truncate"
                   data-test-subj="breadcrumbs"
+                  simplify={false}
                 >
                   <div
                     className="euiBreadcrumbWall euiBreadcrumbWall--single"
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header_breadcrumbs.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header_breadcrumbs.test.tsx.snap
index e6ac818d9b6a..441f43729e98 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header_breadcrumbs.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header_breadcrumbs.test.tsx.snap
@@ -36,6 +36,15 @@ exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable 3`] =
 
 exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 1`] = `null`;
 
-exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 2`] = `null`;
+exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 2`] = `
+<span
+  aria-current="page"
+  className="euiBreadcrumb euiBreadcrumb--last"
+  data-test-subj="breadcrumb first"
+  title="First"
+>
+  First
+</span>
+`;
 
 exports[`HeaderBreadcrumbs renders updates to the breadcrumbs$ observable with updated header 3`] = `null`;
diff --git a/src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap b/src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
index 1d35e4e977ba..d4e8ff6ea026 100644
--- a/src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
+++ b/src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
@@ -35,6 +35,9 @@ exports[`render 1`] = `
         Array [
           Object {
             "getIconForSavedObject": [Function],
+            "includeFields": Array [
+              "kibanaSavedObjectMeta",
+            ],
             "name": "Saved search",
             "type": "search",
           },
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
index c4e885c33e77..7c89e41c0a32 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
@@ -48,6 +48,7 @@ import React from 'react';
 import * as sinon from 'sinon';
 import { SavedObjectFinderUi as SavedObjectFinder } from './saved_object_finder';
 import { coreMock } from '../../../../core/public/mocks';
+import { of } from 'rxjs';
 
 describe('SavedObjectsFinder', () => {
   const doc = {
@@ -79,16 +80,20 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
         savedObjects={core.savedObjects}
         uiSettings={core.uiSettings}
         savedObjectMetaData={searchMetaData}
+        application={core.application}
       />
     );
     wrapper.instance().componentDidMount!();
 
+    await Promise.resolve();
+
     expect(core.savedObjects.client.find).toHaveBeenCalledWith({
       type: ['search'],
       fields: ['title'],
@@ -106,17 +111,20 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
         savedObjects={core.savedObjects}
         uiSettings={core.uiSettings}
         savedObjectMetaData={searchMetaData}
+        application={core.application}
       />
     );
 
     wrapper.instance().componentDidMount!();
     await nextTick();
+    await Promise.resolve();
     expect(
       wrapper.containsMatchingElement(<EuiListGroupItem iconType="search" label="Example title" />)
     ).toEqual(true);
@@ -129,6 +137,7 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
@@ -136,11 +145,13 @@ describe('SavedObjectsFinder', () => {
         uiSettings={core.uiSettings}
         onChoose={chooseStub}
         savedObjectMetaData={searchMetaData}
+        application={core.application}
       />
     );
 
     wrapper.instance().componentDidMount!();
     await nextTick();
+    await Promise.resolve();
     wrapper.find(EuiListGroupItem).first().simulate('click');
     expect(chooseStub.calledWith('1', 'search', `${doc.attributes.title} (Search)`, doc)).toEqual(
       true
@@ -154,16 +165,20 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: [doc, doc2] })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
       wrapper.instance().componentDidMount!();
       await nextTick();
+      await Promise.resolve();
+
       const list = wrapper.find(EuiListGroup);
       expect(list.childAt(0).key()).toBe('2');
       expect(list.childAt(1).key()).toBe('1');
@@ -175,12 +190,14 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: [doc, doc2] })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -199,6 +216,7 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc, doc2] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
@@ -212,6 +230,7 @@ describe('SavedObjectsFinder', () => {
             showSavedObject: ({ id }) => id !== '1',
           },
         ]}
+        application={core.application}
       />
     );
 
@@ -229,12 +248,14 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: [doc, doc2] })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
       wrapper.instance().componentDidMount!();
@@ -258,6 +279,7 @@ describe('SavedObjectsFinder', () => {
     it('should include additional fields in search if listed in meta data', async () => {
       const core = coreMock.createStart();
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
       (core.savedObjects.client.find as jest.Mock).mockResolvedValue({ savedObjects: [] });
 
       const wrapper = shallow(
@@ -278,6 +300,7 @@ describe('SavedObjectsFinder', () => {
               includeFields: ['field2', 'field3'],
             },
           ]}
+          application={core.application}
         />
       );
       wrapper.instance().componentDidMount!();
@@ -304,12 +327,14 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: [doc, doc2] })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -332,6 +357,7 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc, doc2] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
@@ -349,6 +375,7 @@ describe('SavedObjectsFinder', () => {
             getIconForSavedObject: () => 'visLine',
           },
         ]}
+        application={core.application}
       />
     );
     wrapper.instance().componentDidMount!();
@@ -386,6 +413,7 @@ describe('SavedObjectsFinder', () => {
         })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -393,6 +421,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           showFilter={false}
           savedObjectMetaData={metaDataConfig}
+          application={core.application}
         />
       );
 
@@ -411,6 +440,7 @@ describe('SavedObjectsFinder', () => {
         })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -418,6 +448,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           showFilter={true}
           savedObjectMetaData={metaDataConfig}
+          application={core.application}
         />
       );
 
@@ -436,6 +467,7 @@ describe('SavedObjectsFinder', () => {
         })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -443,6 +475,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           showFilter={true}
           savedObjectMetaData={metaDataConfig}
+          application={core.application}
         />
       );
 
@@ -464,6 +497,7 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const noItemsMessage = <span id="myNoItemsMessage" />;
     const wrapper = shallow(
@@ -472,6 +506,7 @@ describe('SavedObjectsFinder', () => {
         uiSettings={core.uiSettings}
         noItemsMessage={noItemsMessage}
         savedObjectMetaData={searchMetaData}
+        application={core.application}
       />
     );
     wrapper.instance().componentDidMount!();
@@ -495,6 +530,7 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: longItemList })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -502,6 +538,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           initialPageSize={15}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -517,6 +554,7 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: longItemList })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -524,6 +562,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           initialPageSize={15}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -539,6 +578,7 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: longItemList })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -546,6 +586,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           initialPageSize={15}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -561,6 +602,7 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: longItemList })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -568,6 +610,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           fixedPageSize={33}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -583,6 +626,7 @@ describe('SavedObjectsFinder', () => {
         Promise.resolve({ savedObjects: longItemList })
       );
       core.uiSettings.get.mockImplementation(() => 10);
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -590,6 +634,7 @@ describe('SavedObjectsFinder', () => {
           uiSettings={core.uiSettings}
           fixedPageSize={33}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -604,12 +649,14 @@ describe('SavedObjectsFinder', () => {
     it('should display a spinner during initial loading', () => {
       const core = coreMock.createStart();
       (core.savedObjects.client.find as jest.Mock).mockResolvedValue({ savedObjects: [] });
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -621,6 +668,7 @@ describe('SavedObjectsFinder', () => {
       ((core.savedObjects.client.find as any) as jest.SpyInstance).mockImplementation(() =>
         Promise.resolve({ savedObjects: [doc] })
       );
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
@@ -633,6 +681,7 @@ describe('SavedObjectsFinder', () => {
               getIconForSavedObject: () => 'search',
             },
           ]}
+          application={core.application}
         />
       );
 
@@ -646,12 +695,14 @@ describe('SavedObjectsFinder', () => {
       ((core.savedObjects.client.find as any) as jest.SpyInstance).mockImplementation(() =>
         Promise.resolve({ savedObjects: [doc] })
       );
+      core.application.currentAppId$ = of('data-explorer');
 
       const wrapper = shallow(
         <SavedObjectFinder
           savedObjects={core.savedObjects}
           uiSettings={core.uiSettings}
           savedObjectMetaData={searchMetaData}
+          application={core.application}
         />
       );
 
@@ -674,6 +725,7 @@ describe('SavedObjectsFinder', () => {
       Promise.resolve({ savedObjects: [doc, doc2] })
     );
     core.uiSettings.get.mockImplementation(() => 10);
+    core.application.currentAppId$ = of('data-explorer');
 
     const wrapper = shallow(
       <SavedObjectFinder
@@ -691,6 +743,7 @@ describe('SavedObjectsFinder', () => {
             getIconForSavedObject: () => 'visLine',
           },
         ]}
+        application={core.application}
       >
         <button id="testChildButton">Dummy text</button>
       </SavedObjectFinder>
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
index 3857d8e2bb38..186b50572c0d 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
@@ -148,12 +148,11 @@ class SavedObjectFinderUi extends React.Component<
     return appId;
   }
 
-  readonly languageService = this.props.data.query.queryString.getLanguageService();
+  readonly languageService = this.props.data?.query?.queryString?.getLanguageService();
   private isComponentMounted: boolean = false;
 
   private debouncedFetch = _.debounce(async (query: string) => {
     const metaDataMap = this.getSavedObjectMetaDataMap();
-    const currentAppId = await this.getCurrentAppId();
 
     const fields = Object.values(metaDataMap)
       .map((metaData) => metaData.includeFields || [])
@@ -192,6 +191,8 @@ class SavedObjectFinderUi extends React.Component<
     );
 
     // Filter search objects whose language are not supported by the current Application
+    const currentAppId = await this.getCurrentAppId();
+
     savedObjects = savedObjects.filter((obj) => {
       if (obj.type === 'search') {
         if (obj.attributes?.kibanaSavedObjectMeta) {