Move search bar to NP

src/legacy/core_plugins/data/public/index.ts

@@ -30,12 +30,7 @@ export function plugin() {
 export { DataStart };
 
 export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
-export { SearchBar, SearchBarProps } from './search';
-export {
-  SavedQueryAttributes,
-  SavedQuery,
-  SavedQueryTimeFilter,
-} from '../../../../plugins/data/public';
+export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
 
 /** @public static code */
 export * from '../common';

src/legacy/core_plugins/data/public/plugin.ts

@@ -18,10 +18,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { createSearchBar, StatetfulSearchBarProps } from './search';
-import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
-import { initLegacyModule } from './shim/legacy_module';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setFieldFormats } from '../../../../plugins/data/public/services';
@@ -35,11 +32,8 @@ export interface DataPluginStartDependencies {
  *
  * @public
  */
-export interface DataStart {
-  ui: {
-    SearchBar: React.ComponentType<StatetfulSearchBarProps>;
-  };
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface DataStart {}
 
 /**
  * Data Plugin - public
@@ -54,28 +48,12 @@ export interface DataStart {
  */
 
 export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDependencies> {
-  private storage!: IStorageWrapper;
-
-  public setup(core: CoreSetup) {
-    this.storage = new Storage(window.localStorage);
-  }
+  public setup(core: CoreSetup) {}
 
   public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
     // This is required for when Angular code uses Field and FieldList.
     setFieldFormats(data.fieldFormats);
-    initLegacyModule(data.indexPatterns);
-
-    const SearchBar = createSearchBar({
-      core,
-      data,
-      storage: this.storage,
-    });
-
-    return {
-      ui: {
-        SearchBar,
-      },
-    };
+    return {};
   }
 
   public stop() {}

src/legacy/core_plugins/data/public/search/index.ts

@@ -16,5 +16,3 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-export * from './search_bar';

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/index.js

@@ -20,7 +20,7 @@
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
 import uiRoutes from 'ui/routes';
 import angularTemplate from './angular_template.html';
-import 'ui/index_patterns';
+import { npStart } from 'ui/new_platform';
 import { setup as managementSetup } from '../../../../../../management/public/legacy';
 import { getCreateBreadcrumbs } from '../breadcrumbs';
 
@@ -41,7 +41,7 @@ uiRoutes.when('/management/kibana/index_pattern', {
       const services = {
         config: $injector.get('config'),
         es: $injector.get('es'),
-        indexPatterns: $injector.get('indexPatterns'),
+        indexPatterns: npStart.plugins.data.indexPatterns,
         $http: $injector.get('$http'),
         savedObjectsClient: Private(SavedObjectsClientProvider),
         indexPatternCreationType,

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js

@@ -23,6 +23,7 @@ import { docTitle } from 'ui/doc_title';
 import { KbnUrlProvider } from 'ui/url';
 import uiRoutes from 'ui/routes';
 import { toastNotifications } from 'ui/notify';
+import { npStart } from 'ui/new_platform';
 
 import template from './create_edit_field.html';
 import { getEditFieldBreadcrumbs, getCreateFieldBreadcrumbs } from '../../breadcrumbs';
@@ -96,7 +97,8 @@ uiRoutes
       });
     },
     resolve: {
-      indexPattern: function ($route, Promise, redirectWhenMissing, indexPatterns) {
+      indexPattern: function ($route, Promise, redirectWhenMissing) {
+        const { indexPatterns } = npStart.plugins.data;
         return Promise.resolve(indexPatterns.get($route.current.params.indexPatternId))
           .catch(redirectWhenMissing('/management/kibana/index_patterns'));
       }

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js

@@ -36,6 +36,7 @@ import { IndexedFieldsTable } from './indexed_fields_table';
 import { ScriptedFieldsTable } from './scripted_fields_table';
 import { i18n } from '@kbn/i18n';
 import { I18nContext } from 'ui/i18n';
+import { npStart } from 'ui/new_platform';
 
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
@@ -168,7 +169,8 @@ uiRoutes.when('/management/kibana/index_patterns/:indexPatternId', {
   template,
   k7Breadcrumbs: getEditBreadcrumbs,
   resolve: {
-    indexPattern: function ($route, Promise, redirectWhenMissing, indexPatterns) {
+    indexPattern: function ($route, Promise, redirectWhenMissing) {
+      const { indexPatterns } = npStart.plugins.data;
       return Promise.resolve(indexPatterns.get($route.current.params.indexPatternId)).catch(
         redirectWhenMissing('/management/kibana/index_patterns')
       );
@@ -179,7 +181,7 @@ uiRoutes.when('/management/kibana/index_patterns/:indexPatternId', {
 uiModules
   .get('apps/management')
   .controller('managementIndexPatternsEdit', function (
-    $scope, $location, $route, Promise, config, indexPatterns, Private, AppState, confirmModal) {
+    $scope, $location, $route, Promise, config, Private, AppState, confirmModal) {
     const $state = $scope.state = new AppState();
 
     $scope.fieldWildcardMatcher = (...args) => fieldWildcardMatcher(...args, config.get('metaFields'));

src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js

@@ -36,7 +36,7 @@ const REACT_OBJECTS_TABLE_DOM_ELEMENT_ID = 'reactSavedObjectsTable';
 
 function updateObjectsTable($scope, $injector) {
   const Private = $injector.get('Private');
-  const indexPatterns = $injector.get('indexPatterns');
+  const indexPatterns = npStart.plugins.data.indexPatterns;
   const $http = $injector.get('$http');
   const kbnUrl = $injector.get('kbnUrl');
   const config = $injector.get('config');

src/legacy/core_plugins/navigation/public/legacy.ts

@@ -18,13 +18,12 @@
  */
 
 import { npSetup, npStart } from 'ui/new_platform';
-import { start as dataShim } from '../../data/public/legacy';
 import { plugin } from '.';
 
 const navPlugin = plugin();
 
 export const setup = navPlugin.setup(npSetup.core);
 
 export const start = navPlugin.start(npStart.core, {
-  data: dataShim,
+  data: npStart.plugins.data,
 });

src/legacy/core_plugins/navigation/public/plugin.ts

@@ -18,10 +18,10 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { TopNavMenuExtensionsRegistry, TopNavMenuExtensionsRegistrySetup } from './top_nav_menu';
 import { createTopNav } from './top_nav_menu/create_top_nav_menu';
 import { TopNavMenuProps } from './top_nav_menu/top_nav_menu';
-import { DataStart } from '../../data/public';
 
 /**
  * Interface for this plugin's returned `setup` contract.
@@ -44,7 +44,7 @@ export interface NavigationStart {
 }
 
 export interface NavigationPluginStartDependencies {
-  data: DataStart;
+  data: DataPublicPluginStart;
 }
 
 export class NavigationPlugin implements Plugin<NavigationSetup, NavigationStart> {

src/legacy/core_plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx

@@ -18,11 +18,11 @@
  */
 
 import React from 'react';
+import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
-import { DataStart } from '../../../../core_plugins/data/public';
 
-export function createTopNav(data: DataStart, extraConfig: TopNavMenuData[]) {
+export function createTopNav(data: DataPublicPluginStart, extraConfig: TopNavMenuData[]) {
   return (props: TopNavMenuProps) => {
     const config = (props.config || []).concat(extraConfig);
 

src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx

@@ -22,8 +22,6 @@ import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-jest.mock('ui/new_platform');
-
 const mockTimeHistory = {
   add: () => {},
   get: () => {

src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.tsx

@@ -24,13 +24,13 @@ import { I18nProvider } from '@kbn/i18n/react';
 
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
-import { SearchBarProps, DataStart } from '../../../../core_plugins/data/public';
+import { SearchBarProps, DataPublicPluginStart } from '../../../../../plugins/data/public';
 
 export type TopNavMenuProps = Partial<SearchBarProps> & {
   appName: string;
   config?: TopNavMenuData[];
   showSearchBar?: boolean;
-  data?: DataStart;
+  data?: DataPublicPluginStart;
 };
 
 /*

src/legacy/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js

@@ -18,11 +18,11 @@
  */
 
 import _ from 'lodash';
-import { SavedObjectsClientProvider } from 'ui/saved_objects';
+import { npStart } from 'ui/new_platform';
 
-export function ArgValueSuggestionsProvider(Private, indexPatterns) {
-
-  const savedObjectsClient = Private(SavedObjectsClientProvider);
+export function ArgValueSuggestionsProvider() {
+  const { indexPatterns } = npStart.plugins.data;
+  const { client: savedObjectsClient } = npStart.core.savedObjects;
 
   async function getIndexPattern(functionArgs) {
     const indexPatternArg = functionArgs.find(argument => {

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -153,8 +153,10 @@ export const npStart = {
         getProvider: sinon.fake(),
       },
       getSuggestions: sinon.fake(),
+      indexPatterns: sinon.fake(),
       ui: {
         IndexPatternSelect: mockComponent,
+        SearchBar: mockComponent,
       },
       query: {
         filterManager: {

src/legacy/ui/public/saved_objects/__tests__/saved_object.js

@@ -24,7 +24,7 @@ import Bluebird from 'bluebird';
 
 import { createSavedObjectClass } from '../saved_object';
 import StubIndexPattern from 'test_utils/stub_index_pattern';
-import { SavedObjectsClientProvider } from '../saved_objects_client_provider';
+import { npStart } from 'ui/new_platform';
 import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
 import { mockUiSettings } from '../../new_platform/new_platform.karma_mock';
 
@@ -82,6 +82,10 @@ describe('Saved Object', function () {
     return savedObject.init();
   }
 
+  function restoreIfWrapped(obj, fName) {
+    obj[fName].restore && obj[fName].restore();
+  }
+
   const mock409FetchError = {
     res: { status: 409 }
   };
@@ -96,13 +100,21 @@ describe('Saved Object', function () {
     })
   );
 
-  beforeEach(ngMock.inject(function (es, Private, $window) {
-    savedObjectsClientStub = Private(SavedObjectsClientProvider);
+  beforeEach(ngMock.inject(function (es, $window) {
+    savedObjectsClientStub = npStart.core.savedObjects.client;
     SavedObject = createSavedObjectClass({ savedObjectsClient: savedObjectsClientStub });
     esDataStub = es;
     window = $window;
   }));
 
+  afterEach(ngMock.inject(function () {
+    restoreIfWrapped(savedObjectsClientStub, 'create');
+    restoreIfWrapped(savedObjectsClientStub, 'get');
+    restoreIfWrapped(savedObjectsClientStub, 'update');
+    restoreIfWrapped(savedObjectsClientStub, 'find');
+    restoreIfWrapped(savedObjectsClientStub, 'bulkGet');
+  }));
+
   describe('save', function () {
     describe('with confirmOverwrite', function () {
       function stubConfirmOverwrite() {

src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts

@@ -33,8 +33,6 @@ import { setNotifications, setFieldFormats } from '../../services';
 import { notificationServiceMock } from '../../../../../core/public/notifications/notifications_service.mock';
 import { FieldFormatRegisty } from '../../field_formats_provider';
 
-jest.mock('ui/new_platform');
-
 jest.mock('../../../../kibana_utils/public', () => {
   const originalModule = jest.requireActual('../../../../kibana_utils/public');
 
@@ -50,19 +48,6 @@ jest.mock('../../../../kibana_utils/public', () => {
   };
 });
 
-jest.mock('ui/notify', () => ({
-  toastNotifications: {
-    addDanger: jest.fn(),
-    addError: jest.fn(),
-  },
-}));
-
-jest.mock('ui/saved_objects', () => {
-  return {
-    findObjectByTitle: jest.fn(),
-  };
-});
-
 let mockFieldsFetcherResponse: any[] = [];
 
 jest.mock('./_fields_fetcher', () => ({

src/plugins/data/public/mocks.ts

@@ -74,6 +74,7 @@ const createStartContract = (): Start => {
     query: queryStartMock,
     ui: {
       IndexPatternSelect: jest.fn(),
+      SearchBar: jest.fn(),
     },
     indexPatterns: {} as IndexPatternsContract,
   };