Finish cleanup and feedback.

elastic · Jul 26, 2019 · d7d39e3 · d7d39e3
1 parent 3004ab0
commit d7d39e3
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 114 deletions.
diff --git a/src/legacy/core_plugins/data/public/index_patterns/static.ts b/src/legacy/core_plugins/data/public/index_patterns/static.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/helpers.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { IndexPattern } from 'ui/index_patterns';
 // @ts-ignore
 import { shortenDottedString } from '../../../../../common/utils/shorten_dotted_string';

diff --git a/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.test.tsx
@@ -20,6 +20,7 @@
 import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { SearchBar } from './search_bar';
+import { IndexPattern } from 'ui/index_patterns';
 
 jest.mock('../../../../data/public', () => {
   return {

diff --git a/src/legacy/ui/public/index_patterns/_field.ts b/src/legacy/ui/public/index_patterns/_field.ts
@@ -44,6 +44,8 @@ export interface FieldType {
   aggregatable?: boolean;
   filterable?: boolean;
   searchable?: boolean;
+  sortable?: boolean;
+  visualizable?: boolean;
   readFromDocValues?: boolean;
   scripted?: boolean;
   parent?: string;
@@ -64,6 +66,8 @@ export class Field implements FieldType {
   aggregatable?: boolean;
   filterable?: boolean;
   searchable?: boolean;
+  sortable?: boolean;
+  visualizable?: boolean;
   scripted?: boolean;
   parent?: string;
   subType?: string;

diff --git a/src/legacy/ui/public/index_patterns/_field_list.ts b/src/legacy/ui/public/index_patterns/_field_list.ts
@@ -22,7 +22,7 @@ import { IndexPattern } from 'ui/index_patterns/_index_pattern';
 import { Field, FieldSpec } from './_field';
 
 export class FieldList extends IndexedArray<Field> {
-  constructor(indexPattern: IndexPattern, specs: FieldSpec[], shortDotsEnable: boolean = false) {
+  constructor(indexPattern: IndexPattern, specs: FieldSpec[], shortDotsEnable = false) {
     super({
       index: ['name'],
       group: ['type'],

diff --git a/src/legacy/ui/public/index_patterns/_get.js b/src/legacy/ui/public/index_patterns/_get.js
diff --git a/src/legacy/ui/public/index_patterns/_index_pattern.ts b/src/legacy/ui/public/index_patterns/_index_pattern.ts
@@ -59,16 +59,6 @@ export interface StaticIndexPattern {
   timeFieldName?: string;
 }
 
-export const createIndexPatternMock = (params: Record<string, any>): StaticIndexPattern => {
-  return {
-    ...params,
-    id: params.id || 'testIndexPattern',
-    title: params.title || 'testIndexPattern',
-    type: params.type,
-    fields: params.fields || [],
-  };
-};
-
 export class IndexPattern implements StaticIndexPattern {
   [key: string]: any;
 
@@ -354,7 +344,7 @@ export class IndexPattern implements StaticIndexPattern {
     return this.fields.byName[this.timeFieldName];
   }
 
-  getFieldByName(name: string) {
+  getFieldByName(name: string): Field | void {
     if (!this.fields || !this.fields.byName) return;
     return this.fields.byName[name];
   }

diff --git a/src/legacy/ui/public/index_patterns/_pattern_cache.ts b/src/legacy/ui/public/index_patterns/_pattern_cache.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 
+import { IndexPattern } from './index';
+
 export interface PatternCache {
-  get: (id: string) => any;
-  set: (id: string, value: any) => any;
+  get: (id: string) => IndexPattern;
+  set: (id: string, value: Promise<IndexPattern>) => Promise<IndexPattern>;
   clear: (id: string) => void;
   clearAll: () => void;
 }

diff --git a/src/legacy/ui/public/index_patterns/index_patterns.ts b/src/legacy/ui/public/index_patterns/index_patterns.ts
@@ -41,7 +41,7 @@ export class IndexPatterns {
     this.savedObjectsClient = savedObjectsClient;
   }
 
-  private async loadSavedObjects() {
+  private async refreshSavedObjectsCache() {
     this.savedObjectsCache = (await this.savedObjectsClient.find({
       type: 'index-pattern',
       fields: [],
@@ -51,7 +51,7 @@ export class IndexPatterns {
 
   getIds = async (refresh: boolean) => {
     if (!this.savedObjectsCache || refresh) {
-      await this.loadSavedObjects();
+      await this.refreshSavedObjectsCache();
     }
     if (this.savedObjectsCache) {
       return this.savedObjectsCache.map(obj => _.get(obj, 'id'));
@@ -60,7 +60,7 @@ export class IndexPatterns {
 
   getTitles = async (refresh: boolean) => {
     if (!this.savedObjectsCache || refresh) {
-      await this.loadSavedObjects();
+      await this.refreshSavedObjectsCache();
     }
     if (this.savedObjectsCache) {
       return this.savedObjectsCache.map(obj => _.get(obj, 'attributes.title'));
@@ -69,7 +69,7 @@ export class IndexPatterns {
 
   getFields = async (fields: string[], refresh: boolean) => {
     if (!this.savedObjectsCache || refresh) {
-      await this.loadSavedObjects();
+      await this.refreshSavedObjectsCache();
     }
     if (this.savedObjectsCache) {
       return this.savedObjectsCache.map(obj => {
@@ -105,7 +105,7 @@ export class IndexPatterns {
     return cache || indexPatternCache.set(id, this.make(id));
   };
 
-  make = (id?: string) => {
+  make = (id?: string): Promise<IndexPattern> => {
     return new IndexPattern(
       id,
       (cfg: any) => this.config.get(cfg),