Migrate saved object to typescript and deangularisation

src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts

@@ -41,5 +41,5 @@ export function getSavedDashboardMock(
     getQuery: () => ({ query: '', language: 'kuery' }),
     getFilters: () => [],
     ...config,
-  };
+  } as SavedObjectDashboard;
 }

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

@@ -35,7 +35,7 @@ import {
   State,
   AppStateClass as TAppStateClass,
   KbnUrl,
-  SaveOptions,
+  SavedObjectSaveOpts,
   unhashUrl,
 } from './legacy_imports';
 import { FilterStateManager, IndexPattern } from '../../../data/public';
@@ -603,7 +603,7 @@ export class DashboardAppController {
      * @return {Promise}
      * @resolved {String} - The id of the doc
      */
-    function save(saveOptions: SaveOptions): Promise<SaveResult> {
+    function save(saveOptions: SavedObjectSaveOpts): Promise<SaveResult> {
       return saveDashboard(angular.toJson, timefilter, dashboardStateManager, saveOptions)
         .then(function(id) {
           if (id) {

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

@@ -30,7 +30,7 @@ export const legacyChrome = chrome;
 export { State } from 'ui/state_management/state';
 export { AppState } from 'ui/state_management/app_state';
 export { AppStateClass } from 'ui/state_management/app_state';
-export { SaveOptions } from 'ui/saved_objects/saved_object';
+export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
 export { SavedObjectRegistryProvider } from 'ui/saved_objects';
 export { IPrivate } from 'ui/private';

src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts

@@ -18,7 +18,7 @@
  */
 
 import { TimefilterContract } from 'src/plugins/data/public';
-import { SaveOptions } from '../legacy_imports';
+import { SavedObjectSaveOpts } from '../legacy_imports';
 import { updateSavedDashboard } from './update_saved_dashboard';
 import { DashboardStateManager } from '../dashboard_state_manager';
 
@@ -34,7 +34,7 @@ export function saveDashboard(
   toJson: (obj: any) => string,
   timeFilter: TimefilterContract,
   dashboardStateManager: DashboardStateManager,
-  saveOptions: SaveOptions
+  saveOptions: SavedObjectSaveOpts
 ): Promise<string> {
   dashboardStateManager.saveState();
 

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { SavedObject } from 'ui/saved_objects/saved_object';
+import { SavedObject } from 'ui/saved_objects/types';
 import { SearchSourceContract } from '../../../../../ui/public/courier';
 import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public';
 

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js

@@ -22,6 +22,7 @@ import './saved_dashboard';
 import { uiModules } from 'ui/modules';
 import { SavedObjectLoader, SavedObjectsClientProvider } from 'ui/saved_objects';
 import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+import { npStart } from '../../../../../ui/public/new_platform';
 
 const module = uiModules.get('app/dashboard');
 
@@ -35,7 +36,7 @@ savedObjectManagementRegistry.register({
 });
 
 // This is the only thing that gets injected into controllers
-module.service('savedDashboards', function (Private, SavedDashboard, kbnUrl, chrome) {
+module.service('savedDashboards', function (Private, SavedDashboard) {
   const savedObjectClient = Private(SavedObjectsClientProvider);
-  return new SavedObjectLoader(SavedDashboard, kbnUrl, chrome, savedObjectClient);
+  return new SavedObjectLoader(SavedDashboard, savedObjectClient, npStart.core.chrome);
 });

src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js

@@ -32,7 +32,7 @@ describe('discoverField', function () {
   let $scope;
   let indexPattern;
   let $elem;
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(() => pluginInstance.initializeInnerAngular());
   beforeEach(ngMock.module('app/discover'));
   beforeEach(ngMock.inject(function (Private, $rootScope, $compile) {

src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js

@@ -70,7 +70,7 @@ describe('discover field chooser directives', function () {
       on-remove-field="removeField"
     ></disc-field-chooser>
   `);
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(() => pluginInstance.initializeInnerAngular());
 
   beforeEach(ngMock.module('app/discover', ($provide) => {

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js

@@ -27,7 +27,7 @@ import { npStart } from 'ui/new_platform';
 
 describe('context app', function () {
   beforeEach(() => pluginInstance.initializeInnerAngular());
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));
   beforeEach(ngMock.module(function createServiceStubs($provide) {
     $provide.value('indexPatterns', createIndexPatternsStub());

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js

@@ -26,7 +26,7 @@ import { getQueryParameterActions } from '../actions';
 
 describe('context app', function () {
   beforeEach(() => pluginInstance.initializeInnerAngular());
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));
 
   describe('action setPredecessorCount', function () {

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js

@@ -27,7 +27,7 @@ import { getQueryParameterActions } from '../actions';
 
 describe('context app', function () {
   beforeEach(() => pluginInstance.initializeInnerAngular());
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));
 
   describe('action setQueryParameters', function () {

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js

@@ -27,7 +27,7 @@ import { getQueryParameterActions } from '../actions';
 
 describe('context app', function () {
   beforeEach(() => pluginInstance.initializeInnerAngular());
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));
 
   describe('action setSuccessorCount', function () {

src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js

@@ -37,7 +37,7 @@ describe('Doc Table', function () {
 
   let fakeRowVals;
   let stubFieldFormatConverter;
-  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeServices());
   beforeEach(() => pluginInstance.initializeInnerAngular());
   beforeEach(ngMock.module('app/discover'));
   beforeEach(

src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts

@@ -25,14 +25,12 @@ import {
   IUiSettingsClient,
 } from 'kibana/public';
 import * as docViewsRegistry from 'ui/registry/doc_views';
-import chromeLegacy from 'ui/chrome';
-import { IPrivate } from 'ui/private';
 import { FilterManager, TimefilterContract, IndexPatternsContract } from 'src/plugins/data/public';
 // @ts-ignore
 import { createSavedSearchesService } from '../saved_searches/saved_searches';
 // @ts-ignore
-import { createSavedSearchFactory } from '../saved_searches/_saved_search';
 import { DiscoverStartPlugins } from '../plugin';
+import { DataStart } from '../../../../data/public';
 import { EuiUtilsStart } from '../../../../../../plugins/eui_utils/public';
 import { SavedSearch } from '../types';
 import { SharePluginStart } from '../../../../../../plugins/share/public';
@@ -42,6 +40,7 @@ export interface DiscoverServices {
   capabilities: Capabilities;
   chrome: ChromeStart;
   core: CoreStart;
+  data: DataStart;
   docLinks: DocLinksStart;
   docViewsRegistry: docViewsRegistry.DocViewsRegistry;
   eui_utils: EuiUtilsStart;
@@ -52,35 +51,19 @@ export interface DiscoverServices {
   share: SharePluginStart;
   timefilter: TimefilterContract;
   toastNotifications: ToastsStart;
-  // legacy
   getSavedSearchById: (id: string) => Promise<SavedSearch>;
   getSavedSearchUrlById: (id: string) => Promise<string>;
   uiSettings: IUiSettingsClient;
 }
-
-export async function buildGlobalAngularServices() {
-  const injector = await chromeLegacy.dangerouslyGetActiveInjector();
-  const Private = injector.get<IPrivate>('Private');
-  const kbnUrl = injector.get<IPrivate>('kbnUrl');
-  const SavedSearchFactory = createSavedSearchFactory(Private);
-  const service = createSavedSearchesService(Private, SavedSearchFactory, kbnUrl, chromeLegacy);
-  return {
-    getSavedSearchById: async (id: string) => service.get(id),
-    getSavedSearchUrlById: async (id: string) => service.urlFor(id),
+export async function buildServices(core: CoreStart, plugins: DiscoverStartPlugins) {
+  const services = {
+    savedObjectsClient: core.savedObjects.client,
+    indexPatterns: plugins.data.indexPatterns,
+    chrome: core.chrome,
+    overlays: core.overlays,
   };
-}
-
-export async function buildServices(core: CoreStart, plugins: DiscoverStartPlugins, test: false) {
-  const globalAngularServices = !test
-    ? await buildGlobalAngularServices()
-    : {
-        getSavedSearchById: async (id: string) => void id,
-        getSavedSearchUrlById: async (id: string) => void id,
-        State: null,
-      };
-
+  const savedObjectService = createSavedSearchesService(services);
   return {
-    ...globalAngularServices,
     addBasePath: core.http.basePath.prepend,
     capabilities: core.application.capabilities,
     chrome: core.chrome,
@@ -90,6 +73,8 @@ export async function buildServices(core: CoreStart, plugins: DiscoverStartPlugi
     docViewsRegistry,
     eui_utils: plugins.eui_utils,
     filterManager: plugins.data.query.filterManager,
+    getSavedSearchById: async (id: string) => savedObjectService.get(id),
+    getSavedSearchUrlById: async (id: string) => savedObjectService.urlFor(id),
     indexPatterns: plugins.data.indexPatterns,
     inspector: plugins.inspector,
     // @ts-ignore

src/legacy/core_plugins/kibana/public/discover/plugin.ts

@@ -106,11 +106,11 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       this.innerAngularInitialized = true;
     };
 
-    this.initializeServices = async (test = false) => {
+    this.initializeServices = async () => {
       if (this.servicesInitialized) {
         return;
       }
-      const services = await buildServices(core, plugins, test);
+      const services = await buildServices(core, plugins);
       setServices(services);
       this.servicesInitialized = true;
     };

src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts

@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+
+export function createSavedSearchClass(services: SavedObjectKibanaServices) {
+  const SavedObjectClass = createSavedObjectClass(services);
+
+  class SavedSearch extends SavedObjectClass {
+    public static type: string = 'search';
+    public static mapping = {
+      title: 'text',
+      description: 'text',
+      hits: 'integer',
+      columns: 'keyword',
+      sort: 'keyword',
+      version: 'integer',
+    };
+    // Order these fields to the top, the rest are alphabetical
+    public static fieldOrder = ['title', 'description'];
+    public static searchSource = true;
+
+    public id: string;
+    public showInRecentlyAccessed: boolean;
+
+    constructor(id: string) {
+      super({
+        id,
+        type: 'search',
+        mapping: {
+          title: 'text',
+          description: 'text',
+          hits: 'integer',
+          columns: 'keyword',
+          sort: 'keyword',
+          version: 'integer',
+        },
+        searchSource: true,
+        defaults: {
+          title: '',
+          description: '',
+          columns: [],
+          hits: 0,
+          sort: [],
+          version: 1,
+        },
+      });
+      this.showInRecentlyAccessed = true;
+      this.id = id;
+      this.getFullPath = () => `/app/kibana#/discover/${String(id)}`;
+    }
+  }
+
+  return SavedSearch;
+}