Removing stateful saved object finder

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx

@@ -35,7 +35,6 @@ import {
   AppStateClass as TAppStateClass,
   KbnUrl,
   SaveOptions,
-  SavedObjectFinder,
   unhashUrl,
 } from './legacy_imports';
 import { FilterStateManager, IndexPattern } from '../../../data/public';
@@ -115,7 +114,7 @@ export class DashboardAppController {
         timefilter: { timefilter },
       },
     },
-    core: { notifications, overlays, chrome, injectedMetadata },
+    core: { notifications, overlays, chrome, injectedMetadata, uiSettings, savedObjects },
   }: DashboardAppControllerDependencies) {
     new FilterStateManager(globalState, getAppState, filterManager);
     const queryFilter = filterManager;
@@ -724,7 +723,8 @@ export class DashboardAppController {
           getFactory: embeddables.getEmbeddableFactory,
           notifications,
           overlays,
-          SavedObjectFinder,
+          uiSettings,
+          savedObjects,
         });
       }
     };

src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts

@@ -65,4 +65,3 @@ export { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_mon
 export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
 export { unhashUrl } from 'ui/state_management/state_hashing';
 export { IInjector } from 'ui/chrome';
-export { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';

src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js

@@ -32,11 +32,16 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
+import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
+import { getServices } from '../../kibana_services';
 
 const SEARCH_OBJECT_TYPE = 'search';
 
 export function OpenSearchPanel(props) {
+  const {
+    core: { uiSettings, savedObjects },
+  } = getServices();
+
   return (
     <EuiFlyout ownFocus onClose={props.onClose} data-test-subj="loadSearchForm">
       <EuiFlyoutHeader hasBorder>
@@ -50,7 +55,7 @@ export function OpenSearchPanel(props) {
         </EuiTitle>
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
-        <SavedObjectFinder
+        <SavedObjectFinderUi
           noItemsMessage={
             <FormattedMessage
               id="kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription"
@@ -70,6 +75,8 @@ export function OpenSearchPanel(props) {
             window.location.assign(props.makeUrl(id));
             props.onClose();
           }}
+          uiSettings={uiSettings}
+          savedObjects={savedObjects}
         />
       </EuiFlyoutBody>
       <EuiFlyoutFooter>

src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js

@@ -23,7 +23,7 @@ import { shallow } from 'enzyme';
 jest.mock('../../kibana_services', () => {
   return {
     getServices: () => ({
-      SavedObjectFinder: jest.fn()
+      core: { uiSettings: {}, savedObjects: {} },
     }),
   };
 });

src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx

@@ -22,9 +22,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
-
-import { VisType } from '../../kibana_services';
+import { VisType, getServices } from '../../kibana_services';
+import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
 
 interface SearchSelectionProps {
   onSearchSelected: (searchId: string, searchType: string) => void;
@@ -35,6 +34,9 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
   private fixedPageSize: number = 8;
 
   public render() {
+    const {
+      core: { uiSettings, savedObjects },
+    } = getServices();
     return (
       <React.Fragment>
         <EuiModalHeader>
@@ -52,7 +54,7 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
           </EuiModalHeaderTitle>
         </EuiModalHeader>
         <EuiModalBody>
-          <SavedObjectFinder
+          <SavedObjectFinderUi
             key="searchSavedObjectFinder"
             onChoose={this.props.onSearchSelected}
             showFilter
@@ -85,6 +87,8 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
               },
             ]}
             fixedPageSize={this.fixedPageSize}
+            uiSettings={uiSettings}
+            savedObjects={savedObjects}
           />
         </EuiModalBody>
       </React.Fragment>

src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx

@@ -42,7 +42,6 @@ let embeddable: ContactCardEmbeddable;
 beforeEach(async () => {
   const options: DashboardOptions = {
     ExitFullScreenButton: () => null,
-    SavedObjectFinder: () => null,
     application: {} as any,
     embeddable: {
       getEmbeddableFactory: (id: string) => embeddableFactories.get(id)!,
@@ -52,6 +51,8 @@ beforeEach(async () => {
     overlays: {} as any,
     savedObjectMetaData: {} as any,
     uiActions: {} as any,
+    uiSettings: {} as any,
+    savedObjects: {} as any,
   };
   const input = getSampleDashboardInput({
     panels: {

src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx

@@ -31,19 +31,10 @@ import {
 export async function openReplacePanelFlyout(options: {
   embeddable: IContainer;
   core: CoreStart;
-  savedObjectFinder: React.ComponentType<any>;
-  notifications: CoreStart['notifications'];
   panelToRemove: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
   getEmbeddableFactories: IEmbeddableStart['getEmbeddableFactories'];
 }) {
-  const {
-    embeddable,
-    core,
-    panelToRemove,
-    savedObjectFinder,
-    notifications,
-    getEmbeddableFactories,
-  } = options;
+  const { embeddable, core, panelToRemove, getEmbeddableFactories } = options;
   const flyoutSession = core.overlays.openFlyout(
     toMountPoint(
       <ReplacePanelFlyout
@@ -54,8 +45,9 @@ export async function openReplacePanelFlyout(options: {
           }
         }}
         panelToRemove={panelToRemove}
-        savedObjectsFinder={savedObjectFinder}
-        notifications={notifications}
+        notifications={core.notifications}
+        uiSettings={core.uiSettings}
+        savedObjects={core.savedObjects}
         getEmbeddableFactories={getEmbeddableFactories}
       />
     ),

src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx

@@ -45,13 +45,14 @@ beforeEach(async () => {
   coreStart = coreMock.createStart();
   const options: DashboardOptions = {
     ExitFullScreenButton: () => null,
-    SavedObjectFinder: () => null,
     application: {} as any,
     embeddable: {
       getEmbeddableFactory: (id: string) => embeddableFactories.get(id)!,
     } as any,
     inspector: {} as any,
     notifications: {} as any,
+    uiSettings: coreStart.uiSettings,
+    savedObjects: coreStart.savedObjects,
     overlays: coreStart.overlays,
     savedObjectMetaData: {} as any,
     uiActions: {} as any,
@@ -82,26 +83,12 @@ beforeEach(async () => {
 });
 
 test('Executes the replace panel action', async () => {
-  let SavedObjectFinder: any;
-  let notifications: any;
-  const action = new ReplacePanelAction(
-    coreStart,
-    SavedObjectFinder,
-    notifications,
-    getEmbeddableFactories
-  );
+  const action = new ReplacePanelAction(coreStart, getEmbeddableFactories);
   action.execute({ embeddable });
 });
 
 test('Is not compatible when embeddable is not in a dashboard container', async () => {
-  let SavedObjectFinder: any;
-  let notifications: any;
-  const action = new ReplacePanelAction(
-    coreStart,
-    SavedObjectFinder,
-    notifications,
-    getEmbeddableFactories
-  );
+  const action = new ReplacePanelAction(coreStart, getEmbeddableFactories);
   expect(
     await action.isCompatible({
       embeddable: new ContactCardEmbeddable(
@@ -113,40 +100,19 @@ test('Is not compatible when embeddable is not in a dashboard container', async
 });
 
 test('Execute throws an error when called with an embeddable not in a parent', async () => {
-  let SavedObjectFinder: any;
-  let notifications: any;
-  const action = new ReplacePanelAction(
-    coreStart,
-    SavedObjectFinder,
-    notifications,
-    getEmbeddableFactories
-  );
+  const action = new ReplacePanelAction(coreStart, getEmbeddableFactories);
   async function check() {
     await action.execute({ embeddable: container });
   }
   await expect(check()).rejects.toThrow(Error);
 });
 
 test('Returns title', async () => {
-  let SavedObjectFinder: any;
-  let notifications: any;
-  const action = new ReplacePanelAction(
-    coreStart,
-    SavedObjectFinder,
-    notifications,
-    getEmbeddableFactories
-  );
+  const action = new ReplacePanelAction(coreStart, getEmbeddableFactories);
   expect(action.getDisplayName({ embeddable })).toBeDefined();
 });
 
 test('Returns an icon', async () => {
-  let SavedObjectFinder: any;
-  let notifications: any;
-  const action = new ReplacePanelAction(
-    coreStart,
-    SavedObjectFinder,
-    notifications,
-    getEmbeddableFactories
-  );
+  const action = new ReplacePanelAction(coreStart, getEmbeddableFactories);
   expect(action.getIconType({ embeddable })).toBeDefined();
 });