Add even more typescript

Author: kertal

src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts

@@ -24,27 +24,12 @@ import { hydrateIndexPattern } from 'ui/saved_objects/helpers/hydrate_index_patt
 import { intializeSavedObject } from 'ui/saved_objects/helpers/initialize_saved_object';
 import { serializeSavedObject } from 'ui/saved_objects/helpers/serialize_saved_object';
 import { SavedObjectsClient } from 'kibana/public';
-import { SavedObject } from 'ui/saved_objects/types';
+import { SavedObject, SavedObjectConfig } from 'ui/saved_objects/types';
 import { applyEsResp } from 'ui/saved_objects/helpers/apply_es_resp';
 import { saveSavedObject } from 'ui/saved_objects/helpers/save_saved_object';
 import { expandShorthand } from '../../../../../plugins/kibana_utils/public';
 import { IndexPatterns } from '../../../../core_plugins/data/public';
 
-interface SavedObjectConfig {
-  id?: string;
-  type?: string;
-  defaults?: any;
-  mapping?: any;
-  afterESResp?: any;
-  extractReferences?: any;
-  injectReferences?: any;
-  searchSource?: any;
-  init?: any;
-  migrationVersion?: any;
-  clearSavedIndexPattern?: any;
-  indexPattern?: any;
-}
-
 export function buildSavedObject(
   savedObject: SavedObject,
   config: SavedObjectConfig = {},
@@ -101,9 +86,9 @@ export function buildSavedObject(
     return hydrateIndexPattern(
       id || '',
       savedObject,
-      config.clearSavedIndexPattern,
-      config.indexPattern,
-      indexPatterns
+      indexPatterns,
+      !!config.clearSavedIndexPattern,
+      config.indexPattern
     );
   };
 

src/legacy/ui/public/saved_objects/helpers/hydrate_index_pattern.ts

@@ -29,9 +29,9 @@ import { IndexPatterns } from '../../../../core_plugins/data/public/index_patter
 export function hydrateIndexPattern(
   id: string,
   savedObject: SavedObject,
+  indexPatterns: IndexPatterns,
   clearSavedIndexPattern: boolean,
-  indexPattern: IIndexPattern,
-  indexPatterns: IndexPatterns
+  indexPattern?: IIndexPattern
 ) {
   if (!savedObject.searchSource) {
     return Promise.resolve(null);

src/legacy/ui/public/saved_objects/saved_object.ts

@@ -27,7 +27,7 @@
  * This class seems to interface with ES primarily through the es Angular
  * service and the saved object api.
  */
-import _ from 'lodash';
+import { SavedObjectConfig } from 'ui/saved_objects/types';
 import { PromiseService } from 'ui/promises';
 import { buildSavedObject } from 'ui/saved_objects/helpers/build_saved_object';
 import { SavedObjectsClientProvider } from './saved_objects_client_provider';
@@ -62,9 +62,7 @@ export function SavedObjectProvider(
    * which returns instances of SimpleSavedObject which don't introduce additional type-specific complexity.
    * @param {*} config
    */
-  function SavedObject(config: any) {
-    if (!_.isObject(config)) config = {};
-
+  function SavedObject(config: SavedObjectConfig = {}) {
     return buildSavedObject(
       // @ts-ignore
       this,

src/legacy/ui/public/saved_objects/saved_object_loader.js renamed to src/legacy/ui/public/saved_objects/saved_object_loader.ts

@@ -16,7 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { SavedObject } from 'ui/saved_objects/types';
+import { KbnUrl } from 'ui/url/kbn_url';
+import { Chrome } from 'ui/chrome';
+import { SavedObjectsClient } from 'kibana/public';
 import { StringUtils } from '../utils/string_utils';
 
 /**
@@ -28,17 +31,30 @@ import { StringUtils } from '../utils/string_utils';
  * to avoid pulling in extra functionality which isn't used.
  */
 export class SavedObjectLoader {
-  constructor(SavedObjectClass, kbnUrl, chrome, savedObjectClient) {
+  type: string;
+  Class: (id: string) => SavedObject;
+  lowercaseType: string;
+  kbnUrl: any;
+  chrome: any;
+  loaderProperties: Record<string, string>;
+  savedObjectsClient: SavedObjectsClient;
+
+  constructor(
+    SavedObjectClass: any,
+    kbnUrl: KbnUrl,
+    chrome: Chrome,
+    savedObjectClient: SavedObjectsClient
+  ) {
     this.type = SavedObjectClass.type;
     this.Class = SavedObjectClass;
     this.lowercaseType = this.type.toLowerCase();
     this.kbnUrl = kbnUrl;
     this.chrome = chrome;
 
     this.loaderProperties = {
-      name: `${ this.lowercaseType }s`,
+      name: `${this.lowercaseType}s`,
       noun: StringUtils.upperFirst(this.type),
-      nouns: `${ this.lowercaseType }s`,
+      nouns: `${this.lowercaseType}s`,
     };
 
     this.savedObjectsClient = savedObjectClient;
@@ -50,18 +66,20 @@ export class SavedObjectLoader {
    * @param id
    * @returns {Promise<SavedObject>}
    */
-  get(id) {
-    return (new this.Class(id)).init();
+  get(id: string) {
+    // @ts-ignore
+    return new this.Class(id).init();
   }
 
-  urlFor(id) {
-    return this.kbnUrl.eval(`#/${ this.lowercaseType }/{{id}}`, { id: id });
+  urlFor(id: string) {
+    return this.kbnUrl.eval(`#/${this.lowercaseType}/{{id}}`, { id });
   }
 
-  delete(ids) {
+  delete(ids: string | string[]) {
     ids = !Array.isArray(ids) ? [ids] : ids;
 
     const deletions = ids.map(id => {
+      // @ts-ignore
       const savedObject = new this.Class(id);
       return savedObject.delete();
     });
@@ -80,7 +98,7 @@ export class SavedObjectLoader {
    * @param id
    * @returns {source} The modified source object, with an id and url field.
    */
-  mapHitSource(source, id) {
+  mapHitSource(source: any, id: string) {
     source.id = id;
     source.url = this.urlFor(id);
     return source;
@@ -92,7 +110,7 @@ export class SavedObjectLoader {
    * @param hit
    * @returns {hit.attributes} The modified hit.attributes object, with an id and url field.
    */
-  mapSavedObjectApiHits(hit) {
+  mapSavedObjectApiHits(hit: any) {
     return this.mapHitSource(hit.attributes, hit.id);
   }
 
@@ -102,32 +120,33 @@ export class SavedObjectLoader {
    *
    * @param searchString
    * @param size
+   * @param fields
    * @returns {Promise}
    */
-  findAll(search = '', size = 100, fields) {
-    return this.savedObjectsClient.find(
-      {
+  findAll(search: string = '', size = 100, fields?: string[]) {
+    return this.savedObjectsClient
+      .find({
         type: this.lowercaseType,
         search: search ? `${search}*` : undefined,
         perPage: size,
         page: 1,
         searchFields: ['title^3', 'description'],
         defaultSearchOperator: 'AND',
         fields,
-      }).then((resp) => {
-      return {
-        total: resp.total,
-        hits: resp.savedObjects
-          .map((savedObject) => this.mapSavedObjectApiHits(savedObject))
-      };
-    });
+      })
+      .then(resp => {
+        return {
+          total: resp.total,
+          hits: resp.savedObjects.map(savedObject => this.mapSavedObjectApiHits(savedObject)),
+        };
+      });
   }
 
   find(search = '', size = 100) {
     return this.findAll(search, size).then(resp => {
       return {
         total: resp.total,
-        hits: resp.hits.filter(savedObject => !savedObject.error)
+        hits: resp.hits.filter(savedObject => !savedObject.error),
       };
     });
   }

src/legacy/ui/public/saved_objects/types.ts

@@ -19,6 +19,7 @@
 
 import { SearchSource } from 'ui/courier';
 import { SavedObjectAttributes, SavedObjectReference } from 'kibana/server';
+import { IndexPattern } from '../../../core_plugins/data/public';
 
 export interface SaveOptions {
   confirmOverwrite: boolean;
@@ -51,9 +52,24 @@ export interface SavedObject {
   isSaving: boolean;
   isTitleChanged: any;
   lastSavedTitle: string;
-  migrationVersion: string;
+  migrationVersion?: Record<string, any>;
   save: (saveOptions: SaveOptions) => Promise<string>;
   searchSource?: SearchSource;
   showInRecentlyAccessed: boolean;
   title: string;
 }
+
+export interface SavedObjectConfig {
+  afterESResp?: () => any;
+  clearSavedIndexPattern?: boolean;
+  defaults?: any;
+  extractReferences?: any;
+  id?: string;
+  indexPattern?: IndexPattern;
+  init?: () => any;
+  injectReferences?: any;
+  mapping?: any;
+  migrationVersion?: Record<string, any>;
+  searchSource?: any;
+  type?: string;
+}