From e679933c570d462838a7fb4e887628536786d527 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 29 Aug 2020 22:22:32 -0500
Subject: [PATCH 01/57] index pattern creator take spec

---
 ...-data-public.indexpattern._constructor_.md |  5 ++--
 ...plugin-plugins-data-public.indexpattern.md |  2 +-
 .../index_patterns/index_pattern.test.ts      |  9 ++++--
 .../index_patterns/index_pattern.ts           | 30 +++++++++----------
 .../index_patterns/index_patterns.ts          |  6 ++--
 .../data/common/index_patterns/types.ts       |  3 +-
 src/plugins/data/public/public.api.md         |  2 +-
 7 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
index 2e078e3404fe60..d3b95acea26b76 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,13 +9,12 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor(id: string | undefined, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+constructor({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  id | <code>string &#124; undefined</code> |  |
-|  { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
+|  { spec, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index c15cb3358f689e..14d91fd9c758ad 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(id, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index f7e1156170f032..99a49d9f793e80 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -110,7 +110,8 @@ const apiClient = {
 
 // helper function to create index patterns
 function create(id: string, payload?: any): Promise<IndexPattern> {
-  const indexPattern = new IndexPattern(id, {
+  const indexPattern = new IndexPattern({
+    spec: { id },
     savedObjectsClient: savedObjectsClient as any,
     apiClient,
     patternCache,
@@ -399,7 +400,8 @@ describe('IndexPattern', () => {
       },
     });
     // Create a normal index pattern
-    const pattern = new IndexPattern('foo', {
+    const pattern = new IndexPattern({
+      spec: { id: 'foo' },
       savedObjectsClient: savedObjectsClient as any,
       apiClient,
       patternCache,
@@ -414,7 +416,8 @@ describe('IndexPattern', () => {
     expect(get(pattern, 'version')).toBe('fooa');
 
     // Create the same one - we're going to handle concurrency
-    const samePattern = new IndexPattern('foo', {
+    const samePattern = new IndexPattern({
+      spec: { id: 'foo' },
       savedObjectsClient: savedObjectsClient as any,
       apiClient,
       patternCache,
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 5d6ae61a77e00d..303928a76b3c81 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -45,6 +45,7 @@ const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
 const savedObjectType = 'index-pattern';
 
 interface IndexPatternDeps {
+  spec?: IndexPatternSpec;
   savedObjectsClient: SavedObjectsClientCommon;
   apiClient: IIndexPatternsApiClient;
   patternCache: PatternCache;
@@ -103,20 +104,18 @@ export class IndexPattern implements IIndexPattern {
     typeMeta: 'json',
   });
 
-  constructor(
-    id: string | undefined,
-    {
-      savedObjectsClient,
-      apiClient,
-      patternCache,
-      fieldFormats,
-      onNotification,
-      onError,
-      shortDotsEnable = false,
-      metaFields = [],
-    }: IndexPatternDeps
-  ) {
-    this.id = id;
+  constructor({
+    spec = {},
+    savedObjectsClient,
+    apiClient,
+    patternCache,
+    fieldFormats,
+    onNotification,
+    onError,
+    shortDotsEnable = false,
+    metaFields = [],
+  }: IndexPatternDeps) {
+    this.id = spec.id;
     this.savedObjectsClient = savedObjectsClient;
     this.patternCache = patternCache;
     this.fieldFormats = fieldFormats;
@@ -505,7 +504,8 @@ export class IndexPattern implements IIndexPattern {
           _.get(err, 'res.status') === 409 &&
           saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS
         ) {
-          const samePattern = new IndexPattern(this.id, {
+          const samePattern = new IndexPattern({
+            spec: { id: this.id },
             savedObjectsClient: this.savedObjectsClient,
             apiClient: this.apiClient,
             patternCache: this.patternCache,
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 0ad9ae8f2014f8..318f1edf625d3b 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -186,7 +186,8 @@ export class IndexPatternsService {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
-    const indexPattern = new IndexPattern(spec.id, {
+    const indexPattern = new IndexPattern({
+      spec: { id: spec.id },
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       patternCache: indexPatternCache,
@@ -205,7 +206,8 @@ export class IndexPatternsService {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
-    const indexPattern = new IndexPattern(id, {
+    const indexPattern = new IndexPattern({
+      spec: { id },
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       patternCache: indexPatternCache,
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 7a230c20f6cd02..3478757190aa7e 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -169,8 +169,7 @@ export interface FieldSpec {
 export interface IndexPatternSpec {
   id?: string;
   version?: string;
-
-  title: string;
+  title?: string;
   timeFieldName?: string;
   sourceFilters?: SourceFilter[];
   fields?: FieldSpec[];
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index de4ec58dfdab34..f9d7d88ac34868 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -950,7 +950,7 @@ export type IMetricAggType = MetricAggType;
 // @public (undocumented)
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
-    constructor(id: string | undefined, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+    constructor({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
     addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
     // (undocumented)

From cc5884a48e37a9b7838387fee6e1c6b6b4e78d08 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 30 Aug 2020 00:01:33 -0500
Subject: [PATCH 02/57] partial progress

---
 .../index_patterns/index_pattern.ts           | 58 +++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 303928a76b3c81..6973ca9bf0d15e 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -115,19 +115,20 @@ export class IndexPattern implements IIndexPattern {
     shortDotsEnable = false,
     metaFields = [],
   }: IndexPatternDeps) {
-    this.id = spec.id;
+    // set dependencies
     this.savedObjectsClient = savedObjectsClient;
     this.patternCache = patternCache;
     this.fieldFormats = fieldFormats;
+    this.apiClient = apiClient;
+    // set callbacks
     this.onNotification = onNotification;
     this.onError = onError;
-
+    // set config
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
 
+    // initialize functionality
     this.fields = new FieldList(this, [], this.shortDotsEnable, this.onNotification);
-
-    this.apiClient = apiClient;
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
     this.flattenHit = flattenHitWrapper(this, metaFields);
     this.formatHit = formatHitProvider(
@@ -135,6 +136,23 @@ export class IndexPattern implements IIndexPattern {
       fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.STRING)
     );
     this.formatField = this.formatHit.formatField;
+
+    // set values
+    this.id = spec.id;
+    const fieldFormatMap = this.fieldSpecsToFieldFormatMap(spec.fields);
+
+    this.version = spec.version;
+
+    this.title = spec.title || '';
+    this.timeFieldName = spec.timeFieldName;
+    this.sourceFilters = spec.sourceFilters;
+
+    this.fields.replaceAll(spec.fields || []);
+    this.typeMeta = spec.typeMeta;
+
+    this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
+      return this.deserializeFieldFormatMap(mapping);
+    });
   }
 
   private serializeFieldFormatMap(flat: any, format: string, field: string | undefined) {
@@ -185,8 +203,35 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
+  private fieldSpecsToFieldFormatMap = (fieldList: IndexPatternSpec['fields'] = []) =>
+    fieldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
+      if (fieldSpec.format) {
+        col[fieldSpec.name] = { ...fieldSpec.format };
+      }
+      return col;
+    }, {});
+
+  /*
+    const fieldFormatMap: Record<string, SerializedFieldFormat> = {};
+    fieldList.forEach((field: FieldSpec) => {
+      if (field.format) {
+        fieldFormatMap[field.name as string] = { ...field.format };
+      }
+    });
+
+    fieldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
+      if (fieldSpec.format) {
+        col[fieldSpec.name] = { ...fieldSpec.format };
+      }
+      return col;
+    }, {});
+  }
+  */
+
+  // this is swallowed by constructor
   public initFromSpec(spec: IndexPatternSpec) {
     // create fieldFormatMap from field list
+    /*
     const fieldFormatMap: Record<string, SerializedFieldFormat> = {};
     if (_.isArray(spec.fields)) {
       spec.fields.forEach((field: FieldSpec) => {
@@ -195,6 +240,8 @@ export class IndexPattern implements IIndexPattern {
         }
       });
     }
+    */
+    const fieldFormatMap = this.fieldSpecsToFieldFormatMap(spec.fields);
 
     this.version = spec.version;
 
@@ -282,6 +329,9 @@ export class IndexPattern implements IIndexPattern {
     };
   }
 
+  // loads saved object
+  // caches object state
+  // deserializes and sets values
   async init(forceFieldRefresh = false) {
     if (!this.id) {
       return this; // no id === no elasticsearch document

From 76af1159d664dfc019156c36250b0cb2e3bca74f Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 30 Aug 2020 23:36:02 -0500
Subject: [PATCH 03/57] simpler IndexPatterns.get

---
 .../index_patterns/index_pattern.ts           |  3 +-
 .../index_patterns/index_patterns.ts          | 48 +++++++++++++++++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 6973ca9bf0d15e..0b227ae7ef2f77 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -147,7 +147,8 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    this.fields.replaceAll(spec.fields || []);
+    // this.fields.replaceAll(spec.fields || []);
+    this.indexFields(false, spec.fields);
     this.typeMeta = spec.typeMeta;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 318f1edf625d3b..d4ca6d4ef251cc 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -33,9 +33,11 @@ import {
   IIndexPatternsApiClient,
   GetFieldsOptions,
   IndexPatternSpec,
+  IndexPatternAttributes,
 } from '../types';
 import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
+import { SavedObjectNotFound } from '../../../../kibana_utils/common';
 
 const indexPatternCache = createIndexPatternCache();
 
@@ -172,14 +174,54 @@ export class IndexPatternsService {
   };
 
   get = async (id: string): Promise<IndexPattern> => {
+    const savedObjectType = 'index-pattern';
+
     const cache = indexPatternCache.get(id);
     if (cache) {
       return cache;
     }
 
-    const indexPattern = await this.make(id);
+    //
+    // const indexPattern = await this.make(id);
+    // get saved object, convert to spec, create new IndexPattern instance
+    //
+    //  progress - no longer calls `make`, no longer calls `init`
+    const {
+      version,
+      attributes: {
+        title,
+        timeFieldName,
+        intervalName,
+        fields,
+        sourceFilters,
+        fieldFormatMap,
+        typeMeta,
+        type,
+      },
+    } = await this.savedObjectsClient.get<IndexPatternAttributes>(savedObjectType, id);
+
+    if (!version) {
+      throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
+    }
 
-    return indexPatternCache.set(id, indexPattern);
+    const spec = {
+      id,
+      version,
+      title,
+      timeFieldName,
+      intervalName,
+      // fields,
+      fields: fields ? JSON.parse(fields) : undefined,
+      sourceFilters: sourceFilters ? JSON.parse(sourceFilters) : undefined,
+      fieldFormatMap: fieldFormatMap ? JSON.parse(fieldFormatMap) : undefined,
+      typeMeta: typeMeta ? JSON.parse(typeMeta) : undefined,
+      type,
+    };
+
+    // return indexPatternCache.set(id, indexPattern);
+    const indexPattern = await this.specToIndexPattern(spec);
+    indexPatternCache.set(id, indexPattern);
+    return indexPattern;
   };
 
   async specToIndexPattern(spec: IndexPatternSpec) {
@@ -187,7 +229,7 @@ export class IndexPatternsService {
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
     const indexPattern = new IndexPattern({
-      spec: { id: spec.id },
+      spec,
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       patternCache: indexPatternCache,

From dd611ed2757bd15f81137ddb1939143a0e4d7175 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 31 Aug 2020 20:40:51 -0500
Subject: [PATCH 04/57] partial progress

---
 .../index_patterns/index_patterns.ts            | 17 ++++++++++++++---
 src/plugins/data/common/index_patterns/types.ts |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index d4ca6d4ef251cc..4d981c4bafa7ed 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -34,6 +34,7 @@ import {
   GetFieldsOptions,
   IndexPatternSpec,
   IndexPatternAttributes,
+  FieldSpec,
 } from '../types';
 import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
@@ -204,16 +205,26 @@ export class IndexPatternsService {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
-    const spec = {
+    const parsedFields = fields ? JSON.parse(fields) : undefined;
+    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : undefined;
+
+    Object.entries(parsedFieldFormatMap).forEach(([fieldName, value]) => {
+      const field = parsedFields.find((fld: FieldSpec) => fld.name === fieldName);
+      if (field) {
+        field.format = value;
+      }
+    });
+
+    const spec: IndexPatternSpec = {
       id,
       version,
       title,
       timeFieldName,
       intervalName,
       // fields,
-      fields: fields ? JSON.parse(fields) : undefined,
+      fields: parsedFields,
       sourceFilters: sourceFilters ? JSON.parse(sourceFilters) : undefined,
-      fieldFormatMap: fieldFormatMap ? JSON.parse(fieldFormatMap) : undefined,
+      // fieldFormatMap: parsedFieldFormatMap,
       typeMeta: typeMeta ? JSON.parse(typeMeta) : undefined,
       type,
     };
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 3478757190aa7e..41a5560a8e8165 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -170,10 +170,12 @@ export interface IndexPatternSpec {
   id?: string;
   version?: string;
   title?: string;
+  intervalName?: string;
   timeFieldName?: string;
   sourceFilters?: SourceFilter[];
   fields?: FieldSpec[];
   typeMeta?: TypeMeta;
+  type?: string;
 }
 
 export interface SourceFilter {

From 0b6e64d6d699299b4680882a27fc4df99c469372 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 31 Aug 2020 22:07:30 -0500
Subject: [PATCH 05/57] fix field spec

---
 .../common/index_patterns/index_patterns/index_patterns.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 4d981c4bafa7ed..041e0b12649818 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -187,6 +187,7 @@ export class IndexPatternsService {
     // get saved object, convert to spec, create new IndexPattern instance
     //
     //  progress - no longer calls `make`, no longer calls `init`
+    // todo - create index pattern isn't  showing field list
     const {
       version,
       attributes: {
@@ -205,8 +206,8 @@ export class IndexPatternsService {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
-    const parsedFields = fields ? JSON.parse(fields) : undefined;
-    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : undefined;
+    const parsedFields = fields ? JSON.parse(fields) : [];
+    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
 
     Object.entries(parsedFieldFormatMap).forEach(([fieldName, value]) => {
       const field = parsedFields.find((fld: FieldSpec) => fld.name === fieldName);

From 262e1830d046164af48e52a2f588ec29eac6a935 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 31 Aug 2020 23:25:11 -0500
Subject: [PATCH 06/57] fix field spec

---
 .../data/common/index_patterns/index_patterns/index_pattern.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index e06904452ae478..39ad5c104eaf2b 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -148,7 +148,7 @@ export class IndexPattern implements IIndexPattern {
     this.sourceFilters = spec.sourceFilters;
 
     // this.fields.replaceAll(spec.fields || []);
-    this.indexFields(false, spec.fields);
+    this.indexFields(spec.fields);
     this.typeMeta = spec.typeMeta;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {

From be88df3f3e4f719260a637c309832498a31c1a31 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 1 Sep 2020 21:04:35 -0500
Subject: [PATCH 07/57] fix index pattern creation

---
 .../index_patterns/index_patterns.test.ts     | 10 +++++----
 .../index_patterns/index_patterns.ts          | 22 +++++++++++++++++++
 src/plugins/data/public/index.ts              |  1 +
 .../create_index_pattern_wizard.tsx           |  1 +
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index 8223b31042124f..defc0a2571f3cd 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -33,6 +33,7 @@ jest.mock('./index_pattern', () => {
     init = async () => {
       return this;
     };
+    initFromSpec = async () => {};
   }
 
   return {
@@ -45,14 +46,15 @@ describe('IndexPatterns', () => {
   let savedObjectsClient: SavedObjectsClientCommon;
 
   beforeEach(() => {
+    const indexPatternObj = { id: 'id', version: 'a', attributes: { title: 'title' } };
     savedObjectsClient = {} as SavedObjectsClientCommon;
     savedObjectsClient.find = jest.fn(
-      () =>
-        Promise.resolve([{ id: 'id', attributes: { title: 'title' } }]) as Promise<
-          Array<SavedObject<any>>
-        >
+      () => Promise.resolve([indexPatternObj]) as Promise<Array<SavedObject<any>>>
     );
     savedObjectsClient.delete = jest.fn(() => Promise.resolve({}) as Promise<any>);
+    savedObjectsClient.get = jest
+      .fn()
+      .mockImplementation(() => Promise.resolve(indexPatternObj) as Promise<SavedObject<any>>);
 
     indexPatterns = new IndexPatternsService({
       uiSettings: ({
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 041e0b12649818..5f89eadf56fb47 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -256,6 +256,28 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
+  async create(spec: IndexPatternSpec): Promise<IndexPattern> {
+    const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
+    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
+
+    const indexPattern = new IndexPattern({
+      spec,
+      savedObjectsClient: this.savedObjectsClient,
+      apiClient: this.apiClient,
+      patternCache: indexPatternCache,
+      fieldFormats: this.fieldFormats,
+      onNotification: this.onNotification,
+      onError: this.onError,
+      shortDotsEnable,
+      metaFields,
+    });
+
+    await indexPattern._fetchFields();
+    await indexPattern.create();
+
+    return indexPattern;
+  }
+
   async make(id?: string): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 27b16c57ffecf2..7776e925ded54f 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -263,6 +263,7 @@ export {
   TypeMeta as IndexPatternTypeMeta,
   AggregationRestrictions as IndexPatternAggRestrictions,
   FieldList,
+  IndexPatternSpec,
 } from '../common';
 
 /*
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
index a789ebbfadbcee..4d0f3102a0d70d 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
@@ -168,6 +168,7 @@ export class CreateIndexPatternWizard extends Component<
       ...this.state.indexPatternCreationType.getIndexPatternMappings(),
     });
 
+    emptyPattern._fetchFields();
     const createdId = await emptyPattern.create();
     if (!createdId) {
       const confirmMessage = i18n.translate(

From ff971a050036ba0022f248e5108f6d94caea176d Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 6 Sep 2020 20:14:08 -0500
Subject: [PATCH 08/57] fix types and update docs

---
 ...lugins-data-public.baseformatterspublic.md |  2 +-
 ...na-plugin-plugins-data-public.filterbar.md |  2 +-
 ...-data-public.indexpattern.refreshfields.md |  4 +-
 ...ins-data-public.indexpatternspec.fields.md | 11 +++
 ...plugins-data-public.indexpatternspec.id.md | 11 +++
 ...ta-public.indexpatternspec.intervalname.md | 11 +++
 ...in-plugins-data-public.indexpatternspec.md | 26 +++++++
 ...a-public.indexpatternspec.sourcefilters.md | 11 +++
 ...a-public.indexpatternspec.timefieldname.md | 11 +++
 ...gins-data-public.indexpatternspec.title.md | 11 +++
 ...ugins-data-public.indexpatternspec.type.md | 11 +++
 ...s-data-public.indexpatternspec.typemeta.md | 11 +++
 ...ns-data-public.indexpatternspec.version.md | 11 +++
 .../kibana-plugin-plugins-data-public.md      |  1 +
 ...in-plugins-data-public.querystringinput.md |  2 +-
 ...na-plugin-plugins-data-public.searchbar.md |  4 +-
 src/core/server/server.api.md                 | 12 ++--
 src/plugins/data/public/index.ts              |  1 -
 src/plugins/data/public/public.api.md         | 68 ++++++++++++-------
 19 files changed, 184 insertions(+), 37 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.id.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.title.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.type.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.version.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
index 1aa9f460c4fac8..3c558e821ea0a0 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[]
+baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[]
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
index 6d8862323792aa..ef6a04dafb2d43 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
+FilterBar: React.ComponentClass<Pick<Props, "filters" | "onFiltersUpdated" | "className" | "indexPatterns">, any> & {
     WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
index 271d0c45a42441..345449f6639245 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-refreshFields(): Promise<void | Error | never[] | undefined>;
+refreshFields(): Promise<void | never[] | Error | undefined>;
 ```
 <b>Returns:</b>
 
-`Promise<void | Error | never[] | undefined>`
+`Promise<void | never[] | Error | undefined>`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
new file mode 100644
index 00000000000000..5723d31dd5df64
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [fields](./kibana-plugin-plugins-data-public.indexpatternspec.fields.md)
+
+## IndexPatternSpec.fields property
+
+<b>Signature:</b>
+
+```typescript
+fields?: FieldSpec[];
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.id.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.id.md
new file mode 100644
index 00000000000000..55eadbf36c6606
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.id.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [id](./kibana-plugin-plugins-data-public.indexpatternspec.id.md)
+
+## IndexPatternSpec.id property
+
+<b>Signature:</b>
+
+```typescript
+id?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md
new file mode 100644
index 00000000000000..98748661256da0
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [intervalName](./kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md)
+
+## IndexPatternSpec.intervalName property
+
+<b>Signature:</b>
+
+```typescript
+intervalName?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
new file mode 100644
index 00000000000000..1acf2edf36770c
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md)
+
+## IndexPatternSpec interface
+
+<b>Signature:</b>
+
+```typescript
+export interface IndexPatternSpec 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [fields](./kibana-plugin-plugins-data-public.indexpatternspec.fields.md) | <code>FieldSpec[]</code> |  |
+|  [id](./kibana-plugin-plugins-data-public.indexpatternspec.id.md) | <code>string</code> |  |
+|  [intervalName](./kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md) | <code>string</code> |  |
+|  [sourceFilters](./kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md) | <code>SourceFilter[]</code> |  |
+|  [timeFieldName](./kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md) | <code>string</code> |  |
+|  [title](./kibana-plugin-plugins-data-public.indexpatternspec.title.md) | <code>string</code> |  |
+|  [type](./kibana-plugin-plugins-data-public.indexpatternspec.type.md) | <code>string</code> |  |
+|  [typeMeta](./kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md) | <code>TypeMeta</code> |  |
+|  [version](./kibana-plugin-plugins-data-public.indexpatternspec.version.md) | <code>string</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md
new file mode 100644
index 00000000000000..cda5285730135e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [sourceFilters](./kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md)
+
+## IndexPatternSpec.sourceFilters property
+
+<b>Signature:</b>
+
+```typescript
+sourceFilters?: SourceFilter[];
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md
new file mode 100644
index 00000000000000..a527e3ac0658bb
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [timeFieldName](./kibana-plugin-plugins-data-public.indexpatternspec.timefieldname.md)
+
+## IndexPatternSpec.timeFieldName property
+
+<b>Signature:</b>
+
+```typescript
+timeFieldName?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.title.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.title.md
new file mode 100644
index 00000000000000..4cc6d3c2524a73
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.title.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [title](./kibana-plugin-plugins-data-public.indexpatternspec.title.md)
+
+## IndexPatternSpec.title property
+
+<b>Signature:</b>
+
+```typescript
+title?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.type.md
new file mode 100644
index 00000000000000..d1c49be1b706fd
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [type](./kibana-plugin-plugins-data-public.indexpatternspec.type.md)
+
+## IndexPatternSpec.type property
+
+<b>Signature:</b>
+
+```typescript
+type?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md
new file mode 100644
index 00000000000000..9303047e905d3c
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [typeMeta](./kibana-plugin-plugins-data-public.indexpatternspec.typemeta.md)
+
+## IndexPatternSpec.typeMeta property
+
+<b>Signature:</b>
+
+```typescript
+typeMeta?: TypeMeta;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.version.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.version.md
new file mode 100644
index 00000000000000..43f7cf0226fb07
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.version.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) &gt; [version](./kibana-plugin-plugins-data-public.indexpatternspec.version.md)
+
+## IndexPatternSpec.version property
+
+<b>Signature:</b>
+
+```typescript
+version?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index b651480a858992..79421696a987a7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -63,6 +63,7 @@
 |  [IKibanaSearchRequest](./kibana-plugin-plugins-data-public.ikibanasearchrequest.md) |  |
 |  [IKibanaSearchResponse](./kibana-plugin-plugins-data-public.ikibanasearchresponse.md) |  |
 |  [IndexPatternAttributes](./kibana-plugin-plugins-data-public.indexpatternattributes.md) | Use data plugin interface instead |
+|  [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) |  |
 |  [IndexPatternTypeMeta](./kibana-plugin-plugins-data-public.indexpatterntypemeta.md) |  |
 |  [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) |  |
 |  [KueryNode](./kibana-plugin-plugins-data-public.kuerynode.md) |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index 9f3ed8c1263ba0..53bb51b5fc8af7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
+QueryStringInput: React.FC<Pick<Props, "query" | "onChange" | "size" | "indexPatterns" | "placeholder" | "onBlur" | "onSubmit" | "prepend" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus" | "dataTestSubj">>
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 498691c06285d8..af00e3a6b61572 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, "query" | "filters" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 3270e5a09afdec..3252885438f318 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -367,8 +367,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                pattern?: string | undefined;
                 highlight?: boolean | undefined;
+                pattern?: string | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -378,8 +378,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                pattern?: string | undefined;
                 highlight?: boolean | undefined;
+                pattern?: string | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -392,15 +392,15 @@ export const config: {
         loggers: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<string[]>;
             context: import("@kbn/config-schema").Type<string>;
-            level: import("@kbn/config-schema").Type<import("./logging/log_level").LogLevelId>;
+            level: import("@kbn/config-schema").Type<"warn" | "error" | "off" | "all" | "debug" | "info" | "fatal" | "trace">;
         }>;
         loggerContext: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<Map<string, Readonly<{} & {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    pattern?: string | undefined;
                     highlight?: boolean | undefined;
+                    pattern?: string | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -410,8 +410,8 @@ export const config: {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    pattern?: string | undefined;
                     highlight?: boolean | undefined;
+                    pattern?: string | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -424,7 +424,7 @@ export const config: {
             loggers: import("@kbn/config-schema").Type<Readonly<{} & {
                 context: string;
                 appenders: string[];
-                level: import("./logging/log_level").LogLevelId;
+                level: "warn" | "error" | "off" | "all" | "debug" | "info" | "fatal" | "trace";
             }>[]>;
         }>;
     };
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 51f76b4354bfa9..f9f9a00bb200a9 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -262,7 +262,6 @@ export {
   UI_SETTINGS,
   TypeMeta as IndexPatternTypeMeta,
   AggregationRestrictions as IndexPatternAggRestrictions,
-  FieldList,
   IndexPatternSpec,
   fieldList,
 } from '../common';
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index d4ea8433a27502..76785e89b54428 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -165,7 +165,7 @@ export interface ApplyGlobalFilterActionContext {
 // Warning: (ae-missing-release-tag) "baseFormattersPublic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[];
+export const baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[];
 
 // Warning: (ae-missing-release-tag) "BUCKET_TYPES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -631,7 +631,7 @@ export interface Filter {
 // Warning: (ae-missing-release-tag) "FilterBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const FilterBar: React.ComponentClass<Pick<Props_2, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
+export const FilterBar: React.ComponentClass<Pick<Props_2, "filters" | "onFiltersUpdated" | "className" | "indexPatterns">, any> & {
     WrappedComponent: React.ComponentType<Props_2 & ReactIntl.InjectedIntlProps>;
 };
 
@@ -969,8 +969,6 @@ export class IndexPattern implements IIndexPattern {
     id?: string;
     // (undocumented)
     init(): Promise<this>;
-    // Warning: (ae-forgotten-export) The symbol "IndexPatternSpec" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
     initFromSpec(spec: IndexPatternSpec): this;
     // (undocumented)
@@ -999,7 +997,7 @@ export class IndexPattern implements IIndexPattern {
         typeMeta: string | undefined;
     };
     // (undocumented)
-    refreshFields(): Promise<void | Error | never[] | undefined>;
+    refreshFields(): Promise<void | never[] | Error | undefined>;
     // (undocumented)
     removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
@@ -1185,6 +1183,30 @@ export class IndexPatternSelect extends Component<IndexPatternSelectProps> {
     UNSAFE_componentWillReceiveProps(nextProps: IndexPatternSelectProps): void;
 }
 
+// Warning: (ae-missing-release-tag) "IndexPatternSpec" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface IndexPatternSpec {
+    // (undocumented)
+    fields?: FieldSpec[];
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    intervalName?: string;
+    // (undocumented)
+    sourceFilters?: SourceFilter[];
+    // (undocumented)
+    timeFieldName?: string;
+    // (undocumented)
+    title?: string;
+    // (undocumented)
+    type?: string;
+    // (undocumented)
+    typeMeta?: IndexPatternTypeMeta;
+    // (undocumented)
+    version?: string;
+}
+
 // Warning: (ae-missing-release-tag) "TypeMeta" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1465,7 +1487,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "query" | "onChange" | "size" | "indexPatterns" | "placeholder" | "onBlur" | "onSubmit" | "prepend" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus" | "dataTestSubj">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
@@ -1678,8 +1700,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, "query" | "filters" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts
@@ -1960,21 +1982,21 @@ export const UI_SETTINGS: {
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getFromSavedObject" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:371:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:371:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:371:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:371:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:373:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:374:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:383:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:384:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:390:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:391:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:394:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:395:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:374:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:375:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:384:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:391:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:392:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:395:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:396:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:45:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:62:5 - (ae-forgotten-export) The symbol "createFiltersFromValueClickAction" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:63:5 - (ae-forgotten-export) The symbol "createFiltersFromRangeSelectAction" needs to be exported by the entry point index.d.ts

From 5084496802e9eff515dca72ac9b751650203eec0 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 6 Sep 2020 23:34:51 -0500
Subject: [PATCH 09/57] update docs

---
 ...lugin-plugins-data-public.baseformatterspublic.md |  2 +-
 .../kibana-plugin-plugins-data-public.filterbar.md   |  2 +-
 ...plugins-data-public.indexpattern.refreshfields.md |  4 ++--
 ...na-plugin-plugins-data-public.querystringinput.md |  2 +-
 .../kibana-plugin-plugins-data-public.searchbar.md   |  4 ++--
 src/core/server/server.api.md                        | 12 ++++++------
 src/plugins/data/public/public.api.md                | 12 ++++++------
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
index 3c558e821ea0a0..1aa9f460c4fac8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[]
+baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[]
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
index ef6a04dafb2d43..6d8862323792aa 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-FilterBar: React.ComponentClass<Pick<Props, "filters" | "onFiltersUpdated" | "className" | "indexPatterns">, any> & {
+FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
index 345449f6639245..271d0c45a42441 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-refreshFields(): Promise<void | never[] | Error | undefined>;
+refreshFields(): Promise<void | Error | never[] | undefined>;
 ```
 <b>Returns:</b>
 
-`Promise<void | never[] | Error | undefined>`
+`Promise<void | Error | never[] | undefined>`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index 53bb51b5fc8af7..9f3ed8c1263ba0 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "onChange" | "size" | "indexPatterns" | "placeholder" | "onBlur" | "onSubmit" | "prepend" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus" | "dataTestSubj">>
+QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index af00e3a6b61572..498691c06285d8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, "query" | "filters" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 3252885438f318..3270e5a09afdec 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -367,8 +367,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                highlight?: boolean | undefined;
                 pattern?: string | undefined;
+                highlight?: boolean | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -378,8 +378,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                highlight?: boolean | undefined;
                 pattern?: string | undefined;
+                highlight?: boolean | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -392,15 +392,15 @@ export const config: {
         loggers: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<string[]>;
             context: import("@kbn/config-schema").Type<string>;
-            level: import("@kbn/config-schema").Type<"warn" | "error" | "off" | "all" | "debug" | "info" | "fatal" | "trace">;
+            level: import("@kbn/config-schema").Type<import("./logging/log_level").LogLevelId>;
         }>;
         loggerContext: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<Map<string, Readonly<{} & {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    highlight?: boolean | undefined;
                     pattern?: string | undefined;
+                    highlight?: boolean | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -410,8 +410,8 @@ export const config: {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    highlight?: boolean | undefined;
                     pattern?: string | undefined;
+                    highlight?: boolean | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -424,7 +424,7 @@ export const config: {
             loggers: import("@kbn/config-schema").Type<Readonly<{} & {
                 context: string;
                 appenders: string[];
-                level: "warn" | "error" | "off" | "all" | "debug" | "info" | "fatal" | "trace";
+                level: import("./logging/log_level").LogLevelId;
             }>[]>;
         }>;
     };
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 76785e89b54428..ce8fd8c81126c1 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -165,7 +165,7 @@ export interface ApplyGlobalFilterActionContext {
 // Warning: (ae-missing-release-tag) "baseFormattersPublic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[];
+export const baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[];
 
 // Warning: (ae-missing-release-tag) "BUCKET_TYPES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -631,7 +631,7 @@ export interface Filter {
 // Warning: (ae-missing-release-tag) "FilterBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const FilterBar: React.ComponentClass<Pick<Props_2, "filters" | "onFiltersUpdated" | "className" | "indexPatterns">, any> & {
+export const FilterBar: React.ComponentClass<Pick<Props_2, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props_2 & ReactIntl.InjectedIntlProps>;
 };
 
@@ -997,7 +997,7 @@ export class IndexPattern implements IIndexPattern {
         typeMeta: string | undefined;
     };
     // (undocumented)
-    refreshFields(): Promise<void | never[] | Error | undefined>;
+    refreshFields(): Promise<void | Error | never[] | undefined>;
     // (undocumented)
     removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
@@ -1487,7 +1487,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "query" | "onChange" | "size" | "indexPatterns" | "placeholder" | "onBlur" | "onSubmit" | "prepend" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus" | "dataTestSubj">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
@@ -1700,8 +1700,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, "query" | "filters" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "filters" | "intl" | "onFiltersUpdated" | "indexPatterns" | "isLoading" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "onRefresh" | "onRefreshChange" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "indicateNoData" | "timeHistory"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts

From 010a70fbcb943e9dd6129576ae29775df9188a22 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 7 Sep 2020 11:17:25 -0500
Subject: [PATCH 10/57] refresh fields before creating index pattern

---
 .../index_patterns/index_pattern.ts           | 13 ++--
 .../index_patterns/index_patterns.ts          | 60 +++++++++++++++++--
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 81450e700896fe..ed3c518ca62a58 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -21,6 +21,7 @@ import _, { each, reject } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
 import { DuplicateField, SavedObjectNotFound } from '../../../../kibana_utils/common';
+import { IndexPatternMissingIndices } from '../lib';
 
 import {
   ES_FIELD_TYPES,
@@ -30,7 +31,6 @@ import {
   FieldFormatNotFoundError,
 } from '../../../common';
 import { findByTitle } from '../utils';
-import { IndexPatternMissingIndices } from '../lib';
 import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields';
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
@@ -148,8 +148,8 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    // this.fields.replaceAll(spec.fields || []);
-    this.indexFields(spec.fields);
+    // this.indexFields(spec.fields);
+    this.fields.replaceAll(spec.fields || []);
     this.typeMeta = spec.typeMeta;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
@@ -191,6 +191,7 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
+  /*
   private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
     if (!specs) {
       return true;
@@ -207,6 +208,7 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
+  /*
   private async indexFields(specs?: FieldSpec[]) {
     if (!this.id) {
       return;
@@ -228,6 +230,7 @@ export class IndexPattern implements IIndexPattern {
       }
     }
   }
+  */
 
   private fieldSpecsToFieldFormatMap = (fldList: IndexPatternSpec['fields'] = []) =>
     fldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
@@ -318,8 +321,8 @@ export class IndexPattern implements IIndexPattern {
       this.title = this.id;
     }
     this.version = response.version;
-
-    return this.indexFields(response.fields);
+    this.fields.replaceAll(response.fields);
+    // return this.indexFields(response.fields);
   }
 
   getComputedFields() {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index a0861b7369b87d..2660ae45ae7afd 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
 
 import { createIndexPatternCache } from '.';
@@ -38,6 +39,7 @@ import {
 import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
 import { SavedObjectNotFound } from '../../../../kibana_utils/common';
+import { IndexPatternMissingIndices } from '../lib';
 
 const indexPatternCache = createIndexPatternCache();
 
@@ -164,8 +166,51 @@ export class IndexPatternsService {
     return null;
   };
 
+  private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
+    if (!specs) {
+      return true;
+    }
+
+    return specs.every((spec) => {
+      // See https://github.com/elastic/kibana/pull/8421
+      const hasFieldCaps = 'aggregatable' in spec && 'searchable' in spec;
+
+      // See https://github.com/elastic/kibana/pull/11969
+      const hasDocValuesFlag = 'readFromDocValues' in spec;
+
+      return !hasFieldCaps || !hasDocValuesFlag;
+    });
+  }
+
+  private refreshFields = async (
+    fields: FieldSpec[],
+    id: string,
+    title: string,
+    options: GetFieldsOptions
+  ) => {
+    const scriptdFields = fields.filter((field) => field.scripted);
+    try {
+      const newFields = await this.getFieldsForWildcard(options);
+      return [...newFields, ...scriptdFields];
+    } catch (err) {
+      if (err instanceof IndexPatternMissingIndices) {
+        this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
+        return [];
+      }
+
+      this.onError(err, {
+        title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
+          defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})',
+          values: { id, title },
+        }),
+      });
+    }
+    return fields;
+  };
+
   get = async (id: string): Promise<IndexPattern> => {
     const savedObjectType = 'index-pattern';
+    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
     const cache = indexPatternCache.get(id);
     if (cache) {
@@ -196,7 +241,16 @@ export class IndexPatternsService {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
-    const parsedFields = fields ? JSON.parse(fields) : [];
+    let parsedFields = fields ? JSON.parse(fields) : [];
+    const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
+    parsedFields = this.isFieldRefreshRequired(parsedFields)
+      ? await this.refreshFields(parsedFields, id, title, {
+          pattern: title,
+          metaFields,
+          type,
+          params: parsedTypeMeta && parsedTypeMeta.params,
+        })
+      : parsedFields;
     const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
 
     Object.entries(parsedFieldFormatMap).forEach(([fieldName, value]) => {
@@ -212,11 +266,9 @@ export class IndexPatternsService {
       title,
       timeFieldName,
       intervalName,
-      // fields,
       fields: parsedFields,
       sourceFilters: sourceFilters ? JSON.parse(sourceFilters) : undefined,
-      // fieldFormatMap: parsedFieldFormatMap,
-      typeMeta: typeMeta ? JSON.parse(typeMeta) : undefined,
+      typeMeta: parsedTypeMeta,
       type,
     };
 

From 9c0f0f746b95f4f2a13f519e3be9ab58e74a1010 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 7 Sep 2020 11:24:42 -0500
Subject: [PATCH 11/57] update docs

---
 ...plugins-data-public.indexpattern.refreshfields.md |  4 ++--
 ...na-plugin-plugins-data-public.querystringinput.md |  2 +-
 .../kibana-plugin-plugins-data-public.searchbar.md   |  4 ++--
 src/core/server/server.api.md                        | 12 ++++++------
 src/plugins/data/public/public.api.md                |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
index 271d0c45a42441..345449f6639245 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-refreshFields(): Promise<void | Error | never[] | undefined>;
+refreshFields(): Promise<void | never[] | Error | undefined>;
 ```
 <b>Returns:</b>
 
-`Promise<void | Error | never[] | undefined>`
+`Promise<void | never[] | Error | undefined>`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index 9f3ed8c1263ba0..69cd8eb53159d5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
+QueryStringInput: React.FC<Pick<Props, "placeholder" | "onBlur" | "onChange" | "onSubmit" | "query" | "size" | "indexPatterns" | "prepend" | "screenTitle" | "dataTestSubj" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 498691c06285d8..568f519ad33865 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "intl" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "intl" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 3270e5a09afdec..5a8a66d4cafdf3 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -367,8 +367,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                pattern?: string | undefined;
                 highlight?: boolean | undefined;
+                pattern?: string | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -378,8 +378,8 @@ export const config: {
             layout: Readonly<{} & {
                 kind: "json";
             }> | Readonly<{
-                pattern?: string | undefined;
                 highlight?: boolean | undefined;
+                pattern?: string | undefined;
             } & {
                 kind: "pattern";
             }>;
@@ -392,15 +392,15 @@ export const config: {
         loggers: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<string[]>;
             context: import("@kbn/config-schema").Type<string>;
-            level: import("@kbn/config-schema").Type<import("./logging/log_level").LogLevelId>;
+            level: import("@kbn/config-schema").Type<"debug" | "off" | "all" | "error" | "warn" | "info" | "fatal" | "trace">;
         }>;
         loggerContext: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<Map<string, Readonly<{} & {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    pattern?: string | undefined;
                     highlight?: boolean | undefined;
+                    pattern?: string | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -410,8 +410,8 @@ export const config: {
                 layout: Readonly<{} & {
                     kind: "json";
                 }> | Readonly<{
-                    pattern?: string | undefined;
                     highlight?: boolean | undefined;
+                    pattern?: string | undefined;
                 } & {
                     kind: "pattern";
                 }>;
@@ -424,7 +424,7 @@ export const config: {
             loggers: import("@kbn/config-schema").Type<Readonly<{} & {
                 context: string;
                 appenders: string[];
-                level: import("./logging/log_level").LogLevelId;
+                level: "debug" | "off" | "all" | "error" | "warn" | "info" | "fatal" | "trace";
             }>[]>;
         }>;
     };
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index ce8fd8c81126c1..c9b39ddc9efc45 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -997,7 +997,7 @@ export class IndexPattern implements IIndexPattern {
         typeMeta: string | undefined;
     };
     // (undocumented)
-    refreshFields(): Promise<void | Error | never[] | undefined>;
+    refreshFields(): Promise<void | never[] | Error | undefined>;
     // (undocumented)
     removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
@@ -1487,7 +1487,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "placeholder" | "onBlur" | "onChange" | "onSubmit" | "query" | "size" | "indexPatterns" | "prepend" | "screenTitle" | "dataTestSubj" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
@@ -1700,8 +1700,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "intl" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "filters" | "query" | "indexPatterns" | "isLoading" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "indicateNoData" | "intl" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts

From 00dfeff026fabd2e55aa8a9c0b2477bb8de2117c Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 7 Sep 2020 15:37:27 -0500
Subject: [PATCH 12/57] update docs

---
 ...lugin-plugins-data-public.baseformatterspublic.md |  2 +-
 .../kibana-plugin-plugins-data-public.filterbar.md   |  2 +-
 ...plugins-data-public.indexpattern.refreshfields.md |  4 ++--
 ...na-plugin-plugins-data-public.querystringinput.md |  2 +-
 .../kibana-plugin-plugins-data-public.searchbar.md   |  4 ++--
 src/core/server/server.api.md                        |  4 ++--
 src/plugins/data/public/public.api.md                | 12 ++++++------
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
index 3c558e821ea0a0..1aa9f460c4fac8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[]
+baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[]
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
index 88a4448e1592fd..6d8862323792aa 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-FilterBar: React.ComponentClass<Pick<Props, "indexPatterns" | "className" | "filters" | "onFiltersUpdated">, any> & {
+FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
index 345449f6639245..271d0c45a42441 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-refreshFields(): Promise<void | never[] | Error | undefined>;
+refreshFields(): Promise<void | Error | never[] | undefined>;
 ```
 <b>Returns:</b>
 
-`Promise<void | never[] | Error | undefined>`
+`Promise<void | Error | never[] | undefined>`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index 65dd3839041cbf..3dbfd9430e9133 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "indexPatterns" | "query" | "disableAutoFocus" | "screenTitle" | "prepend" | "persistedLog" | "bubbleSubmitEvent" | "placeholder" | "languageSwitcherPopoverAnchorPosition" | "onBlur" | "onChange" | "onChangeQueryInputFocus" | "onSubmit" | "dataTestSubj" | "size" | "className">>
+QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "className" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 3a963f7fc2d428..498691c06285d8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 6acbaaa164c2a1..3270e5a09afdec 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -392,7 +392,7 @@ export const config: {
         loggers: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<string[]>;
             context: import("@kbn/config-schema").Type<string>;
-            level: import("@kbn/config-schema").Type<"error" | "off" | "all" | "warn" | "debug" | "info" | "fatal" | "trace">;
+            level: import("@kbn/config-schema").Type<import("./logging/log_level").LogLevelId>;
         }>;
         loggerContext: import("@kbn/config-schema").ObjectType<{
             appenders: import("@kbn/config-schema").Type<Map<string, Readonly<{} & {
@@ -424,7 +424,7 @@ export const config: {
             loggers: import("@kbn/config-schema").Type<Readonly<{} & {
                 context: string;
                 appenders: string[];
-                level: "error" | "off" | "all" | "warn" | "debug" | "info" | "fatal" | "trace";
+                level: import("./logging/log_level").LogLevelId;
             }>[]>;
         }>;
     };
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 757adf91c96ab1..5901750a4cd6bd 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -165,7 +165,7 @@ export interface ApplyGlobalFilterActionContext {
 // Warning: (ae-missing-release-tag) "baseFormattersPublic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const baseFormattersPublic: (typeof DateFormat | typeof DateNanosFormat | import("../../common").FieldFormatInstanceType)[];
+export const baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[];
 
 // Warning: (ae-missing-release-tag) "BUCKET_TYPES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -631,7 +631,7 @@ export interface Filter {
 // Warning: (ae-missing-release-tag) "FilterBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const FilterBar: React.ComponentClass<Pick<Props_2, "indexPatterns" | "className" | "filters" | "onFiltersUpdated">, any> & {
+export const FilterBar: React.ComponentClass<Pick<Props_2, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props_2 & ReactIntl.InjectedIntlProps>;
 };
 
@@ -997,7 +997,7 @@ export class IndexPattern implements IIndexPattern {
         typeMeta: string | undefined;
     };
     // (undocumented)
-    refreshFields(): Promise<void | never[] | Error | undefined>;
+    refreshFields(): Promise<void | Error | never[] | undefined>;
     // (undocumented)
     removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
@@ -1487,7 +1487,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "indexPatterns" | "query" | "disableAutoFocus" | "screenTitle" | "prepend" | "persistedLog" | "bubbleSubmitEvent" | "placeholder" | "languageSwitcherPopoverAnchorPosition" | "onBlur" | "onChange" | "onChangeQueryInputFocus" | "onSubmit" | "dataTestSubj" | "size" | "className">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "size" | "className" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
@@ -1700,8 +1700,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "indexPatterns" | "query" | "screenTitle" | "dataTestSubj" | "isLoading" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "filters" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts

From 40bfe83a11c24f177abe6e2238f2fe53df131c5d Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 9 Sep 2020 15:03:26 -0500
Subject: [PATCH 13/57] functional test fixes

---
 .../management/_index_pattern_popularity.js   |  2 +-
 .../public/util/indexing_service.js           | 22 ++-----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index e2fcf50ef2c12c..530b8e1111a0c6 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }) {
       // check that it is 0 (previous increase was cancelled
       const popularity = await PageObjects.settings.getPopularity();
       log.debug('popularity = ' + popularity);
-      expect(popularity).to.be('');
+      expect(popularity).to.be('0');
     });
 
     it('can be saved', async function () {
diff --git a/x-pack/plugins/file_upload/public/util/indexing_service.js b/x-pack/plugins/file_upload/public/util/indexing_service.js
index eb22b0228b48a4..fbd596ac9ce7ea 100644
--- a/x-pack/plugins/file_upload/public/util/indexing_service.js
+++ b/x-pack/plugins/file_upload/public/util/indexing_service.js
@@ -189,19 +189,13 @@ async function chunkDataAndWriteToIndex({ id, index, data, mappings, settings })
 }
 
 export async function createIndexPattern(indexPatternName) {
-  const indexPatterns = await indexPatternService.get();
   try {
-    Object.assign(indexPatterns, {
-      id: '',
+    const indexPattern = await indexPatternService.create({
       title: indexPatternName,
     });
-
-    await indexPatterns.create(true);
-    const id = await getIndexPatternId(indexPatternName);
-    const indexPattern = await indexPatternService.get(id);
     return {
       success: true,
-      id,
+      id: indexPattern.id,
       fields: indexPattern.fields,
     };
   } catch (error) {
@@ -212,18 +206,6 @@ export async function createIndexPattern(indexPatternName) {
   }
 }
 
-async function getIndexPatternId(name) {
-  const savedObjectSearch = await savedObjectsClient.find({ type: 'index-pattern', perPage: 1000 });
-  const indexPatternSavedObjects = savedObjectSearch.savedObjects;
-
-  if (indexPatternSavedObjects) {
-    const ip = indexPatternSavedObjects.find((i) => i.attributes.title === name);
-    return ip !== undefined ? ip.id : undefined;
-  } else {
-    return undefined;
-  }
-}
-
 export const getExistingIndexNames = async () => {
   const indexes = await httpService({
     url: `/api/index_management/indices`,

From a46205ab4639e439a22364570d2a0ff49ed2145f Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 9 Sep 2020 22:29:33 -0500
Subject: [PATCH 14/57] separate create and save

---
 .../errors/duplicate_index_pattern.ts         | 25 +++++++
 .../field_type_unknown.ts}                    |  2 +-
 .../common/index_patterns/errors/index.ts     | 21 ++++++
 .../index_patterns/index_pattern.ts           |  4 ++
 .../index_patterns/index_patterns.ts          | 38 +++++++++--
 src/plugins/data/public/index.ts              |  2 +
 .../management/_index_pattern_popularity.js   |  3 +-
 .../use_create_analytics_form.ts              | 65 ++++++++-----------
 8 files changed, 114 insertions(+), 46 deletions(-)
 create mode 100644 src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts
 rename src/plugins/data/common/index_patterns/{errors.ts => errors/field_type_unknown.ts} (96%)
 create mode 100644 src/plugins/data/common/index_patterns/errors/index.ts

diff --git a/src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts b/src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts
new file mode 100644
index 00000000000000..c42dcc1c6a24de
--- /dev/null
+++ b/src/plugins/data/common/index_patterns/errors/duplicate_index_pattern.ts
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+export class DuplicateIndexPatternError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'DuplicateIndexPatternError';
+  }
+}
diff --git a/src/plugins/data/common/index_patterns/errors.ts b/src/plugins/data/common/index_patterns/errors/field_type_unknown.ts
similarity index 96%
rename from src/plugins/data/common/index_patterns/errors.ts
rename to src/plugins/data/common/index_patterns/errors/field_type_unknown.ts
index 3d92bae1968fb5..9a31d2cea7ba1c 100644
--- a/src/plugins/data/common/index_patterns/errors.ts
+++ b/src/plugins/data/common/index_patterns/errors/field_type_unknown.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { FieldSpec } from './types';
+import { FieldSpec } from '../types';
 
 export class FieldTypeUnknownError extends Error {
   public readonly fieldSpec: FieldSpec;
diff --git a/src/plugins/data/common/index_patterns/errors/index.ts b/src/plugins/data/common/index_patterns/errors/index.ts
new file mode 100644
index 00000000000000..f6a69981da0035
--- /dev/null
+++ b/src/plugins/data/common/index_patterns/errors/index.ts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+export * from './field_type_unknown';
+export * from './duplicate_index_pattern';
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 82c34c967a4450..24df9d0856cdee 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -563,6 +563,10 @@ export class IndexPattern implements IIndexPattern {
       return response.id;
     };
 
+    // search by title
+    // if dupe and override, delete index pattern
+    // if no dupe, create
+
     const potentialDuplicateByTitle = await findByTitle(this.savedObjectsClient, this.title);
     // If there is potentially duplicate title, just create it
     if (!potentialDuplicateByTitle) {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 864433b9bdf59f..780bdf6373d8ca 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -40,6 +40,7 @@ import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
 import { SavedObjectNotFound } from '../../../../kibana_utils/common';
 import { IndexPatternMissingIndices } from '../lib';
+import { findByTitle } from '../utils';
 
 const indexPatternCache = createIndexPatternCache();
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
@@ -168,6 +169,12 @@ export class IndexPatternsService {
     return null;
   };
 
+  setDefault = async (id: string, force = false) => {
+    if (force || !this.config.get('defaultIndex')) {
+      await this.config.set('defaultIndex', id);
+    }
+  };
+
   private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
     if (!specs) {
       return true;
@@ -318,12 +325,33 @@ export class IndexPatternsService {
     });
 
     await indexPattern._fetchFields();
-    await indexPattern.create();
+    // todo should save as separate step
+    // await indexPattern.create();
 
     return indexPattern;
   }
 
-  async save(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
+  async saveNew(indexPattern: IndexPattern, override = false) {
+    const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
+    if (dupe && override) {
+      await this.delete(dupe.id);
+    } else {
+      throw new Error('Duplicate index pattern: ${indexPattern.title}');
+    }
+
+    const body = indexPattern.prepBody();
+    const response = await this.savedObjectsClient.create(savedObjectType, body, {
+      id: indexPattern.id,
+    });
+    indexPattern.id = response.id;
+    return indexPattern;
+  }
+
+  async save(indexPattern: IndexPattern) {
+    return this.update(indexPattern);
+  }
+
+  async update(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
     if (!indexPattern.id) return;
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
@@ -343,7 +371,7 @@ export class IndexPatternsService {
         indexPattern.id = resp.id;
         indexPattern.version = resp.version;
       })
-      .catch((err) => {
+      .catch(async (err) => {
         if (err?.res?.status === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
           const samePattern = new IndexPattern({
             savedObjectsClient: this.savedObjectsClient,
@@ -357,7 +385,7 @@ export class IndexPatternsService {
             metaFields,
           });
 
-          return samePattern.init().then(() => {
+          samePattern.init().then(() => {
             // What keys changed from now and what the server returned
             const updatedBody = samePattern.prepBody();
 
@@ -403,7 +431,7 @@ export class IndexPatternsService {
             indexPatternCache.clear(indexPattern.id!);
 
             // Try the save again
-            return this.save(indexPattern, saveAttempts);
+            return this.update(indexPattern, saveAttempts);
           });
         }
         throw err;
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index bf413557a3c262..35f8209e1c2138 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -266,6 +266,8 @@ export {
   fieldList,
 } from '../common';
 
+export * from '../common/index_patterns/errors';
+
 /*
  * Autocomplete query suggestions:
  */
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index 530b8e1111a0c6..e228a70c89b24f 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -57,10 +57,9 @@ export default function ({ getService, getPageObjects }) {
       // Cancel saving the popularity change
       await PageObjects.settings.controlChangeCancel();
       await PageObjects.settings.openControlsByName(fieldName);
-      // check that it is 0 (previous increase was cancelled
       const popularity = await PageObjects.settings.getPopularity();
       log.debug('popularity = ' + popularity);
-      expect(popularity).to.be('0');
+      expect(popularity).to.be('');
     });
 
     it('can be saved', async function () {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 9612b9213d1205..6bc00bedb964f3 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -12,6 +12,7 @@ import { getErrorMessage } from '../../../../../../../common/util/errors';
 import { DeepReadonly } from '../../../../../../../common/types/common';
 import { ml } from '../../../../../services/ml_api_service';
 import { useMlContext } from '../../../../../contexts/ml';
+import { DuplicateIndexPatternError } from '../../../../../../../../../../src/plugins/data/public';
 
 import {
   useRefreshAnalyticsList,
@@ -130,19 +131,24 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     const indexPatternName = destinationIndex;
 
     try {
-      const newIndexPattern = await mlContext.indexPatterns.make();
+      const newIndexPattern = await mlContext.indexPatterns.create({ title: indexPatternName });
+      await mlContext.indexPatterns.saveNew(newIndexPattern);
 
-      Object.assign(newIndexPattern, {
-        id: '',
-        title: indexPatternName,
-      });
-
-      const id = await newIndexPattern.create();
-
-      await mlContext.indexPatterns.clearCache();
+      // check if there's a default index pattern, if not,
+      // set the newly created one as the default index pattern.
+      await mlContext.indexPatterns.setDefault(newIndexPattern.id as string);
 
-      // id returns false if there's a duplicate index pattern.
-      if (id === false) {
+      addRequestMessage({
+        message: i18n.translate(
+          'xpack.ml.dataframe.analytics.create.createIndexPatternSuccessMessage',
+          {
+            defaultMessage: 'Kibana index pattern {indexPatternName} created.',
+            values: { indexPatternName },
+          }
+        ),
+      });
+    } catch (e) {
+      if (e instanceof DuplicateIndexPatternError) {
         addRequestMessage({
           error: i18n.translate(
             'xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessageError',
@@ -158,34 +164,17 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
             }
           ),
         });
-        return;
-      }
-
-      // check if there's a default index pattern, if not,
-      // set the newly created one as the default index pattern.
-      if (!mlContext.kibanaConfig.get('defaultIndex')) {
-        await mlContext.kibanaConfig.set('defaultIndex', id);
+      } else {
+        addRequestMessage({
+          error: getErrorMessage(e),
+          message: i18n.translate(
+            'xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage',
+            {
+              defaultMessage: 'An error occurred creating the Kibana index pattern:',
+            }
+          ),
+        });
       }
-
-      addRequestMessage({
-        message: i18n.translate(
-          'xpack.ml.dataframe.analytics.create.createIndexPatternSuccessMessage',
-          {
-            defaultMessage: 'Kibana index pattern {indexPatternName} created.',
-            values: { indexPatternName },
-          }
-        ),
-      });
-    } catch (e) {
-      addRequestMessage({
-        error: getErrorMessage(e),
-        message: i18n.translate(
-          'xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage',
-          {
-            defaultMessage: 'An error occurred creating the Kibana index pattern:',
-          }
-        ),
-      });
     }
   };
 

From ec00ce5e17aae7738c3280fbfdb7bbcd14bf20d1 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 9 Sep 2020 23:55:45 -0500
Subject: [PATCH 15/57] update docs, fix a couple of tests

---
 ...lic.fieldtypeunknownerror._constructor_.md | 21 +++++++
 ...-public.fieldtypeunknownerror.fieldspec.md | 11 ++++
 ...ugins-data-public.fieldtypeunknownerror.md | 24 +++++++
 .../kibana-plugin-plugins-data-public.md      |  1 +
 .../index_patterns/fields/field_list.ts       |  2 +-
 .../index_patterns/index_pattern.ts           | 62 +------------------
 .../index_patterns/index_patterns.ts          | 10 ++-
 src/plugins/data/public/public.api.md         | 39 +++++++-----
 .../create_index_pattern_wizard.test.tsx      |  1 +
 .../management/_index_pattern_popularity.js   |  2 +-
 10 files changed, 96 insertions(+), 77 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
new file mode 100644
index 00000000000000..726a6f3d43cb77
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md)
+
+## FieldTypeUnknownError.(constructor)
+
+Constructs a new instance of the `FieldTypeUnknownError` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(message: string, spec: FieldSpec);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  message | <code>string</code> |  |
+|  spec | <code>FieldSpec</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
new file mode 100644
index 00000000000000..bc0854ed138481
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) &gt; [fieldSpec](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md)
+
+## FieldTypeUnknownError.fieldSpec property
+
+<b>Signature:</b>
+
+```typescript
+readonly fieldSpec: FieldSpec;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md
new file mode 100644
index 00000000000000..b3327d297754e9
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md)
+
+## FieldTypeUnknownError class
+
+<b>Signature:</b>
+
+```typescript
+export declare class FieldTypeUnknownError extends Error 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(message, spec)](./kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md) |  | Constructs a new instance of the <code>FieldTypeUnknownError</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [fieldSpec](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md) |  | <code>FieldSpec</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 1560eff536cfc6..a2e5b382d397cb 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -10,6 +10,7 @@
 |  --- | --- |
 |  [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) |  |
 |  [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) |  |
+|  [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) |  |
 |  [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) |  |
 |  [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) |  |
 |  [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) |  |
diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/index_patterns/fields/field_list.ts
index 4cf60758698513..f828ff53c7cda2 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -105,7 +105,7 @@ export const fieldList = (
       this.groups.clear();
     };
 
-    public readonly replaceAll = (spcs: FieldSpec[]) => {
+    public readonly replaceAll = (spcs: FieldSpec[] = []) => {
       this.removeAll();
       spcs.forEach(this.add);
     };
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 24df9d0856cdee..f476f574e457a4 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -72,6 +72,7 @@ export class IndexPattern implements IIndexPattern {
   public flattenHit: any;
   public metaFields: string[];
 
+  // todo rename
   public version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   private patternCache: PatternCache;
@@ -151,7 +152,6 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    // this.indexFields(spec.fields);
     this.fields.replaceAll(spec.fields || []);
     this.typeMeta = spec.typeMeta;
 
@@ -194,47 +194,6 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
-  /*
-  private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
-    if (!specs) {
-      return true;
-    }
-
-    return specs.every((spec) => {
-      // See https://github.com/elastic/kibana/pull/8421
-      const hasFieldCaps = 'aggregatable' in spec && 'searchable' in spec;
-
-      // See https://github.com/elastic/kibana/pull/11969
-      const hasDocValuesFlag = 'readFromDocValues' in spec;
-
-      return !hasFieldCaps || !hasDocValuesFlag;
-    });
-  }
-
-  /*
-  private async indexFields(specs?: FieldSpec[]) {
-    if (!this.id) {
-      return;
-    }
-
-    if (this.isFieldRefreshRequired(specs)) {
-      await this.refreshFields();
-    } else {
-      if (specs) {
-        try {
-          this.fields.replaceAll(specs);
-        } catch (err) {
-          if (err instanceof FieldTypeUnknownError) {
-            this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
-          } else {
-            throw err;
-          }
-        }
-      }
-    }
-  }
-  */
-
   private fieldSpecsToFieldFormatMap = (fldList: IndexPatternSpec['fields'] = []) =>
     fldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
       if (fieldSpec.format) {
@@ -243,23 +202,6 @@ export class IndexPattern implements IIndexPattern {
       return col;
     }, {});
 
-  /*
-    const fieldFormatMap: Record<string, SerializedFieldFormat> = {};
-    fieldList.forEach((field: FieldSpec) => {
-      if (field.format) {
-        fieldFormatMap[field.name as string] = { ...field.format };
-      }
-    });
-
-    fieldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
-      if (fieldSpec.format) {
-        col[fieldSpec.name] = { ...fieldSpec.format };
-      }
-      return col;
-    }, {});
-  }
-  */
-
   // this is swallowed by constructor
   public initFromSpec(spec: IndexPatternSpec) {
     // create fieldFormatMap from field list
@@ -372,6 +314,7 @@ export class IndexPattern implements IIndexPattern {
   // loads saved object
   // caches object state
   // deserializes and sets values
+  // todo kill this and updateFromES
   async init() {
     if (!this.id) {
       return this; // no id === no elasticsearch document
@@ -549,6 +492,7 @@ export class IndexPattern implements IIndexPattern {
     );
   }
 
+  // todo remove
   async create(allowOverride: boolean = false) {
     const _create = async (duplicateId?: string) => {
       if (duplicateId) {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 780bdf6373d8ca..1887032acea6d4 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -153,6 +153,8 @@ export class IndexPatternsService {
       indexPatternCache.clearAll();
     }
   };
+
+  // rename
   getCache = async () => {
     if (!this.savedObjectsCache) {
       await this.refreshSavedObjectsCache();
@@ -331,6 +333,7 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
+  // make private
   async saveNew(indexPattern: IndexPattern, override = false) {
     const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
     if (dupe && override) {
@@ -347,8 +350,12 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async save(indexPattern: IndexPattern) {
+  async save(indexPattern: IndexPattern, overwrite = false) {
+    // if(overwrite || !indexPattern.id){
+    // saveNew
+    // } else {
     return this.update(indexPattern);
+    // }
   }
 
   async update(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
@@ -438,6 +445,7 @@ export class IndexPatternsService {
       });
   }
 
+  // kill this
   async make(id?: string): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index baa636a15c0475..babd2aa30740f4 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -611,6 +611,15 @@ export interface FieldMappingSpec {
     type: ES_FIELD_TYPES;
 }
 
+// Warning: (ae-missing-release-tag) "FieldTypeUnknownError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class FieldTypeUnknownError extends Error {
+    constructor(message: string, spec: FieldSpec);
+    // (undocumented)
+    readonly fieldSpec: FieldSpec;
+}
+
 // Warning: (ae-missing-release-tag) "Filter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1998,21 +2007,21 @@ export const UI_SETTINGS: {
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getFromSavedObject" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:372:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:374:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:375:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:384:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:391:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:392:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:395:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:396:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:374:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:374:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:374:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:374:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:376:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:377:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:389:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:394:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:45:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:62:5 - (ae-forgotten-export) The symbol "createFiltersFromValueClickAction" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:63:5 - (ae-forgotten-export) The symbol "createFiltersFromRangeSelectAction" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
index af5618424bbc08..a52b7253d0705d 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
@@ -152,6 +152,7 @@ describe('CreateIndexPatternWizard', () => {
       timeFieldName: 'timestamp',
       fields: [],
       create,
+      _fetchFields: jest.fn(),
     } as unknown) as IndexPattern;
     mockContext.data.indexPatterns.make = async () => {
       return indexPattern;
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index e228a70c89b24f..ad9a9fd25644a3 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.settings.openControlsByName(fieldName);
       const popularity = await PageObjects.settings.getPopularity();
       log.debug('popularity = ' + popularity);
-      expect(popularity).to.be('');
+      expect(popularity).to.be('0');
     });
 
     it('can be saved', async function () {

From 275b152e2ef2bc134827c8eb821e041d3f284898 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 00:43:03 -0500
Subject: [PATCH 16/57] update docs

---
 ...uplicateindexpatternerror._constructor_.md | 20 +++++++++++++++++++
 ...-data-public.duplicateindexpatternerror.md | 18 +++++++++++++++++
 .../kibana-plugin-plugins-data-public.md      |  1 +
 src/plugins/data/public/public.api.md         |  7 +++++++
 4 files changed, 46 insertions(+)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md
new file mode 100644
index 00000000000000..676f1a2c785f8b
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md)
+
+## DuplicateIndexPatternError.(constructor)
+
+Constructs a new instance of the `DuplicateIndexPatternError` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(message: string);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  message | <code>string</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror.md
new file mode 100644
index 00000000000000..7ed8f97976464a
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.duplicateindexpatternerror.md
@@ -0,0 +1,18 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md)
+
+## DuplicateIndexPatternError class
+
+<b>Signature:</b>
+
+```typescript
+export declare class DuplicateIndexPatternError extends Error 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(message)](./kibana-plugin-plugins-data-public.duplicateindexpatternerror._constructor_.md) |  | Constructs a new instance of the <code>DuplicateIndexPatternError</code> class |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index a2e5b382d397cb..5baa8d264c2616 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -9,6 +9,7 @@
 |  Class | Description |
 |  --- | --- |
 |  [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) |  |
+|  [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md) |  |
 |  [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) |  |
 |  [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) |  |
 |  [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) |  |
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index babd2aa30740f4..925aa9f80e83b3 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -281,6 +281,13 @@ export interface DataPublicPluginStart {
     };
 }
 
+// Warning: (ae-missing-release-tag) "DuplicateIndexPatternError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class DuplicateIndexPatternError extends Error {
+    constructor(message: string);
+}
+
 // @public (undocumented)
 export enum ES_FIELD_TYPES {
     // (undocumented)

From 6bec81540ce2d8bb17cbfcc7af1359490ee399f3 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 02:16:13 -0500
Subject: [PATCH 17/57] fix file upload indexing service

---
 x-pack/plugins/file_upload/public/util/indexing_service.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x-pack/plugins/file_upload/public/util/indexing_service.js b/x-pack/plugins/file_upload/public/util/indexing_service.js
index fbd596ac9ce7ea..4a2538dfd176f5 100644
--- a/x-pack/plugins/file_upload/public/util/indexing_service.js
+++ b/x-pack/plugins/file_upload/public/util/indexing_service.js
@@ -193,6 +193,8 @@ export async function createIndexPattern(indexPatternName) {
     const indexPattern = await indexPatternService.create({
       title: indexPatternName,
     });
+    // saveNew is temp name function naae
+    await indexPatternService.saveNew(indexPattern);
     return {
       success: true,
       id: indexPattern.id,

From e7920b306b0cc79cac26ab3da9092e4f644120c2 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 10:41:05 -0500
Subject: [PATCH 18/57] attempt to fix ml and maps tests

---
 .../index_patterns/index_patterns/index_patterns.ts  | 12 +++++++++---
 .../file_upload/public/util/indexing_service.js      |  4 +---
 .../use_create_analytics_form.ts                     |  9 +++------
 .../ml/public/application/util/index_utils.ts        |  6 +++++-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 1887032acea6d4..0fd19fd091d015 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -309,7 +309,7 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async create(spec: IndexPatternSpec): Promise<IndexPattern> {
+  async newIndexPattern(spec: IndexPatternSpec): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
@@ -333,8 +333,14 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  // make private
-  async saveNew(indexPattern: IndexPattern, override = false) {
+  async newIndexPatternAndSave(spec: IndexPatternSpec, override = false) {
+    const indexPattern = await this.newIndexPattern(spec);
+    await this.create(indexPattern, override);
+    await this.setDefault(indexPattern.id as string);
+    return indexPattern;
+  }
+
+  async create(indexPattern: IndexPattern, override = false) {
     const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
     if (dupe && override) {
       await this.delete(dupe.id);
diff --git a/x-pack/plugins/file_upload/public/util/indexing_service.js b/x-pack/plugins/file_upload/public/util/indexing_service.js
index 4a2538dfd176f5..aadea0fdcdb6d3 100644
--- a/x-pack/plugins/file_upload/public/util/indexing_service.js
+++ b/x-pack/plugins/file_upload/public/util/indexing_service.js
@@ -190,11 +190,9 @@ async function chunkDataAndWriteToIndex({ id, index, data, mappings, settings })
 
 export async function createIndexPattern(indexPatternName) {
   try {
-    const indexPattern = await indexPatternService.create({
+    const indexPattern = await indexPatternService.newIndexPatternAndSave({
       title: indexPatternName,
     });
-    // saveNew is temp name function naae
-    await indexPatternService.saveNew(indexPattern);
     return {
       success: true,
       id: indexPattern.id,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 6bc00bedb964f3..2f1daac2db607b 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -131,12 +131,9 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     const indexPatternName = destinationIndex;
 
     try {
-      const newIndexPattern = await mlContext.indexPatterns.create({ title: indexPatternName });
-      await mlContext.indexPatterns.saveNew(newIndexPattern);
-
-      // check if there's a default index pattern, if not,
-      // set the newly created one as the default index pattern.
-      await mlContext.indexPatterns.setDefault(newIndexPattern.id as string);
+      await mlContext.indexPatterns.newIndexPatternAndSave({
+        title: indexPatternName,
+      });
 
       addRequestMessage({
         message: i18n.translate(
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index 192552b25d15a1..43f692f9ce5d67 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -104,7 +104,11 @@ export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) {
 
 export function getIndexPatternById(id: string): Promise<IndexPattern> {
   if (indexPatternsContract !== null) {
-    return indexPatternsContract.get(id);
+    if (id) {
+      return indexPatternsContract.get(id);
+    } else {
+      return indexPatternsContract.newIndexPattern({});
+    }
   } else {
     throw new Error('Index patterns are not initialized!');
   }

From fc57286528df271d78731f89b1d46abf1f2fdd33 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 13:55:57 -0500
Subject: [PATCH 19/57] fix index pattern create

---
 .../index_patterns/index_patterns/index_patterns.ts    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 0fd19fd091d015..78aea3c6364d9a 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -342,10 +342,12 @@ export class IndexPatternsService {
 
   async create(indexPattern: IndexPattern, override = false) {
     const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
-    if (dupe && override) {
-      await this.delete(dupe.id);
-    } else {
-      throw new Error('Duplicate index pattern: ${indexPattern.title}');
+    if (dupe) {
+      if (override) {
+        await this.delete(dupe.id);
+      } else {
+        throw new Error(`Duplicate index pattern: ${indexPattern.title}`);
+      }
     }
 
     const body = indexPattern.prepBody();

From c4d9b703c6cd8032f14beea7b0d0c927541de112 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 16:00:38 -0500
Subject: [PATCH 20/57] refactor index patterns methods

---
 .../step_time_field/step_time_field.tsx       |  5 +-
 .../create_index_pattern_wizard.test.tsx      |  3 +-
 .../create_index_pattern_wizard.tsx           | 68 ++++++++--------
 .../public/lib/resolve_saved_objects.ts       | 78 ++++++++++---------
 .../components/import_view/import_view.js     | 22 +-----
 .../step_create/step_create_form.tsx          | 65 ++++++----------
 6 files changed, 108 insertions(+), 133 deletions(-)

diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
index 5d33a08557fed5..3a0a25baf88320 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
@@ -108,8 +108,9 @@ export class StepTimeField extends Component<StepTimeFieldProps, StepTimeFieldSt
     const { indexPattern: pattern } = this.props;
     const { getFetchForWildcardOptions } = this.props.indexPatternCreationType;
 
-    const indexPattern = await this.context.services.data.indexPatterns.make();
-    indexPattern.title = pattern;
+    const indexPattern = await this.context.services.data.indexPatterns.newIndexPattern({
+      title: pattern,
+    });
 
     this.setState({ isFetchingTimeFields: true });
     const fields = await ensureMinimumTime(
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
index a52b7253d0705d..23f6cdf02799f1 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
@@ -154,9 +154,10 @@ describe('CreateIndexPatternWizard', () => {
       create,
       _fetchFields: jest.fn(),
     } as unknown) as IndexPattern;
-    mockContext.data.indexPatterns.make = async () => {
+    mockContext.data.indexPatterns.create = async () => {
       return indexPattern;
     };
+    mockContext.data.indexPatterns.setDefault = jest.fn();
 
     const component = createComponentWithContext(
       CreateIndexPatternWizard,
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
index 4d0f3102a0d70d..a323abbff76f8f 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
@@ -40,6 +40,7 @@ import { ensureMinimumTime, getIndices } from './lib';
 import { IndexPatternCreationConfig } from '../..';
 import { IndexPatternManagmentContextValue } from '../../types';
 import { MatchedItem } from './types';
+import { DuplicateIndexPatternError, IndexPattern } from '../../../../data/public';
 
 interface CreateIndexPatternWizardState {
   step: number;
@@ -156,51 +157,50 @@ export class CreateIndexPatternWizard extends Component<
   };
 
   createIndexPattern = async (timeFieldName: string | undefined, indexPatternId: string) => {
+    let emptyPattern: IndexPattern;
     const { history } = this.props;
     const { indexPattern } = this.state;
 
-    const emptyPattern = await this.context.services.data.indexPatterns.make();
-
-    Object.assign(emptyPattern, {
-      id: indexPatternId,
-      title: indexPattern,
-      timeFieldName,
-      ...this.state.indexPatternCreationType.getIndexPatternMappings(),
-    });
-
-    emptyPattern._fetchFields();
-    const createdId = await emptyPattern.create();
-    if (!createdId) {
-      const confirmMessage = i18n.translate(
-        'indexPatternManagement.indexPattern.titleExistsLabel',
-        {
-          values: { title: emptyPattern.title },
-          defaultMessage: "An index pattern with the title '{title}' already exists.",
-        }
-      );
-
-      const isConfirmed = await this.context.services.overlays.openConfirm(confirmMessage, {
-        confirmButtonText: i18n.translate(
-          'indexPatternManagement.indexPattern.goToPatternButtonLabel',
+    try {
+      emptyPattern = await this.context.services.data.indexPatterns.newIndexPatternAndSave({
+        id: indexPatternId,
+        title: indexPattern,
+        timeFieldName,
+        ...this.state.indexPatternCreationType.getIndexPatternMappings(),
+      });
+    } catch (err) {
+      if (err instanceof DuplicateIndexPatternError) {
+        const confirmMessage = i18n.translate(
+          'indexPatternManagement.indexPattern.titleExistsLabel',
           {
-            defaultMessage: 'Go to existing pattern',
+            values: { title: emptyPattern!.title },
+            defaultMessage: "An index pattern with the title '{title}' already exists.",
           }
-        ),
-      });
+        );
+
+        const isConfirmed = await this.context.services.overlays.openConfirm(confirmMessage, {
+          confirmButtonText: i18n.translate(
+            'indexPatternManagement.indexPattern.goToPatternButtonLabel',
+            {
+              defaultMessage: 'Go to existing pattern',
+            }
+          ),
+        });
 
-      if (isConfirmed) {
-        return history.push(`/patterns/${indexPatternId}`);
+        if (isConfirmed) {
+          return history.push(`/patterns/${indexPatternId}`);
+        } else {
+          return;
+        }
       } else {
-        return;
+        throw err;
       }
     }
 
-    if (!this.context.services.uiSettings.get('defaultIndex')) {
-      await this.context.services.uiSettings.set('defaultIndex', createdId);
-    }
+    await this.context.services.data.indexPatterns.setDefault(emptyPattern.id as string);
 
-    this.context.services.data.indexPatterns.clearCache(createdId);
-    history.push(`/patterns/${createdId}`);
+    this.context.services.data.indexPatterns.clearCache(emptyPattern.id as string);
+    history.push(`/patterns/${emptyPattern.id}`);
   };
 
   goToTimeFieldStep = (indexPattern: string, selectedTimeField?: string) => {
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index 679ea5ffc23eea..594ff6378c6734 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -24,10 +24,11 @@ import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public';
 import {
   DataPublicPluginStart,
   IndexPatternsContract,
-  IIndexPattern,
   injectSearchSourceReferences,
+  IndexPatternSpec,
 } from '../../../data/public';
 import { FailedImport } from './process_import_response';
+import { DuplicateIndexPatternError, IndexPattern } from '../../../data/public';
 
 type SavedObjectsRawDoc = Record<string, any>;
 
@@ -74,7 +75,7 @@ async function importIndexPattern(
   openConfirm: OverlayStart['openConfirm']
 ) {
   // TODO: consolidate this is the code in create_index_pattern_wizard.js
-  const emptyPattern = await indexPatterns.make();
+  // const emptyPattern = await indexPatterns.make();
   const {
     title,
     timeFieldName,
@@ -84,50 +85,53 @@ async function importIndexPattern(
     type,
     typeMeta,
   } = doc._source;
-  const importedIndexPattern = {
+  const indexPatternSpec: IndexPatternSpec = {
     id: doc._id,
     title,
     timeFieldName,
-  } as IIndexPattern;
+  };
+  let emptyPattern: IndexPattern;
   if (type) {
-    importedIndexPattern.type = type;
+    indexPatternSpec.type = type;
   }
-  addJsonFieldToIndexPattern(importedIndexPattern, fields, 'fields', title);
-  addJsonFieldToIndexPattern(importedIndexPattern, fieldFormatMap, 'fieldFormatMap', title);
-  addJsonFieldToIndexPattern(importedIndexPattern, sourceFilters, 'sourceFilters', title);
-  addJsonFieldToIndexPattern(importedIndexPattern, typeMeta, 'typeMeta', title);
-  Object.assign(emptyPattern, importedIndexPattern);
-
-  let newId = await emptyPattern.create(overwriteAll);
-  if (!newId) {
-    // We can override and we want to prompt for confirmation
-    const isConfirmed = await openConfirm(
-      i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteLabel', {
-        values: { title },
-        defaultMessage: "Are you sure you want to overwrite '{title}'?",
-      }),
-      {
-        title: i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteTitle', {
-          defaultMessage: 'Overwrite {type}?',
-          values: { type },
+  addJsonFieldToIndexPattern(indexPatternSpec, fields, 'fields', title);
+  addJsonFieldToIndexPattern(indexPatternSpec, fieldFormatMap, 'fieldFormatMap', title);
+  addJsonFieldToIndexPattern(indexPatternSpec, sourceFilters, 'sourceFilters', title);
+  addJsonFieldToIndexPattern(indexPatternSpec, typeMeta, 'typeMeta', title);
+  try {
+    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec);
+  } catch (err) {
+    if (err instanceof DuplicateIndexPatternError) {
+      // We can override and we want to prompt for confirmation
+      const isConfirmed = await openConfirm(
+        i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteLabel', {
+          values: { title },
+          defaultMessage: "Are you sure you want to overwrite '{title}'?",
         }),
-        confirmButtonText: i18n.translate(
-          'savedObjectsManagement.indexPattern.confirmOverwriteButton',
-          {
-            defaultMessage: 'Overwrite',
-          }
-        ),
-      }
-    );
+        {
+          title: i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteTitle', {
+            defaultMessage: 'Overwrite {type}?',
+            values: { type },
+          }),
+          confirmButtonText: i18n.translate(
+            'savedObjectsManagement.indexPattern.confirmOverwriteButton',
+            {
+              defaultMessage: 'Overwrite',
+            }
+          ),
+        }
+      );
 
-    if (isConfirmed) {
-      newId = (await emptyPattern.create(true)) as string;
-    } else {
-      return;
+      if (isConfirmed) {
+        emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, true);
+      } else {
+        return;
+      }
     }
   }
-  indexPatterns.clearCache(newId);
-  return newId;
+
+  indexPatterns.clearCache(emptyPattern!.id);
+  return emptyPattern!.id;
 }
 
 async function importDocument(obj: SavedObject, doc: SavedObjectsRawDoc, overwriteAll: boolean) {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
index 36b77a5a25e091..469ee5091e8a01 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
@@ -601,34 +601,18 @@ export class ImportView extends Component {
   }
 }
 
-async function createKibanaIndexPattern(
-  indexPatternName,
-  indexPatterns,
-  timeFieldName,
-  kibanaConfig
-) {
+async function createKibanaIndexPattern(indexPatternName, indexPatterns, timeFieldName) {
   try {
-    const emptyPattern = await indexPatterns.make();
-
-    Object.assign(emptyPattern, {
-      id: '',
+    const emptyPattern = await indexPatterns.newIndexPatternAndSave({
       title: indexPatternName,
       timeFieldName,
     });
 
-    const id = await emptyPattern.create();
-
     await indexPatterns.clearCache();
 
-    // check if there's a default index pattern, if not,
-    // set the newly created one as the default index pattern.
-    if (!kibanaConfig.get('defaultIndex')) {
-      await kibanaConfig.set('defaultIndex', id);
-    }
-
     return {
       success: true,
-      id,
+      id: emptyPattern.id,
     };
   } catch (error) {
     return {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index 255a245081d5a2..3d97302e5a3d24 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -39,6 +39,7 @@ import { useApi } from '../../../../hooks/use_api';
 import { useAppDependencies, useToastNotifications } from '../../../../app_dependencies';
 import { RedirectToTransformManagement } from '../../../../common/navigation';
 import { ToastNotificationText } from '../../../../components';
+import { DuplicateIndexPatternError } from '../../../../../../../../../src/plugins/data/public';
 
 export interface StepDetailsExposedState {
   created: boolean;
@@ -79,7 +80,6 @@ export const StepCreateForm: FC<Props> = React.memo(
 
     const deps = useAppDependencies();
     const indexPatterns = deps.data.indexPatterns;
-    const uiSettings = deps.uiSettings;
     const toastNotifications = useToastNotifications();
 
     useEffect(() => {
@@ -183,35 +183,10 @@ export const StepCreateForm: FC<Props> = React.memo(
       const indexPatternName = transformConfig.dest.index;
 
       try {
-        const newIndexPattern = await indexPatterns.make();
-
-        Object.assign(newIndexPattern, {
-          id: '',
+        const newIndexPattern = await indexPatterns.newIndexPatternAndSave({
           title: indexPatternName,
           timeFieldName,
         });
-        const id = await newIndexPattern.create();
-
-        await indexPatterns.clearCache();
-
-        // id returns false if there's a duplicate index pattern.
-        if (id === false) {
-          toastNotifications.addDanger(
-            i18n.translate('xpack.transform.stepCreateForm.duplicateIndexPatternErrorMessage', {
-              defaultMessage:
-                'An error occurred creating the Kibana index pattern {indexPatternName}: The index pattern already exists.',
-              values: { indexPatternName },
-            })
-          );
-          setLoading(false);
-          return;
-        }
-
-        // check if there's a default index pattern, if not,
-        // set the newly created one as the default index pattern.
-        if (!uiSettings.get('defaultIndex')) {
-          await uiSettings.set('defaultIndex', id);
-        }
 
         toastNotifications.addSuccess(
           i18n.translate('xpack.transform.stepCreateForm.createIndexPatternSuccessMessage', {
@@ -220,22 +195,32 @@ export const StepCreateForm: FC<Props> = React.memo(
           })
         );
 
-        setIndexPatternId(id);
+        setIndexPatternId(newIndexPattern.id);
         setLoading(false);
         return true;
       } catch (e) {
-        toastNotifications.addDanger({
-          title: i18n.translate('xpack.transform.stepCreateForm.createIndexPatternErrorMessage', {
-            defaultMessage:
-              'An error occurred creating the Kibana index pattern {indexPatternName}:',
-            values: { indexPatternName },
-          }),
-          text: toMountPoint(
-            <ToastNotificationText overlays={deps.overlays} text={getErrorMessage(e)} />
-          ),
-        });
-        setLoading(false);
-        return false;
+        if (e instanceof DuplicateIndexPatternError) {
+          toastNotifications.addDanger(
+            i18n.translate('xpack.transform.stepCreateForm.duplicateIndexPatternErrorMessage', {
+              defaultMessage:
+                'An error occurred creating the Kibana index pattern {indexPatternName}: The index pattern already exists.',
+              values: { indexPatternName },
+            })
+          );
+        } else {
+          toastNotifications.addDanger({
+            title: i18n.translate('xpack.transform.stepCreateForm.createIndexPatternErrorMessage', {
+              defaultMessage:
+                'An error occurred creating the Kibana index pattern {indexPatternName}:',
+              values: { indexPatternName },
+            }),
+            text: toMountPoint(
+              <ToastNotificationText overlays={deps.overlays} text={getErrorMessage(e)} />
+            ),
+          });
+          setLoading(false);
+          return false;
+        }
       }
     };
 

From a8d0c3678932fa0477d1c5a333583a50f82e6c5f Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 10 Sep 2020 23:39:44 -0500
Subject: [PATCH 21/57] fix tests

---
 .../index_patterns/index_pattern.ts             |  1 +
 .../index_patterns/index_patterns.ts            | 17 +++++++++--------
 .../step_time_field/step_time_field.test.tsx    |  2 +-
 .../create_index_pattern_wizard.test.tsx        | 16 +++++++---------
 .../public/lib/resolve_saved_objects.ts         |  5 ++---
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index f476f574e457a4..e8a1d3b14709b4 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -153,6 +153,7 @@ export class IndexPattern implements IIndexPattern {
     this.sourceFilters = spec.sourceFilters;
 
     this.fields.replaceAll(spec.fields || []);
+    this.type = spec.type;
     this.typeMeta = spec.typeMeta;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 78aea3c6364d9a..e99cde5c0f80ec 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObjectsClientCommon } from '../..';
+import { SavedObjectsClientCommon, DuplicateIndexPatternError } from '../..';
 
 import { createIndexPatternCache } from '.';
 import { IndexPattern } from './index_pattern';
@@ -309,7 +309,7 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async newIndexPattern(spec: IndexPatternSpec): Promise<IndexPattern> {
+  async newIndexPattern(spec: IndexPatternSpec, skipFetchFields = false): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
@@ -326,15 +326,15 @@ export class IndexPatternsService {
       metaFields,
     });
 
-    await indexPattern._fetchFields();
-    // todo should save as separate step
-    // await indexPattern.create();
+    if (!skipFetchFields) {
+      await indexPattern._fetchFields();
+    }
 
     return indexPattern;
   }
 
-  async newIndexPatternAndSave(spec: IndexPatternSpec, override = false) {
-    const indexPattern = await this.newIndexPattern(spec);
+  async newIndexPatternAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
+    const indexPattern = await this.newIndexPattern(spec, skipFetchFields);
     await this.create(indexPattern, override);
     await this.setDefault(indexPattern.id as string);
     return indexPattern;
@@ -346,7 +346,7 @@ export class IndexPatternsService {
       if (override) {
         await this.delete(dupe.id);
       } else {
-        throw new Error(`Duplicate index pattern: ${indexPattern.title}`);
+        throw new DuplicateIndexPatternError(`Duplicate index pattern: ${indexPattern.title}`);
       }
     }
 
@@ -355,6 +355,7 @@ export class IndexPatternsService {
       id: indexPattern.id,
     });
     indexPattern.id = response.id;
+    indexPatternCache.set(indexPattern.id, indexPattern);
     return indexPattern;
   }
 
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
index 86869f57509027..51e060e02bf031 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
@@ -48,7 +48,7 @@ const fields = [
   },
 ];
 mockContext.data.indexPatterns = {
-  make: () => ({
+  newIndexPattern: () => ({
     fieldsFetcher: {
       fetchForWildcard: jest.fn().mockReturnValue(Promise.resolve(fields)),
     },
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
index 23f6cdf02799f1..c3be66ce82e73e 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
@@ -143,7 +143,9 @@ describe('CreateIndexPatternWizard', () => {
   });
 
   test('invokes the provided services when creating an index pattern', async () => {
-    const create = jest.fn().mockImplementation(() => 'id');
+    const newIndexPatternAndSave = jest.fn().mockImplementation(async () => {
+      return indexPattern;
+    });
     const clear = jest.fn();
     mockContext.data.indexPatterns.clearCache = clear;
     const indexPattern = ({
@@ -151,12 +153,9 @@ describe('CreateIndexPatternWizard', () => {
       title: 'my-fake-index-pattern',
       timeFieldName: 'timestamp',
       fields: [],
-      create,
       _fetchFields: jest.fn(),
     } as unknown) as IndexPattern;
-    mockContext.data.indexPatterns.create = async () => {
-      return indexPattern;
-    };
+    mockContext.data.indexPatterns.newIndexPatternAndSave = newIndexPatternAndSave;
     mockContext.data.indexPatterns.setDefault = jest.fn();
 
     const component = createComponentWithContext(
@@ -167,9 +166,8 @@ describe('CreateIndexPatternWizard', () => {
 
     component.setState({ indexPattern: 'foo' });
     await (component.instance() as CreateIndexPatternWizard).createIndexPattern(undefined, 'id');
-    expect(mockContext.uiSettings.get).toBeCalled();
-    expect(create).toBeCalled();
-    expect(clear).toBeCalledWith('id');
-    expect(routeComponentPropsMock.history.push).toBeCalledWith(`/patterns/id`);
+    expect(newIndexPatternAndSave).toBeCalled();
+    expect(clear).toBeCalledWith('1');
+    expect(routeComponentPropsMock.history.push).toBeCalledWith(`/patterns/1`);
   });
 });
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index 594ff6378c6734..2b9655c2b6f01b 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -75,7 +75,6 @@ async function importIndexPattern(
   openConfirm: OverlayStart['openConfirm']
 ) {
   // TODO: consolidate this is the code in create_index_pattern_wizard.js
-  // const emptyPattern = await indexPatterns.make();
   const {
     title,
     timeFieldName,
@@ -99,7 +98,7 @@ async function importIndexPattern(
   addJsonFieldToIndexPattern(indexPatternSpec, sourceFilters, 'sourceFilters', title);
   addJsonFieldToIndexPattern(indexPatternSpec, typeMeta, 'typeMeta', title);
   try {
-    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec);
+    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, false, true);
   } catch (err) {
     if (err instanceof DuplicateIndexPatternError) {
       // We can override and we want to prompt for confirmation
@@ -123,7 +122,7 @@ async function importIndexPattern(
       );
 
       if (isConfirmed) {
-        emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, true);
+        emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, true, true);
       } else {
         return;
       }

From b4bcfa803c01a2a5acc97649479a1db695572088 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 11 Sep 2020 13:57:34 -0500
Subject: [PATCH 22/57] remove comment

---
 .../index_patterns/index_patterns.ts          | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index e99cde5c0f80ec..952f6b038a58c2 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -227,12 +227,6 @@ export class IndexPatternsService {
       return cache;
     }
 
-    //
-    // const indexPattern = await this.make(id);
-    // get saved object, convert to spec, create new IndexPattern instance
-    //
-    //  progress - no longer calls `make`, no longer calls `init`
-    // todo - create index pattern isn't  showing field list
     const {
       version,
       attributes: {
@@ -282,7 +276,6 @@ export class IndexPatternsService {
       type,
     };
 
-    // return indexPatternCache.set(id, indexPattern);
     const indexPattern = await this.specToIndexPattern(spec);
     indexPatternCache.set(id, indexPattern);
     return indexPattern;
@@ -359,15 +352,7 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async save(indexPattern: IndexPattern, overwrite = false) {
-    // if(overwrite || !indexPattern.id){
-    // saveNew
-    // } else {
-    return this.update(indexPattern);
-    // }
-  }
-
-  async update(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
+  async save(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
     if (!indexPattern.id) return;
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
@@ -447,7 +432,7 @@ export class IndexPatternsService {
             indexPatternCache.clear(indexPattern.id!);
 
             // Try the save again
-            return this.update(indexPattern, saveAttempts);
+            return this.save(indexPattern, saveAttempts);
           });
         }
         throw err;

From f0468949a0c5797d871220a4d27b1a0c405aa547 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 11 Sep 2020 14:52:55 -0500
Subject: [PATCH 23/57] fix saved object import

---
 .../public/lib/resolve_saved_objects.ts                       | 4 ++--
 test/functional/apps/management/_import_objects.js            | 4 ++--
 .../use_create_analytics_form/use_create_analytics_form.ts    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index 2b9655c2b6f01b..a7c835e766dd95 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -71,7 +71,7 @@ function addJsonFieldToIndexPattern(
 async function importIndexPattern(
   doc: SavedObjectsRawDoc,
   indexPatterns: IndexPatternsContract,
-  overwriteAll: boolean,
+  overwriteAll: boolean = false,
   openConfirm: OverlayStart['openConfirm']
 ) {
   // TODO: consolidate this is the code in create_index_pattern_wizard.js
@@ -98,7 +98,7 @@ async function importIndexPattern(
   addJsonFieldToIndexPattern(indexPatternSpec, sourceFilters, 'sourceFilters', title);
   addJsonFieldToIndexPattern(indexPatternSpec, typeMeta, 'typeMeta', title);
   try {
-    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, false, true);
+    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, overwriteAll, true);
   } catch (err) {
     if (err instanceof DuplicateIndexPatternError) {
       // We can override and we want to prompt for confirmation
diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js
index 3941b117e6efe8..d0d1580f394f2a 100644
--- a/test/functional/apps/management/_import_objects.js
+++ b/test/functional/apps/management/_import_objects.js
@@ -169,7 +169,7 @@ export default function ({ getService, getPageObjects }) {
         expect(isSavedObjectImported).to.be(false);
       });
 
-      it('should import saved objects with index patterns when index patterns already exists', async () => {
+      it('should import saved objects with index patterns when index patterns already exists - ndjson', async () => {
         // First, import the objects
         await PageObjects.savedObjects.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.ndjson')
@@ -387,7 +387,7 @@ export default function ({ getService, getPageObjects }) {
         expect(isSavedObjectImported).to.be(false);
       });
 
-      it('should import saved objects with index patterns when index patterns already exists', async () => {
+      it('should import saved objects with index patterns when index patterns already exists - json', async () => {
         // First, import the objects
         await PageObjects.savedObjects.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.json')
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 2540506847fb50..1f2fecc6bedddd 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -163,7 +163,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
         });
       } else {
         addRequestMessage({
-          error: getErrorMessage(e),
+          error: extractErrorMessage(e),
           message: i18n.translate(
             'xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage',
             {

From 7dc3e8cf015f6765ec507d3d288aaa5c452401a8 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 00:15:32 -0500
Subject: [PATCH 24/57] fixed jest test

---
 .../index_patterns/index_pattern.ts           |   3 +-
 .../index_patterns/index_patterns.test.ts     |  13 +-
 .../index_patterns/index_patterns.ts          | 130 ++++++++----------
 3 files changed, 67 insertions(+), 79 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index e8a1d3b14709b4..642226f713a01a 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -234,6 +234,7 @@ export class IndexPattern implements IIndexPattern {
       }
     }
     this.typeMeta = spec.typeMeta;
+    this.type = spec.type;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
       return this.deserializeFieldFormatMap(mapping);
@@ -268,7 +269,6 @@ export class IndexPattern implements IIndexPattern {
     }
     this.version = response.version;
     this.fields.replaceAll(response.fields);
-    // return this.indexFields(response.fields);
   }
 
   getComputedFields() {
@@ -357,6 +357,7 @@ export class IndexPattern implements IIndexPattern {
       sourceFilters: this.sourceFilters,
       fields: this.fields.toSpec({ getFormatterForField: this.getFormatterForField.bind(this) }),
       typeMeta: this.typeMeta,
+      type: this.type,
     };
   }
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index f4ca6f510d13c9..277c6fac61b59b 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -64,11 +64,17 @@ describe('IndexPatterns', () => {
       .fn()
       .mockImplementation(() => Promise.resolve(indexPatternObj) as Promise<SavedObject<any>>);
 */
-    savedObjectsClient.get = jest.fn().mockImplementation(() => object);
+    // savedObjectsClient.get = jest.fn().mockImplementation(() => object);
     savedObjectsClient.create = jest.fn();
+    savedObjectsClient.get = jest.fn().mockImplementation(async (type, id) => ({
+      id: object.id,
+      version: object.version,
+      attributes: object.attributes,
+    }));
     savedObjectsClient.update = jest
       .fn()
       .mockImplementation(async (type, id, body, { version }) => {
+        // debugger;
         if (object.version !== version) {
           throw new Object({
             res: {
@@ -156,12 +162,13 @@ describe('IndexPatterns', () => {
     });
 
     // Create a normal index patterns
-    const pattern = await indexPatterns.make('foo');
+    const pattern = await indexPatterns.get('foo');
 
     expect(pattern.version).toBe('fooa');
+    indexPatterns.clearCache();
 
     // Create the same one - we're going to handle concurrency
-    const samePattern = await indexPatterns.make('foo');
+    const samePattern = await indexPatterns.get('foo');
 
     expect(samePattern.version).toBe('fooaa');
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 952f6b038a58c2..0a70c0bad6a45c 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -247,7 +247,9 @@ export class IndexPatternsService {
 
     let parsedFields = fields ? JSON.parse(fields) : [];
     const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
-    parsedFields = this.isFieldRefreshRequired(parsedFields)
+    // todo need to save refreshed field list
+    const isFieldRefreshRequired = this.isFieldRefreshRequired(parsedFields);
+    parsedFields = isFieldRefreshRequired
       ? await this.refreshFields(parsedFields, id, title, {
           pattern: title,
           metaFields,
@@ -278,6 +280,16 @@ export class IndexPatternsService {
 
     const indexPattern = await this.specToIndexPattern(spec);
     indexPatternCache.set(id, indexPattern);
+    if (isFieldRefreshRequired) {
+      try {
+        this.save(indexPattern);
+      } catch (err) {
+        // todo display error
+        throw err;
+      }
+    }
+    // todo better way to do this
+    indexPattern.originalBody = indexPattern.prepBody();
     return indexPattern;
   };
 
@@ -354,11 +366,13 @@ export class IndexPatternsService {
 
   async save(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
     if (!indexPattern.id) return;
-    const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
-    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
+    // const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
+    // const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
+    // get the list of attributes
     const body = indexPattern.prepBody();
 
+    // get changed keys
     const originalChangedKeys: string[] = [];
     Object.entries(body).forEach(([key, value]) => {
       if (value !== indexPattern.originalBody[key]) {
@@ -374,92 +388,58 @@ export class IndexPatternsService {
       })
       .catch(async (err) => {
         if (err?.res?.status === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
-          const samePattern = new IndexPattern({
-            savedObjectsClient: this.savedObjectsClient,
-            apiClient: this.apiClient,
-            patternCache: indexPatternCache,
-            fieldFormats: this.fieldFormats,
-            indexPatternsService: this,
-            onNotification: this.onNotification,
-            onError: this.onError,
-            shortDotsEnable,
-            metaFields,
+          const samePattern = await this.get(indexPattern.id as string);
+          // What keys changed from now and what the server returned
+          const updatedBody = samePattern.prepBody();
+
+          // Build a list of changed keys from the server response
+          // and ensure we ignore the key if the server response
+          // is the same as the original response (since that is expected
+          // if we made a change in that key)
+
+          const serverChangedKeys: string[] = [];
+          Object.entries(updatedBody).forEach(([key, value]) => {
+            if (value !== (body as any)[key] && value !== indexPattern.originalBody[key]) {
+              serverChangedKeys.push(key);
+            }
           });
 
-          samePattern.init().then(() => {
-            // What keys changed from now and what the server returned
-            const updatedBody = samePattern.prepBody();
-
-            // Build a list of changed keys from the server response
-            // and ensure we ignore the key if the server response
-            // is the same as the original response (since that is expected
-            // if we made a change in that key)
-
-            const serverChangedKeys: string[] = [];
-            Object.entries(updatedBody).forEach(([key, value]) => {
-              if (value !== (body as any)[key] && value !== indexPattern.originalBody[key]) {
-                serverChangedKeys.push(key);
+          let unresolvedCollision = false;
+          for (const originalKey of originalChangedKeys) {
+            for (const serverKey of serverChangedKeys) {
+              if (originalKey === serverKey) {
+                unresolvedCollision = true;
+                break;
               }
-            });
-
-            let unresolvedCollision = false;
-            for (const originalKey of originalChangedKeys) {
-              for (const serverKey of serverChangedKeys) {
-                if (originalKey === serverKey) {
-                  unresolvedCollision = true;
-                  break;
-                }
-              }
-            }
-
-            if (unresolvedCollision) {
-              const title = i18n.translate('data.indexPatterns.unableWriteLabel', {
-                defaultMessage:
-                  'Unable to write index pattern! Refresh the page to get the most up to date changes for this index pattern.',
-              });
-
-              this.onNotification({ title, color: 'danger' });
-              throw err;
             }
+          }
 
-            // Set the updated response on this object
-            serverChangedKeys.forEach((key) => {
-              (indexPattern as any)[key] = (samePattern as any)[key];
+          if (unresolvedCollision) {
+            const title = i18n.translate('data.indexPatterns.unableWriteLabel', {
+              defaultMessage:
+                'Unable to write index pattern! Refresh the page to get the most up to date changes for this index pattern.',
             });
-            indexPattern.version = samePattern.version;
 
-            // Clear cache
-            indexPatternCache.clear(indexPattern.id!);
+            this.onNotification({ title, color: 'danger' });
+            throw err;
+          }
 
-            // Try the save again
-            return this.save(indexPattern, saveAttempts);
+          // Set the updated response on this object
+          serverChangedKeys.forEach((key) => {
+            (indexPattern as any)[key] = (samePattern as any)[key];
           });
+          indexPattern.version = samePattern.version;
+
+          // Clear cache
+          indexPatternCache.clear(indexPattern.id!);
+
+          // Try the save again
+          return this.save(indexPattern, saveAttempts);
         }
         throw err;
       });
   }
 
-  // kill this
-  async make(id?: string): Promise<IndexPattern> {
-    const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
-    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
-
-    const indexPattern = new IndexPattern({
-      spec: { id },
-      savedObjectsClient: this.savedObjectsClient,
-      apiClient: this.apiClient,
-      patternCache: indexPatternCache,
-      fieldFormats: this.fieldFormats,
-      indexPatternsService: this,
-      onNotification: this.onNotification,
-      onError: this.onError,
-      shortDotsEnable,
-      metaFields,
-    });
-
-    return indexPattern.init();
-  }
-
   /**
    * Deletes an index pattern from .kibana index
    * @param indexPatternId: Id of kibana Index Pattern to delete

From 584ee3366a24b88350fec2579dea3f413afd1756 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 00:45:49 -0500
Subject: [PATCH 25/57] fix resolve conflict

---
 .../index_patterns/index_patterns.ts          | 55 ++++++++++++++-----
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 0a70c0bad6a45c..9249be405afaeb 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -220,8 +220,6 @@ export class IndexPatternsService {
   };
 
   get = async (id: string): Promise<IndexPattern> => {
-    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
-
     const cache = indexPatternCache.get(id);
     if (cache) {
       return cache;
@@ -245,19 +243,38 @@ export class IndexPatternsService {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
+    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
     let parsedFields = fields ? JSON.parse(fields) : [];
     const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
-    // todo need to save refreshed field list
+
     const isFieldRefreshRequired = this.isFieldRefreshRequired(parsedFields);
-    parsedFields = isFieldRefreshRequired
-      ? await this.refreshFields(parsedFields, id, title, {
-          pattern: title,
-          metaFields,
-          type,
-          params: parsedTypeMeta && parsedTypeMeta.params,
-        })
-      : parsedFields;
-    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
+    let isSaveRequired = isFieldRefreshRequired;
+    try {
+      parsedFields = isFieldRefreshRequired
+        ? await this.refreshFields(parsedFields, id, title, {
+            pattern: title,
+            metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
+            type,
+            params: parsedTypeMeta && parsedTypeMeta.params,
+          })
+        : parsedFields;
+    } catch (err) {
+      isSaveRequired = false;
+      if (err instanceof IndexPatternMissingIndices) {
+        this.onNotification({
+          title: (err as any).message,
+          color: 'danger',
+          iconType: 'alert',
+        });
+      } else {
+        this.onError(err, {
+          title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
+            defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})',
+            values: { id, title },
+          }),
+        });
+      }
+    }
 
     Object.entries(parsedFieldFormatMap).forEach(([fieldName, value]) => {
       const field = parsedFields.find((fld: FieldSpec) => fld.name === fieldName);
@@ -280,12 +297,20 @@ export class IndexPatternsService {
 
     const indexPattern = await this.specToIndexPattern(spec);
     indexPatternCache.set(id, indexPattern);
-    if (isFieldRefreshRequired) {
+    if (isSaveRequired) {
       try {
         this.save(indexPattern);
       } catch (err) {
-        // todo display error
-        throw err;
+        this.onError(err, {
+          title: i18n.translate('data.indexPatterns.fetchFieldSaveErrorTitle', {
+            defaultMessage:
+              'Error saving after fetching fields for index pattern {title} (ID: {id})',
+            values: {
+              id: indexPattern.id,
+              title: indexPattern.title,
+            },
+          }),
+        });
       }
     }
     // todo better way to do this

From 217229b1e2b75f2228a63e9335f58999af8b33ab Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 07:16:31 -0500
Subject: [PATCH 26/57] update snapshot and remove indexPattern.create

---
 .../__snapshots__/index_pattern.test.ts.snap  |  1 +
 .../index_patterns/index_pattern.test.ts      |  8 ----
 .../index_patterns/index_pattern.ts           | 41 +------------------
 .../index_patterns/index_patterns.test.ts     | 18 --------
 .../index_patterns/index_patterns.ts          |  4 --
 5 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
index 1871627da76de6..2453611cf02a61 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
@@ -632,6 +632,7 @@ Object {
   "sourceFilters": undefined,
   "timeFieldName": "timestamp",
   "title": "title",
+  "type": undefined,
   "typeMeta": undefined,
   "version": 2,
 }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index 61bc81f0905797..bb7a2d1e2784cf 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -96,13 +96,6 @@ const savedObjectsClient = {
   }),
 };
 
-const patternCache = {
-  clear: jest.fn(),
-  get: jest.fn(),
-  set: jest.fn(),
-  clearAll: jest.fn(),
-};
-
 const apiClient = {
   _getUrl: jest.fn(),
   getFieldsForTimePattern: jest.fn(),
@@ -115,7 +108,6 @@ function create(id: string, payload?: any): Promise<IndexPattern> {
     spec: { id },
     savedObjectsClient: savedObjectsClient as any,
     apiClient,
-    patternCache,
     fieldFormats: fieldFormatsMock,
     indexPatternsService: {} as IndexPatternsService,
     onNotification: () => {},
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 642226f713a01a..2fe3446cbc443a 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -30,14 +30,12 @@ import {
   FieldTypeUnknownError,
   FieldFormatNotFoundError,
 } from '../../../common';
-import { findByTitle } from '../utils';
 import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields';
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
 import { OnNotification, OnError, IIndexPatternsApiClient, IndexPatternAttributes } from '../types';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
-import { PatternCache } from './_pattern_cache';
 import { expandShorthand, FieldMappingSpec, MappingObject } from '../../field_mapping';
 import { IndexPatternSpec, TypeMeta, FieldSpec, SourceFilter } from '../types';
 import { SerializedFieldFormat } from '../../../../expressions/common';
@@ -49,7 +47,6 @@ interface IndexPatternDeps {
   spec?: IndexPatternSpec;
   savedObjectsClient: SavedObjectsClientCommon;
   apiClient: IIndexPatternsApiClient;
-  patternCache: PatternCache;
   fieldFormats: FieldFormatsStartCommon;
   indexPatternsService: IndexPatternsService;
   onNotification: OnNotification;
@@ -75,7 +72,6 @@ export class IndexPattern implements IIndexPattern {
   // todo rename
   public version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
-  private patternCache: PatternCache;
   public sourceFilters?: SourceFilter[];
   // todo make read  only, update via  method or factor out
   public originalBody: { [key: string]: any } = {};
@@ -112,7 +108,6 @@ export class IndexPattern implements IIndexPattern {
     spec = {},
     savedObjectsClient,
     apiClient,
-    patternCache,
     fieldFormats,
     indexPatternsService,
     onNotification,
@@ -122,7 +117,6 @@ export class IndexPattern implements IIndexPattern {
   }: IndexPatternDeps) {
     // set dependencies
     this.savedObjectsClient = savedObjectsClient;
-    this.patternCache = patternCache;
     this.fieldFormats = fieldFormats;
     this.indexPatternsService = indexPatternsService;
     // set callbacks
@@ -494,39 +488,7 @@ export class IndexPattern implements IIndexPattern {
     );
   }
 
-  // todo remove
-  async create(allowOverride: boolean = false) {
-    const _create = async (duplicateId?: string) => {
-      if (duplicateId) {
-        this.patternCache.clear(duplicateId);
-        await this.savedObjectsClient.delete(savedObjectType, duplicateId);
-      }
-
-      const body = this.prepBody();
-      const response = await this.savedObjectsClient.create(savedObjectType, body, { id: this.id });
-
-      this.id = response.id;
-      return response.id;
-    };
-
-    // search by title
-    // if dupe and override, delete index pattern
-    // if no dupe, create
-
-    const potentialDuplicateByTitle = await findByTitle(this.savedObjectsClient, this.title);
-    // If there is potentially duplicate title, just create it
-    if (!potentialDuplicateByTitle) {
-      return await _create();
-    }
-
-    // We found a duplicate but we aren't allowing override, show the warn modal
-    if (!allowOverride) {
-      return false;
-    }
-
-    return await _create(potentialDuplicateByTitle.id);
-  }
-
+  // kill
   async _fetchFields() {
     const fields = await this.fieldsFetcher.fetch(this);
     const scripted = this.getScriptedFields().map((field) => field.spec);
@@ -541,6 +503,7 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
+  // kill
   refreshFields() {
     return (
       this._fetchFields()
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index 277c6fac61b59b..163c7956147e9b 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -31,17 +31,6 @@ const createFieldsFetcher = jest.fn().mockImplementation(() => ({
 }));
 
 const fieldFormats = fieldFormatsMock;
-
-/*
-jest.mock('./index_pattern', () => {
-  class IndexPattern {
-    init = async () => {
-      return this;
-    };
-    initFromSpec = async () => {};
-  }
-});
-*/
 let object: any = {};
 
 function setDocsourcePayload(id: string | null, providedPayload: any) {
@@ -59,12 +48,6 @@ describe('IndexPatterns', () => {
       () => Promise.resolve([indexPatternObj]) as Promise<Array<SavedObject<any>>>
     );
     savedObjectsClient.delete = jest.fn(() => Promise.resolve({}) as Promise<any>);
-    /*
-    savedObjectsClient.get = jest
-      .fn()
-      .mockImplementation(() => Promise.resolve(indexPatternObj) as Promise<SavedObject<any>>);
-*/
-    // savedObjectsClient.get = jest.fn().mockImplementation(() => object);
     savedObjectsClient.create = jest.fn();
     savedObjectsClient.get = jest.fn().mockImplementation(async (type, id) => ({
       id: object.id,
@@ -74,7 +57,6 @@ describe('IndexPatterns', () => {
     savedObjectsClient.update = jest
       .fn()
       .mockImplementation(async (type, id, body, { version }) => {
-        // debugger;
         if (object.version !== version) {
           throw new Object({
             res: {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 9249be405afaeb..61b29d1e692f2e 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -326,7 +326,6 @@ export class IndexPatternsService {
       spec,
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
-      patternCache: indexPatternCache,
       fieldFormats: this.fieldFormats,
       indexPatternsService: this,
       onNotification: this.onNotification,
@@ -347,7 +346,6 @@ export class IndexPatternsService {
       spec,
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
-      patternCache: indexPatternCache,
       fieldFormats: this.fieldFormats,
       indexPatternsService: this,
       onNotification: this.onNotification,
@@ -391,8 +389,6 @@ export class IndexPatternsService {
 
   async save(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
     if (!indexPattern.id) return;
-    // const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
-    // const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
     // get the list of attributes
     const body = indexPattern.prepBody();

From 9fb9e4759bae68e7009b5c7d89c60d21b2d4f192 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 07:21:36 -0500
Subject: [PATCH 27/57] update docs

---
 ...-data-public.indexpattern._constructor_.md |  4 ++--
 ...plugins-data-public.indexpattern.create.md | 22 -------------------
 ...plugin-plugins-data-public.indexpattern.md |  3 +--
 src/plugins/data/public/public.api.md         |  4 +---
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.create.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
index 385b580ae34041..b776892ab31c61 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+constructor({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { spec, savedObjectsClient, apiClient, patternCache, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
+|  { spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.create.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.create.md
deleted file mode 100644
index 5c122b835f59d4..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.create.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [create](./kibana-plugin-plugins-data-public.indexpattern.create.md)
-
-## IndexPattern.create() method
-
-<b>Signature:</b>
-
-```typescript
-create(allowOverride?: boolean): Promise<string | false>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  allowOverride | <code>boolean</code> |  |
-
-<b>Returns:</b>
-
-`Promise<string | false>`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index bac69ce66f01a8..f45a450efc3485 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 
@@ -43,7 +43,6 @@ export declare class IndexPattern implements IIndexPattern
 |  --- | --- | --- |
 |  [\_fetchFields()](./kibana-plugin-plugins-data-public.indexpattern._fetchfields.md) |  |  |
 |  [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) |  |  |
-|  [create(allowOverride)](./kibana-plugin-plugins-data-public.indexpattern.create.md) |  |  |
 |  [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) |  |  |
 |  [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) |  |  |
 |  [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) |  |  |
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index b9184de13a05f9..7736ee4114c06e 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1099,12 +1099,10 @@ export type IMetricAggType = MetricAggType;
 // @public (undocumented)
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
-    constructor({ spec, savedObjectsClient, apiClient, patternCache, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+    constructor({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
     addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
     // (undocumented)
-    create(allowOverride?: boolean): Promise<string | false>;
-    // (undocumented)
     _fetchFields(): Promise<void>;
     // (undocumented)
     fieldFormatMap: any;

From 1280399a41b74fbaa707e53141544d520bcb93ab Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 09:06:14 -0500
Subject: [PATCH 28/57] file upload should overwrite and remove clearCache from
 ml index pattern usage

---
 .../plugins/file_upload/public/util/indexing_service.js  | 9 ++++++---
 .../file_based/components/import_view/import_view.js     | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/file_upload/public/util/indexing_service.js b/x-pack/plugins/file_upload/public/util/indexing_service.js
index aadea0fdcdb6d3..3c68c73298f206 100644
--- a/x-pack/plugins/file_upload/public/util/indexing_service.js
+++ b/x-pack/plugins/file_upload/public/util/indexing_service.js
@@ -190,9 +190,12 @@ async function chunkDataAndWriteToIndex({ id, index, data, mappings, settings })
 
 export async function createIndexPattern(indexPatternName) {
   try {
-    const indexPattern = await indexPatternService.newIndexPatternAndSave({
-      title: indexPatternName,
-    });
+    const indexPattern = await indexPatternService.newIndexPatternAndSave(
+      {
+        title: indexPatternName,
+      },
+      true
+    );
     return {
       success: true,
       id: indexPattern.id,
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
index 469ee5091e8a01..4e061a438ea05c 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
@@ -608,8 +608,6 @@ async function createKibanaIndexPattern(indexPatternName, indexPatterns, timeFie
       timeFieldName,
     });
 
-    await indexPatterns.clearCache();
-
     return {
       success: true,
       id: emptyPattern.id,

From da2bda84366da062ce4ba46e4badf75dbb253f33 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sat, 12 Sep 2020 11:47:30 -0500
Subject: [PATCH 29/57] fix transform creation

---
 .../components/step_create/step_create_form.tsx      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index 7f132e51316834..182a75ccf1ff70 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -183,10 +183,14 @@ export const StepCreateForm: FC<Props> = React.memo(
       const indexPatternName = transformConfig.dest.index;
 
       try {
-        const newIndexPattern = await indexPatterns.newIndexPatternAndSave({
-          title: indexPatternName,
-          timeFieldName,
-        });
+        const newIndexPattern = await indexPatterns.newIndexPatternAndSave(
+          {
+            title: indexPatternName,
+            timeFieldName,
+          },
+          false,
+          true
+        );
 
         toastNotifications.addSuccess(
           i18n.translate('xpack.transform.stepCreateForm.createIndexPatternSuccessMessage', {

From 8dd5104ce47826e97c4358ecb9e8b38d9d6bc367 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 13 Sep 2020 01:04:11 -0500
Subject: [PATCH 30/57] move field fetcher to server, remove init

---
 ...-data-public.indexpattern._constructor_.md |   4 +-
 ...s-data-public.indexpattern._fetchfields.md |  15 ---
 ...n-plugins-data-public.indexpattern.init.md |  15 ---
 ...plugin-plugins-data-public.indexpattern.md |   5 +-
 ...-data-public.indexpattern.refreshfields.md |  15 ---
 src/core/public/public.api.md                 |   1 -
 src/core/server/server.api.md                 |   1 -
 .../index_patterns/_fields_fetcher.ts         |  16 +--
 .../index_patterns/index_pattern.ts           | 119 +-----------------
 .../index_patterns/index_patterns.ts          |  46 ++++---
 src/plugins/data/public/public.api.md         |   8 +-
 .../step_time_field/step_time_field.tsx       |   9 +-
 .../edit_index_pattern/edit_index_pattern.tsx |   4 +-
 13 files changed, 50 insertions(+), 208 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._fetchfields.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
index b776892ab31c61..5a7b261eb1ba9e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+constructor({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
+|  { spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._fetchfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._fetchfields.md
deleted file mode 100644
index 8fff8baa711399..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._fetchfields.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [\_fetchFields](./kibana-plugin-plugins-data-public.indexpattern._fetchfields.md)
-
-## IndexPattern.\_fetchFields() method
-
-<b>Signature:</b>
-
-```typescript
-_fetchFields(): Promise<void>;
-```
-<b>Returns:</b>
-
-`Promise<void>`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
deleted file mode 100644
index 595992dc82b749..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [init](./kibana-plugin-plugins-data-public.indexpattern.init.md)
-
-## IndexPattern.init() method
-
-<b>Signature:</b>
-
-```typescript
-init(): Promise<this>;
-```
-<b>Returns:</b>
-
-`Promise<this>`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index f45a450efc3485..b009430368fe2d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 
@@ -41,7 +41,6 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [\_fetchFields()](./kibana-plugin-plugins-data-public.indexpattern._fetchfields.md) |  |  |
 |  [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) |  |  |
 |  [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) |  |  |
 |  [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) |  |  |
@@ -51,7 +50,6 @@ export declare class IndexPattern implements IIndexPattern
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
-|  [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
 |  [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |
@@ -59,7 +57,6 @@ export declare class IndexPattern implements IIndexPattern
 |  [isWildcard()](./kibana-plugin-plugins-data-public.indexpattern.iswildcard.md) |  |  |
 |  [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) |  |  |
 |  [prepBody()](./kibana-plugin-plugins-data-public.indexpattern.prepbody.md) |  |  |
-|  [refreshFields()](./kibana-plugin-plugins-data-public.indexpattern.refreshfields.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
 |  [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) |  |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
deleted file mode 100644
index 271d0c45a42441..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.refreshfields.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [refreshFields](./kibana-plugin-plugins-data-public.indexpattern.refreshfields.md)
-
-## IndexPattern.refreshFields() method
-
-<b>Signature:</b>
-
-```typescript
-refreshFields(): Promise<void | Error | never[] | undefined>;
-```
-<b>Returns:</b>
-
-`Promise<void | Error | never[] | undefined>`
-
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index c473ea67d9bcdc..2da16f9fd1f98e 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -7,7 +7,6 @@
 import { Action } from 'history';
 import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
 import Boom from 'boom';
-import { ErrorToastOptions as ErrorToastOptions_2 } from 'src/core/public/notifications';
 import { EuiBreadcrumb } from '@elastic/eui';
 import { EuiButtonEmptyProps } from '@elastic/eui';
 import { EuiConfirmModalProps } from '@elastic/eui';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index ec457704e89c7d..ac6b298e860c96 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -40,7 +40,6 @@ import { DeleteScriptParams } from 'elasticsearch';
 import { DeleteTemplateParams } from 'elasticsearch';
 import { DetailedPeerCertificate } from 'tls';
 import { Duration } from 'moment';
-import { ErrorToastOptions } from 'src/core/public/notifications';
 import { ExistsParams } from 'elasticsearch';
 import { ExplainParams } from 'elasticsearch';
 import { FieldStatsParams } from 'elasticsearch';
diff --git a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts b/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
index 4eba0576ff2352..6b56957abc5a69 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
@@ -17,27 +17,15 @@
  * under the License.
  */
 
-import { IndexPattern } from '.';
 import { GetFieldsOptions, IIndexPatternsApiClient } from '../types';
 
 /** @internal */
-export const createFieldsFetcher = (
-  indexPattern: IndexPattern,
-  apiClient: IIndexPatternsApiClient,
-  metaFields: string[] = []
-) => {
+export const createFieldsFetcher = (apiClient: IIndexPatternsApiClient) => {
   const fieldFetcher = {
-    fetch: (options: GetFieldsOptions) => {
-      return fieldFetcher.fetchForWildcard(indexPattern.title, {
-        ...options,
-        type: indexPattern.type,
-        params: indexPattern.typeMeta && indexPattern.typeMeta.params,
-      });
-    },
     fetchForWildcard: (pattern: string, options: GetFieldsOptions = {}) => {
       return apiClient.getFieldsForWildcard({
         pattern,
-        metaFields,
+        metaFields: options.metaFields,
         type: options.type,
         params: options.params || {},
       });
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 2fe3446cbc443a..f517f884bf81da 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -20,8 +20,7 @@
 import _, { each, reject } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
-import { DuplicateField, SavedObjectNotFound } from '../../../../kibana_utils/common';
-import { IndexPatternMissingIndices } from '../lib';
+import { DuplicateField } from '../../../../kibana_utils/common';
 
 import {
   ES_FIELD_TYPES,
@@ -34,12 +33,11 @@ import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields'
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
-import { OnNotification, OnError, IIndexPatternsApiClient, IndexPatternAttributes } from '../types';
+import { OnNotification, IIndexPatternsApiClient } from '../types';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
-import { expandShorthand, FieldMappingSpec, MappingObject } from '../../field_mapping';
+import { expandShorthand, MappingObject } from '../../field_mapping';
 import { IndexPatternSpec, TypeMeta, FieldSpec, SourceFilter } from '../types';
 import { SerializedFieldFormat } from '../../../../expressions/common';
-import { IndexPatternsService } from '..';
 
 const savedObjectType = 'index-pattern';
 
@@ -48,9 +46,7 @@ interface IndexPatternDeps {
   savedObjectsClient: SavedObjectsClientCommon;
   apiClient: IIndexPatternsApiClient;
   fieldFormats: FieldFormatsStartCommon;
-  indexPatternsService: IndexPatternsService;
   onNotification: OnNotification;
-  onError: OnError;
   shortDotsEnable: boolean;
   metaFields: string[];
 }
@@ -76,11 +72,9 @@ export class IndexPattern implements IIndexPattern {
   // todo make read  only, update via  method or factor out
   public originalBody: { [key: string]: any } = {};
   public fieldsFetcher: any; // probably want to factor out any direct usage and change to private
-  private indexPatternsService: IndexPatternsService;
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
   private onNotification: OnNotification;
-  private onError: OnError;
 
   private mapping: MappingObject = expandShorthand({
     title: ES_FIELD_TYPES.TEXT,
@@ -109,26 +103,22 @@ export class IndexPattern implements IIndexPattern {
     savedObjectsClient,
     apiClient,
     fieldFormats,
-    indexPatternsService,
     onNotification,
-    onError,
     shortDotsEnable = false,
     metaFields = [],
   }: IndexPatternDeps) {
     // set dependencies
     this.savedObjectsClient = savedObjectsClient;
     this.fieldFormats = fieldFormats;
-    this.indexPatternsService = indexPatternsService;
     // set callbacks
     this.onNotification = onNotification;
-    this.onError = onError;
     // set config
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
     // initialize functionality
     this.fields = fieldList([], this.shortDotsEnable);
 
-    this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
+    this.fieldsFetcher = createFieldsFetcher(apiClient);
     this.flattenHit = flattenHitWrapper(this, metaFields);
     this.formatHit = formatHitProvider(
       this,
@@ -237,34 +227,6 @@ export class IndexPattern implements IIndexPattern {
     return this;
   }
 
-  private updateFromElasticSearch(response: any) {
-    if (!response.found) {
-      throw new SavedObjectNotFound(savedObjectType, this.id, 'management/kibana/indexPatterns');
-    }
-
-    _.forOwn(this.mapping, (fieldMapping: FieldMappingSpec, name: string | undefined) => {
-      if (!fieldMapping._deserialize || !name) {
-        return;
-      }
-
-      response[name] = fieldMapping._deserialize(response[name]);
-    });
-
-    this.title = response.title;
-    this.timeFieldName = response.timeFieldName;
-    this.intervalName = response.intervalName;
-    this.sourceFilters = response.sourceFilters;
-    this.fieldFormatMap = response.fieldFormatMap;
-    this.type = response.type;
-    this.typeMeta = response.typeMeta;
-
-    if (!this.title && this.id) {
-      this.title = this.id;
-    }
-    this.version = response.version;
-    this.fields.replaceAll(response.fields);
-  }
-
   getComputedFields() {
     const scriptFields: any = {};
     if (!this.fields) {
@@ -306,41 +268,6 @@ export class IndexPattern implements IIndexPattern {
     };
   }
 
-  // loads saved object
-  // caches object state
-  // deserializes and sets values
-  // todo kill this and updateFromES
-  async init() {
-    if (!this.id) {
-      return this; // no id === no elasticsearch document
-    }
-
-    const savedObject = await this.savedObjectsClient.get<IndexPatternAttributes>(
-      savedObjectType,
-      this.id
-    );
-
-    const response = {
-      version: savedObject.version,
-      found: savedObject.version ? true : false,
-      title: savedObject.attributes.title,
-      timeFieldName: savedObject.attributes.timeFieldName,
-      intervalName: savedObject.attributes.intervalName,
-      fields: savedObject.attributes.fields,
-      sourceFilters: savedObject.attributes.sourceFilters,
-      fieldFormatMap: savedObject.attributes.fieldFormatMap,
-      typeMeta: savedObject.attributes.typeMeta,
-      type: savedObject.attributes.type,
-    };
-    // Do this before we attempt to update from ES since that call can potentially perform a save
-    this.originalBody = this.prepBody();
-    await this.updateFromElasticSearch(response);
-    // Do it after to ensure we have the most up to date information
-    this.originalBody = this.prepBody();
-
-    return this;
-  }
-
   public toSpec(): IndexPatternSpec {
     return {
       id: this.id,
@@ -489,6 +416,7 @@ export class IndexPattern implements IIndexPattern {
   }
 
   // kill
+  /*
   async _fetchFields() {
     const fields = await this.fieldsFetcher.fetch(this);
     const scripted = this.getScriptedFields().map((field) => field.spec);
@@ -502,40 +430,5 @@ export class IndexPattern implements IIndexPattern {
       }
     }
   }
-
-  // kill
-  refreshFields() {
-    return (
-      this._fetchFields()
-        // todo
-        .then(() => this.indexPatternsService.save(this))
-        .catch((err) => {
-          // https://github.com/elastic/kibana/issues/9224
-          // This call will attempt to remap fields from the matching
-          // ES index which may not actually exist. In that scenario,
-          // we still want to notify the user that there is a problem
-          // but we do not want to potentially make any pages unusable
-          // so do not rethrow the error here
-
-          if (err instanceof IndexPatternMissingIndices) {
-            this.onNotification({
-              title: (err as any).message,
-              color: 'danger',
-              iconType: 'alert',
-            });
-            return [];
-          }
-
-          this.onError(err, {
-            title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
-              defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})',
-              values: {
-                id: this.id,
-                title: this.title,
-              },
-            }),
-          });
-        })
-    );
-  }
+  */
 }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 61b29d1e692f2e..ed5e7e06874c96 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -137,14 +137,6 @@ export class IndexPatternsService {
     });
   };
 
-  getFieldsForTimePattern = (options: GetFieldsOptions = {}) => {
-    return this.apiClient.getFieldsForTimePattern(options);
-  };
-
-  getFieldsForWildcard = (options: GetFieldsOptions = {}) => {
-    return this.apiClient.getFieldsForWildcard(options);
-  };
-
   clearCache = (id?: string) => {
     this.savedObjectsCache = null;
     if (id) {
@@ -193,7 +185,35 @@ export class IndexPatternsService {
     });
   }
 
-  private refreshFields = async (
+  getFieldsForWildcard = async (options: GetFieldsOptions = {}) => {
+    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
+    return this.apiClient.getFieldsForWildcard({
+      pattern: options.pattern,
+      metaFields,
+      type: options.type,
+      params: options.params || {},
+    });
+  };
+
+  getFieldsForIndexPattern = async (
+    indexPattern: IndexPattern | IndexPatternSpec,
+    options: GetFieldsOptions = {}
+  ) =>
+    this.getFieldsForWildcard({
+      pattern: indexPattern.title as string,
+      ...options,
+      type: indexPattern.type,
+      params: indexPattern.typeMeta && indexPattern.typeMeta.params,
+    });
+
+  // grab fields, grab scripted fields, mash together
+  refreshFields = async (indexPattern: IndexPattern) => {
+    const fields = await this.getFieldsForIndexPattern(indexPattern);
+    const scripted = indexPattern.getScriptedFields().map((field) => field.spec);
+    indexPattern.fields.replaceAll([...fields, ...scripted]);
+  };
+
+  private refreshFieldSpecArray = async (
     fields: FieldSpec[],
     id: string,
     title: string,
@@ -251,7 +271,7 @@ export class IndexPatternsService {
     let isSaveRequired = isFieldRefreshRequired;
     try {
       parsedFields = isFieldRefreshRequired
-        ? await this.refreshFields(parsedFields, id, title, {
+        ? await this.refreshFieldSpecArray(parsedFields, id, title, {
             pattern: title,
             metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
             type,
@@ -327,9 +347,7 @@ export class IndexPatternsService {
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       fieldFormats: this.fieldFormats,
-      indexPatternsService: this,
       onNotification: this.onNotification,
-      onError: this.onError,
       shortDotsEnable,
       metaFields,
     });
@@ -347,15 +365,13 @@ export class IndexPatternsService {
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       fieldFormats: this.fieldFormats,
-      indexPatternsService: this,
       onNotification: this.onNotification,
-      onError: this.onError,
       shortDotsEnable,
       metaFields,
     });
 
     if (!skipFetchFields) {
-      await indexPattern._fetchFields();
+      await this.refreshFields(indexPattern); // indexPattern._fetchFields();
     }
 
     return indexPattern;
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 7736ee4114c06e..756c12099f4798 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1099,12 +1099,10 @@ export type IMetricAggType = MetricAggType;
 // @public (undocumented)
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
-    constructor({ spec, savedObjectsClient, apiClient, fieldFormats, indexPatternsService, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
+    constructor({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
     addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
     // (undocumented)
-    _fetchFields(): Promise<void>;
-    // (undocumented)
     fieldFormatMap: any;
     // (undocumented)
     fields: IIndexPatternFieldList & {
@@ -1153,8 +1151,6 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     id?: string;
     // (undocumented)
-    init(): Promise<this>;
-    // (undocumented)
     initFromSpec(spec: IndexPatternSpec): this;
     // (undocumented)
     intervalName: string | undefined;
@@ -1186,8 +1182,6 @@ export class IndexPattern implements IIndexPattern {
         typeMeta: string | undefined;
     };
     // (undocumented)
-    refreshFields(): Promise<void | Error | never[] | undefined>;
-    // (undocumented)
     removeScriptedField(fieldName: string): void;
     // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts
     //
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
index 3a0a25baf88320..cacabb6d7623ba 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx
@@ -108,13 +108,12 @@ export class StepTimeField extends Component<StepTimeFieldProps, StepTimeFieldSt
     const { indexPattern: pattern } = this.props;
     const { getFetchForWildcardOptions } = this.props.indexPatternCreationType;
 
-    const indexPattern = await this.context.services.data.indexPatterns.newIndexPattern({
-      title: pattern,
-    });
-
     this.setState({ isFetchingTimeFields: true });
     const fields = await ensureMinimumTime(
-      indexPattern.fieldsFetcher.fetchForWildcard(pattern, getFetchForWildcardOptions())
+      this.context.services.data.indexPatterns.getFieldsForWildcard({
+        pattern,
+        ...getFetchForWildcardOptions(),
+      })
     );
     const timeFields = extractTimeFields(fields);
 
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index d09836019b0bc3..700c0015435ef2 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -121,7 +121,9 @@ export const EditIndexPattern = withRouter(
     const refreshFields = () => {
       overlays.openConfirm(confirmMessage, confirmModalOptionsRefresh).then(async (isConfirmed) => {
         if (isConfirmed) {
-          await indexPattern.refreshFields();
+          // todo catch error as in index_pattern
+          await data.indexPatterns.refreshFields(indexPattern);
+          await data.indexPatterns.save(indexPattern);
           setFields(indexPattern.getNonScriptedFields());
         }
       });

From 3bbb19e06e44bca62101bada8f1703b2b2b64671 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 13 Sep 2020 10:34:59 -0500
Subject: [PATCH 31/57] remove field fetcher and apiClient from index pattern
 class

---
 .../index_patterns/index_pattern.ts           | 24 +------------------
 .../index_patterns/index_patterns.ts          |  2 --
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index f517f884bf81da..66b061610c0726 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -30,10 +30,9 @@ import {
   FieldFormatNotFoundError,
 } from '../../../common';
 import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields';
-import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
-import { OnNotification, IIndexPatternsApiClient } from '../types';
+import { OnNotification } from '../types';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
 import { expandShorthand, MappingObject } from '../../field_mapping';
 import { IndexPatternSpec, TypeMeta, FieldSpec, SourceFilter } from '../types';
@@ -44,7 +43,6 @@ const savedObjectType = 'index-pattern';
 interface IndexPatternDeps {
   spec?: IndexPatternSpec;
   savedObjectsClient: SavedObjectsClientCommon;
-  apiClient: IIndexPatternsApiClient;
   fieldFormats: FieldFormatsStartCommon;
   onNotification: OnNotification;
   shortDotsEnable: boolean;
@@ -71,7 +69,6 @@ export class IndexPattern implements IIndexPattern {
   public sourceFilters?: SourceFilter[];
   // todo make read  only, update via  method or factor out
   public originalBody: { [key: string]: any } = {};
-  public fieldsFetcher: any; // probably want to factor out any direct usage and change to private
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
   private onNotification: OnNotification;
@@ -101,7 +98,6 @@ export class IndexPattern implements IIndexPattern {
   constructor({
     spec = {},
     savedObjectsClient,
-    apiClient,
     fieldFormats,
     onNotification,
     shortDotsEnable = false,
@@ -118,7 +114,6 @@ export class IndexPattern implements IIndexPattern {
     // initialize functionality
     this.fields = fieldList([], this.shortDotsEnable);
 
-    this.fieldsFetcher = createFieldsFetcher(apiClient);
     this.flattenHit = flattenHitWrapper(this, metaFields);
     this.formatHit = formatHitProvider(
       this,
@@ -414,21 +409,4 @@ export class IndexPattern implements IIndexPattern {
       )
     );
   }
-
-  // kill
-  /*
-  async _fetchFields() {
-    const fields = await this.fieldsFetcher.fetch(this);
-    const scripted = this.getScriptedFields().map((field) => field.spec);
-    try {
-      this.fields.replaceAll([...fields, ...scripted]);
-    } catch (err) {
-      if (err instanceof FieldTypeUnknownError) {
-        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
-      } else {
-        throw err;
-      }
-    }
-  }
-  */
 }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index ed5e7e06874c96..172d50dc897ce7 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -345,7 +345,6 @@ export class IndexPatternsService {
     const indexPattern = new IndexPattern({
       spec,
       savedObjectsClient: this.savedObjectsClient,
-      apiClient: this.apiClient,
       fieldFormats: this.fieldFormats,
       onNotification: this.onNotification,
       shortDotsEnable,
@@ -363,7 +362,6 @@ export class IndexPatternsService {
     const indexPattern = new IndexPattern({
       spec,
       savedObjectsClient: this.savedObjectsClient,
-      apiClient: this.apiClient,
       fieldFormats: this.fieldFormats,
       onNotification: this.onNotification,
       shortDotsEnable,

From a2272c088d449de08911e252f208476a045caf35 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 14 Sep 2020 11:25:46 -0500
Subject: [PATCH 32/57] remove file type unknown notification

---
 ...lic.fieldtypeunknownerror._constructor_.md | 21 ------
 ...-public.fieldtypeunknownerror.fieldspec.md | 11 ----
 ...ugins-data-public.fieldtypeunknownerror.md | 24 -------
 ...-data-public.indexpattern._constructor_.md |  4 +-
 ...-data-public.indexpattern.fieldsfetcher.md | 11 ----
 ...plugin-plugins-data-public.indexpattern.md |  3 +-
 .../kibana-plugin-plugins-data-public.md      |  1 -
 src/core/public/public.api.md                 |  1 -
 src/core/server/server.api.md                 |  1 -
 .../errors/field_type_unknown.ts              | 29 ---------
 .../common/index_patterns/errors/index.ts     |  1 -
 .../index_patterns/fields/field_list.ts       |  9 +--
 .../fields/index_pattern_field.ts             | 10 ---
 .../index_patterns/index_pattern.test.ts      | 12 +---
 .../index_patterns/index_pattern.ts           | 64 ++++---------------
 .../index_patterns/index_patterns.ts          |  4 +-
 src/plugins/data/public/public.api.md         | 13 +---
 17 files changed, 19 insertions(+), 200 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md
 delete mode 100644 src/plugins/data/common/index_patterns/errors/field_type_unknown.ts

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
deleted file mode 100644
index 726a6f3d43cb77..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md)
-
-## FieldTypeUnknownError.(constructor)
-
-Constructs a new instance of the `FieldTypeUnknownError` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(message: string, spec: FieldSpec);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  message | <code>string</code> |  |
-|  spec | <code>FieldSpec</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
deleted file mode 100644
index bc0854ed138481..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) &gt; [fieldSpec](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md)
-
-## FieldTypeUnknownError.fieldSpec property
-
-<b>Signature:</b>
-
-```typescript
-readonly fieldSpec: FieldSpec;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md
deleted file mode 100644
index b3327d297754e9..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldtypeunknownerror.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md)
-
-## FieldTypeUnknownError class
-
-<b>Signature:</b>
-
-```typescript
-export declare class FieldTypeUnknownError extends Error 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(message, spec)](./kibana-plugin-plugins-data-public.fieldtypeunknownerror._constructor_.md) |  | Constructs a new instance of the <code>FieldTypeUnknownError</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [fieldSpec](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.fieldspec.md) |  | <code>FieldSpec</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
index 5a7b261eb1ba9e..4baf98038f89a7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, }: IndexPatternDeps);
+constructor({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
+|  { spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md
deleted file mode 100644
index 4d44b386a1db1a..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [fieldsFetcher](./kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md)
-
-## IndexPattern.fieldsFetcher property
-
-<b>Signature:</b>
-
-```typescript
-fieldsFetcher: any;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index b009430368fe2d..3500c6e43af257 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 
@@ -22,7 +22,6 @@ export declare class IndexPattern implements IIndexPattern
 |  --- | --- | --- | --- |
 |  [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) |  | <code>any</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) |  | <code>IIndexPatternFieldList &amp; {</code><br/><code>        toSpec: () =&gt; FieldSpec[];</code><br/><code>    }</code> |  |
-|  [fieldsFetcher](./kibana-plugin-plugins-data-public.indexpattern.fieldsfetcher.md) |  | <code>any</code> |  |
 |  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>any</code> |  |
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 5c94dabae45bdb..cd0c42d333d675 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -13,7 +13,6 @@
 |  [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) |  |
 |  [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md) |  |
 |  [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) |  |
-|  [FieldTypeUnknownError](./kibana-plugin-plugins-data-public.fieldtypeunknownerror.md) |  |
 |  [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) |  |
 |  [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) |  |
 |  [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) |  |
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 2da16f9fd1f98e..9d3002c83ac225 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -29,7 +29,6 @@ import { RecursiveReadonly } from '@kbn/utility-types';
 import * as Rx from 'rxjs';
 import { SavedObject as SavedObject_2 } from 'src/core/server';
 import { ShallowPromise } from '@kbn/utility-types';
-import { ToastInputFields as ToastInputFields_2 } from 'src/core/public/notifications';
 import { TransportRequestOptions } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index ac6b298e860c96..5b54f841643c94 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -142,7 +142,6 @@ import { TasksCancelParams } from 'elasticsearch';
 import { TasksGetParams } from 'elasticsearch';
 import { TasksListParams } from 'elasticsearch';
 import { TermvectorsParams } from 'elasticsearch';
-import { ToastInputFields } from 'src/core/public/notifications';
 import { TransportRequestOptions } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
diff --git a/src/plugins/data/common/index_patterns/errors/field_type_unknown.ts b/src/plugins/data/common/index_patterns/errors/field_type_unknown.ts
deleted file mode 100644
index 9a31d2cea7ba1c..00000000000000
--- a/src/plugins/data/common/index_patterns/errors/field_type_unknown.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 { FieldSpec } from '../types';
-
-export class FieldTypeUnknownError extends Error {
-  public readonly fieldSpec: FieldSpec;
-  constructor(message: string, spec: FieldSpec) {
-    super(message);
-    this.name = 'FieldTypeUnknownError';
-    this.fieldSpec = spec;
-  }
-}
diff --git a/src/plugins/data/common/index_patterns/errors/index.ts b/src/plugins/data/common/index_patterns/errors/index.ts
index f6a69981da0035..7cc39d93a2a18e 100644
--- a/src/plugins/data/common/index_patterns/errors/index.ts
+++ b/src/plugins/data/common/index_patterns/errors/index.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export * from './field_type_unknown';
 export * from './duplicate_index_pattern';
diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/index_patterns/fields/field_list.ts
index f828ff53c7cda2..45a1e30be0c70c 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -20,7 +20,7 @@
 import { findIndex } from 'lodash';
 import { IFieldType } from './types';
 import { IndexPatternField } from './index_pattern_field';
-import { OnNotification, FieldSpec } from '../types';
+import { FieldSpec } from '../types';
 import { IndexPattern } from '../index_patterns';
 import { shortenDottedString } from '../../utils';
 
@@ -38,13 +38,6 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
   toSpec(options?: { getFormatterForField?: IndexPattern['getFormatterForField'] }): FieldSpec[];
 }
 
-export type CreateIndexPatternFieldList = (
-  indexPattern: IndexPattern,
-  specs?: FieldSpec[],
-  shortDotsEnable?: boolean,
-  onNotification?: OnNotification
-) => IIndexPatternFieldList;
-
 // extending the array class and using a constructor doesn't work well
 // when calling filter and similar so wrapping in a callback.
 // to be removed in the future
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
index 7f72bfe55c7cd5..e39fb0e37bf6e4 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
@@ -17,12 +17,9 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
 import { KbnFieldType, getKbnFieldType } from '../../kbn_field_types';
-import { KBN_FIELD_TYPES } from '../../kbn_field_types/types';
 import { IFieldType } from './types';
 import { FieldSpec, IndexPattern } from '../..';
-import { FieldTypeUnknownError } from '../errors';
 
 export class IndexPatternField implements IFieldType {
   readonly spec: FieldSpec;
@@ -35,13 +32,6 @@ export class IndexPatternField implements IFieldType {
     this.displayName = displayName;
 
     this.kbnFieldType = getKbnFieldType(spec.type);
-    if (spec.type && this.kbnFieldType?.name === KBN_FIELD_TYPES.UNKNOWN) {
-      const msg = i18n.translate('data.indexPatterns.unknownFieldTypeErrorMsg', {
-        values: { type: spec.type, name: spec.name },
-        defaultMessage: `Field '{name}' Unknown field type '{type}'`,
-      });
-      throw new FieldTypeUnknownError(msg, spec);
-    }
   }
 
   // writable attrs
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index bb7a2d1e2784cf..aa62cda222f945 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -29,7 +29,7 @@ import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_
 import { IndexPatternField } from '../fields';
 
 import { fieldFormatsMock } from '../../field_formats/mocks';
-import { FieldFormat, IndexPatternsService } from '../..';
+import { FieldFormat } from '../..';
 
 class MockFieldFormatter {}
 
@@ -96,22 +96,12 @@ const savedObjectsClient = {
   }),
 };
 
-const apiClient = {
-  _getUrl: jest.fn(),
-  getFieldsForTimePattern: jest.fn(),
-  getFieldsForWildcard: jest.fn(),
-};
-
 // helper function to create index patterns
 function create(id: string, payload?: any): Promise<IndexPattern> {
   const indexPattern = new IndexPattern({
     spec: { id },
     savedObjectsClient: savedObjectsClient as any,
-    apiClient,
     fieldFormats: fieldFormatsMock,
-    indexPatternsService: {} as IndexPatternsService,
-    onNotification: () => {},
-    onError: () => {},
     shortDotsEnable: false,
     metaFields: [],
   });
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 66b061610c0726..781cb8e0d66780 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -18,7 +18,6 @@
  */
 
 import _, { each, reject } from 'lodash';
-import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
 import { DuplicateField } from '../../../../kibana_utils/common';
 
@@ -26,13 +25,11 @@ import {
   ES_FIELD_TYPES,
   KBN_FIELD_TYPES,
   IIndexPattern,
-  FieldTypeUnknownError,
   FieldFormatNotFoundError,
 } from '../../../common';
 import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
-import { OnNotification } from '../types';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
 import { expandShorthand, MappingObject } from '../../field_mapping';
 import { IndexPatternSpec, TypeMeta, FieldSpec, SourceFilter } from '../types';
@@ -44,7 +41,6 @@ interface IndexPatternDeps {
   spec?: IndexPatternSpec;
   savedObjectsClient: SavedObjectsClientCommon;
   fieldFormats: FieldFormatsStartCommon;
-  onNotification: OnNotification;
   shortDotsEnable: boolean;
   metaFields: string[];
 }
@@ -71,7 +67,6 @@ export class IndexPattern implements IIndexPattern {
   public originalBody: { [key: string]: any } = {};
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
-  private onNotification: OnNotification;
 
   private mapping: MappingObject = expandShorthand({
     title: ES_FIELD_TYPES.TEXT,
@@ -99,15 +94,12 @@ export class IndexPattern implements IIndexPattern {
     spec = {},
     savedObjectsClient,
     fieldFormats,
-    onNotification,
     shortDotsEnable = false,
     metaFields = [],
   }: IndexPatternDeps) {
     // set dependencies
     this.savedObjectsClient = savedObjectsClient;
     this.fieldFormats = fieldFormats;
-    // set callbacks
-    this.onNotification = onNotification;
     // set config
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
@@ -140,22 +132,6 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
-  private unknownFieldErrorNotification(
-    fieldType: string,
-    fieldName: string,
-    indexPatternTitle: string
-  ) {
-    const title = i18n.translate('data.indexPatterns.unknownFieldHeader', {
-      values: { type: fieldType },
-      defaultMessage: 'Unknown field type {type}',
-    });
-    const text = i18n.translate('data.indexPatterns.unknownFieldErrorMessage', {
-      values: { name: fieldName, title: indexPatternTitle },
-      defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
-    });
-    this.onNotification({ title, text, color: 'danger', iconType: 'alert' });
-  }
-
   private serializeFieldFormatMap(flat: any, format: string, field: string | undefined) {
     if (format && field) {
       flat[field] = format;
@@ -203,15 +179,7 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    try {
-      this.fields.replaceAll(spec.fields || []);
-    } catch (err) {
-      if (err instanceof FieldTypeUnknownError) {
-        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
-      } else {
-        throw err;
-      }
-    }
+    this.fields.replaceAll(spec.fields || []);
     this.typeMeta = spec.typeMeta;
     this.type = spec.type;
 
@@ -292,25 +260,17 @@ export class IndexPattern implements IIndexPattern {
       throw new DuplicateField(name);
     }
 
-    try {
-      this.fields.add({
-        name,
-        script,
-        type: fieldType,
-        scripted: true,
-        lang,
-        aggregatable: true,
-        searchable: true,
-        count: 0,
-        readFromDocValues: false,
-      });
-    } catch (err) {
-      if (err instanceof FieldTypeUnknownError) {
-        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
-      } else {
-        throw err;
-      }
-    }
+    this.fields.add({
+      name,
+      script,
+      type: fieldType,
+      scripted: true,
+      lang,
+      aggregatable: true,
+      searchable: true,
+      count: 0,
+      readFromDocValues: false,
+    });
   }
 
   removeScriptedField(fieldName: string) {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 172d50dc897ce7..72f68592a15a98 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -346,7 +346,6 @@ export class IndexPatternsService {
       spec,
       savedObjectsClient: this.savedObjectsClient,
       fieldFormats: this.fieldFormats,
-      onNotification: this.onNotification,
       shortDotsEnable,
       metaFields,
     });
@@ -363,13 +362,12 @@ export class IndexPatternsService {
       spec,
       savedObjectsClient: this.savedObjectsClient,
       fieldFormats: this.fieldFormats,
-      onNotification: this.onNotification,
       shortDotsEnable,
       metaFields,
     });
 
     if (!skipFetchFields) {
-      await this.refreshFields(indexPattern); // indexPattern._fetchFields();
+      await this.refreshFields(indexPattern);
     }
 
     return indexPattern;
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 756c12099f4798..269b541069e7ba 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -792,15 +792,6 @@ export interface FieldMappingSpec {
     type: ES_FIELD_TYPES;
 }
 
-// Warning: (ae-missing-release-tag) "FieldTypeUnknownError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export class FieldTypeUnknownError extends Error {
-    constructor(message: string, spec: FieldSpec);
-    // (undocumented)
-    readonly fieldSpec: FieldSpec;
-}
-
 // Warning: (ae-missing-release-tag) "Filter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1099,7 +1090,7 @@ export type IMetricAggType = MetricAggType;
 // @public (undocumented)
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
-    constructor({ spec, savedObjectsClient, apiClient, fieldFormats, onNotification, shortDotsEnable, metaFields, }: IndexPatternDeps);
+    constructor({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
     addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
     // (undocumented)
@@ -1109,8 +1100,6 @@ export class IndexPattern implements IIndexPattern {
         toSpec: () => FieldSpec[];
     };
     // (undocumented)
-    fieldsFetcher: any;
-    // (undocumented)
     flattenHit: any;
     // (undocumented)
     formatField: any;

From 4e7149be527daf28cec9748d8a9e0d6af961ab3f Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 15 Sep 2020 17:58:50 -0500
Subject: [PATCH 33/57] add savedObjectToSpec

---
 .../index_patterns/index_patterns.ts          | 84 ++++++++++++-------
 .../data/common/index_patterns/types.ts       | 10 +--
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 72f68592a15a98..cf2bf15413a407 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -35,6 +35,7 @@ import {
   IndexPatternSpec,
   IndexPatternAttributes,
   FieldSpec,
+  FieldFormatMap,
 } from '../types';
 import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
@@ -239,13 +240,18 @@ export class IndexPatternsService {
     return fields;
   };
 
-  get = async (id: string): Promise<IndexPattern> => {
-    const cache = indexPatternCache.get(id);
-    if (cache) {
-      return cache;
-    }
+  private mergeFieldsAndFormats = (fieldSpecs: FieldSpec[], fieldFormatMap: FieldFormatMap) => {
+    Object.entries(fieldFormatMap).forEach(([fieldName, value]) => {
+      const field = fieldSpecs.find((fld: FieldSpec) => fld.name === fieldName);
+      if (field) {
+        field.format = value;
+      }
+    });
+  };
 
+  savedObjectToSpec = (savedObject: SavedObject<IndexPatternAttributes>): IndexPatternSpec => {
     const {
+      id,
       version,
       attributes: {
         title,
@@ -257,27 +263,59 @@ export class IndexPatternsService {
         typeMeta,
         type,
       },
-    } = await this.savedObjectsClient.get<IndexPatternAttributes>(savedObjectType, id);
+    } = savedObject;
 
-    if (!version) {
+    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
+    const parsedFields = fields ? JSON.parse(fields) : [];
+    const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
+    const parsedSourceFilters = sourceFilters ? JSON.parse(sourceFilters) : undefined;
+
+    this.mergeFieldsAndFormats(parsedFields, parsedFieldFormatMap);
+    return {
+      id,
+      version,
+      title,
+      intervalName,
+      timeFieldName,
+      sourceFilters: parsedSourceFilters,
+      fields: parsedFields,
+      typeMeta: parsedTypeMeta,
+      type,
+    };
+  };
+
+  get = async (id: string): Promise<IndexPattern> => {
+    const cache = indexPatternCache.get(id);
+    if (cache) {
+      return cache;
+    }
+
+    const savedObject = await this.savedObjectsClient.get<IndexPatternAttributes>(
+      savedObjectType,
+      id
+    );
+
+    if (!savedObject.version) {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
-    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
-    let parsedFields = fields ? JSON.parse(fields) : [];
-    const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
+    const spec = this.savedObjectToSpec(savedObject);
+    const { title, type, typeMeta } = spec;
+    const parsedFieldFormats: FieldFormatMap = savedObject.attributes.fieldFormatMap
+      ? JSON.parse(savedObject.attributes.fieldFormatMap)
+      : {};
 
-    const isFieldRefreshRequired = this.isFieldRefreshRequired(parsedFields);
+    const isFieldRefreshRequired = this.isFieldRefreshRequired(spec.fields);
     let isSaveRequired = isFieldRefreshRequired;
     try {
-      parsedFields = isFieldRefreshRequired
-        ? await this.refreshFieldSpecArray(parsedFields, id, title, {
+      spec.fields = isFieldRefreshRequired
+        ? await this.refreshFieldSpecArray(spec.fields || [], id, spec.title as string, {
             pattern: title,
             metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
             type,
-            params: parsedTypeMeta && parsedTypeMeta.params,
+            params: typeMeta && typeMeta.params,
           })
-        : parsedFields;
+        : spec.fields;
     } catch (err) {
       isSaveRequired = false;
       if (err instanceof IndexPatternMissingIndices) {
@@ -296,25 +334,13 @@ export class IndexPatternsService {
       }
     }
 
-    Object.entries(parsedFieldFormatMap).forEach(([fieldName, value]) => {
-      const field = parsedFields.find((fld: FieldSpec) => fld.name === fieldName);
+    Object.entries(parsedFieldFormats).forEach(([fieldName, value]) => {
+      const field = (spec.fields || []).find((fld: FieldSpec) => fld.name === fieldName);
       if (field) {
         field.format = value;
       }
     });
 
-    const spec: IndexPatternSpec = {
-      id,
-      version,
-      title,
-      timeFieldName,
-      intervalName,
-      fields: parsedFields,
-      sourceFilters: sourceFilters ? JSON.parse(sourceFilters) : undefined,
-      typeMeta: parsedTypeMeta,
-      type,
-    };
-
     const indexPattern = await this.specToIndexPattern(spec);
     indexPatternCache.set(id, indexPattern);
     if (isSaveRequired) {
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 41a5560a8e8165..a9e4ad4a593a45 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -24,6 +24,8 @@ import { IFieldType } from './fields';
 import { SerializedFieldFormat } from '../../../expressions/common';
 import { KBN_FIELD_TYPES } from '..';
 
+export type FieldFormatMap = Record<string, SerializedFieldFormat>;
+
 export interface IIndexPattern {
   [key: string]: any;
   fields: IFieldType[];
@@ -32,13 +34,7 @@ export interface IIndexPattern {
   type?: string;
   timeFieldName?: string;
   getTimeField?(): IFieldType | undefined;
-  fieldFormatMap?: Record<
-    string,
-    {
-      id: string;
-      params: unknown;
-    }
-  >;
+  fieldFormatMap?: FieldFormatMap;
 }
 
 /**

From 2f0a68d35e8740b464cd156562974e39dfbe1b18 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 15 Sep 2020 19:59:09 -0500
Subject: [PATCH 34/57] renme functions

---
 ...-data-public.iindexpattern.fieldformatmap.md |  5 +----
 ...-plugin-plugins-data-public.iindexpattern.md |  2 +-
 ...-data-server.iindexpattern.fieldformatmap.md |  5 +----
 ...-plugin-plugins-data-server.iindexpattern.md |  2 +-
 .../index_patterns/index_patterns.test.ts       |  4 ++--
 .../index_patterns/index_patterns.ts            | 17 ++++++++++-------
 src/plugins/data/common/index_patterns/types.ts |  8 +++++++-
 src/plugins/data/public/public.api.md           |  7 +++----
 src/plugins/data/server/server.api.md           |  7 +++----
 .../create_index_pattern_wizard.test.tsx        |  2 +-
 .../create_index_pattern_wizard.tsx             |  2 +-
 .../create_edit_field/create_edit_field.tsx     |  2 +-
 .../edit_index_pattern/edit_index_pattern.tsx   |  4 ++--
 .../scripted_fields_table.tsx                   |  2 +-
 .../source_filters_table.tsx                    |  2 +-
 .../components/edit_index_pattern/tabs/tabs.tsx |  2 +-
 .../components/field_editor/field_editor.tsx    |  4 ++--
 .../public/lib/resolve_saved_objects.ts         |  4 ++--
 .../use_create_analytics_form.ts                |  2 +-
 .../ml/public/application/util/index_utils.ts   |  2 +-
 .../components/step_create/step_create_form.tsx |  2 +-
 .../translations/translations/ja-JP.json        |  2 --
 .../translations/translations/zh-CN.json        |  2 --
 23 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
index 2c131c6da99377..6d5c8bbde5cee8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+fieldFormatMap?: FieldFormatMap;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
index 1cb89822eb605d..120e6e2f9b29a7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>FieldFormatMap</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
index ab9e3171d7d7bd..1917a09df9cabd 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+fieldFormatMap?: FieldFormatMap;
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
index a79244a24acf57..6069f4a221fac5 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>FieldFormatMap</code> |  |
 |  [fields](./kibana-plugin-plugins-data-server.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-server.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-server.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index 163c7956147e9b..dbd75d32327a1c 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -157,14 +157,14 @@ describe('IndexPatterns', () => {
     // This will conflict because samePattern did a save (from refreshFields)
     // but the resave should work fine
     pattern.title = 'foo2';
-    await indexPatterns.save(pattern);
+    await indexPatterns.updateSavedObject(pattern);
 
     // This should not be able to recover
     samePattern.title = 'foo3';
 
     let result;
     try {
-      await indexPatterns.save(samePattern);
+      await indexPatterns.updateSavedObject(samePattern);
     } catch (err) {
       result = err;
     }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index cf2bf15413a407..d22c4f065f2a7f 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -345,7 +345,7 @@ export class IndexPatternsService {
     indexPatternCache.set(id, indexPattern);
     if (isSaveRequired) {
       try {
-        this.save(indexPattern);
+        this.updateSavedObject(indexPattern);
       } catch (err) {
         this.onError(err, {
           title: i18n.translate('data.indexPatterns.fetchFieldSaveErrorTitle', {
@@ -380,7 +380,7 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async newIndexPattern(spec: IndexPatternSpec, skipFetchFields = false): Promise<IndexPattern> {
+  async create(spec: IndexPatternSpec, skipFetchFields = false): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
 
@@ -399,14 +399,14 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async newIndexPatternAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
-    const indexPattern = await this.newIndexPattern(spec, skipFetchFields);
+  async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
+    const indexPattern = await this.create(spec, skipFetchFields);
     await this.create(indexPattern, override);
     await this.setDefault(indexPattern.id as string);
     return indexPattern;
   }
 
-  async create(indexPattern: IndexPattern, override = false) {
+  async createSavedObject(indexPattern: IndexPattern, override = false) {
     const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
     if (dupe) {
       if (override) {
@@ -425,7 +425,10 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
-  async save(indexPattern: IndexPattern, saveAttempts: number = 0): Promise<void | Error> {
+  async updateSavedObject(
+    indexPattern: IndexPattern,
+    saveAttempts: number = 0
+  ): Promise<void | Error> {
     if (!indexPattern.id) return;
 
     // get the list of attributes
@@ -493,7 +496,7 @@ export class IndexPatternsService {
           indexPatternCache.clear(indexPattern.id!);
 
           // Try the save again
-          return this.save(indexPattern, saveAttempts);
+          return this.updateSavedObject(indexPattern, saveAttempts);
         }
         throw err;
       });
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index a9e4ad4a593a45..d4e61cda398690 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -34,7 +34,13 @@ export interface IIndexPattern {
   type?: string;
   timeFieldName?: string;
   getTimeField?(): IFieldType | undefined;
-  fieldFormatMap?: FieldFormatMap;
+  fieldFormatMap?: Record<
+    string,
+    {
+      id: string;
+      params: unknown;
+    }
+  >;
 }
 
 /**
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 8d5cea06a35652..01c48d1ced2132 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1016,11 +1016,10 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
+    // Warning: (ae-forgotten-export) The symbol "FieldFormatMap" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+    fieldFormatMap?: FieldFormatMap;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index f5b1214185f535..8ebbbd610e021e 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -597,11 +597,10 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
+    // Warning: (ae-forgotten-export) The symbol "FieldFormatMap" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+    fieldFormatMap?: FieldFormatMap;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
index c3be66ce82e73e..0946a16bef97b9 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
@@ -155,7 +155,7 @@ describe('CreateIndexPatternWizard', () => {
       fields: [],
       _fetchFields: jest.fn(),
     } as unknown) as IndexPattern;
-    mockContext.data.indexPatterns.newIndexPatternAndSave = newIndexPatternAndSave;
+    mockContext.data.indexPatterns.createAndSave = newIndexPatternAndSave;
     mockContext.data.indexPatterns.setDefault = jest.fn();
 
     const component = createComponentWithContext(
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
index a323abbff76f8f..aa97c21d766b97 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx
@@ -162,7 +162,7 @@ export class CreateIndexPatternWizard extends Component<
     const { indexPattern } = this.state;
 
     try {
-      emptyPattern = await this.context.services.data.indexPatterns.newIndexPatternAndSave({
+      emptyPattern = await this.context.services.data.indexPatterns.createAndSave({
         id: indexPatternId,
         title: indexPattern,
         timeFieldName,
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
index 13be9ca6c9c258..08edf42df60d8d 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
@@ -96,7 +96,7 @@ export const CreateEditField = withRouter(
                 indexPattern={indexPattern}
                 spec={spec}
                 services={{
-                  saveIndexPattern: data.indexPatterns.save.bind(data.indexPatterns),
+                  saveIndexPattern: data.indexPatterns.updateSavedObject.bind(data.indexPatterns),
                   redirectAway,
                 }}
               />
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 700c0015435ef2..078a76961da8e7 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -123,7 +123,7 @@ export const EditIndexPattern = withRouter(
         if (isConfirmed) {
           // todo catch error as in index_pattern
           await data.indexPatterns.refreshFields(indexPattern);
-          await data.indexPatterns.save(indexPattern);
+          await data.indexPatterns.updateSavedObject(indexPattern);
           setFields(indexPattern.getNonScriptedFields());
         }
       });
@@ -238,7 +238,7 @@ export const EditIndexPattern = withRouter(
           <EuiSpacer />
           <Tabs
             indexPattern={indexPattern}
-            saveIndexPattern={data.indexPatterns.save.bind(data.indexPatterns)}
+            saveIndexPattern={data.indexPatterns.updateSavedObject.bind(data.indexPatterns)}
             fields={fields}
             history={history}
             location={location}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 08cc90faf75fa6..c7ea20c700086f 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -39,7 +39,7 @@ interface ScriptedFieldsTableProps {
   };
   onRemoveField?: () => void;
   painlessDocLink: string;
-  saveIndexPattern: DataPublicPluginStart['indexPatterns']['save'];
+  saveIndexPattern: DataPublicPluginStart['indexPatterns']['updateSavedObject'];
 }
 
 interface ScriptedFieldsTableState {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
index b00648f1247164..cd311db513c090 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
@@ -30,7 +30,7 @@ export interface SourceFiltersTableProps {
   filterFilter: string;
   fieldWildcardMatcher: Function;
   onAddOrRemoveFilter?: Function;
-  saveIndexPattern: DataPublicPluginStart['indexPatterns']['save'];
+  saveIndexPattern: DataPublicPluginStart['indexPatterns']['updateSavedObject'];
 }
 
 export interface SourceFiltersTableState {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
index 101399ef02b735..5c29dfafd3c07b 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -49,7 +49,7 @@ import { getTabs, getPath, convertToEuiSelectOption } from './utils';
 interface TabsProps extends Pick<RouteComponentProps, 'history' | 'location'> {
   indexPattern: IndexPattern;
   fields: IndexPatternField[];
-  saveIndexPattern: DataPublicPluginStart['indexPatterns']['save'];
+  saveIndexPattern: DataPublicPluginStart['indexPatterns']['updateSavedObject'];
 }
 
 const searchAriaLabel = i18n.translate(
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
index 4857a402cc4b20..7e18fa5566d563 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
@@ -133,7 +133,7 @@ export interface FieldEdiorProps {
   spec: IndexPatternField['spec'];
   services: {
     redirectAway: () => void;
-    saveIndexPattern: DataPublicPluginStart['indexPatterns']['save'];
+    saveIndexPattern: DataPublicPluginStart['indexPatterns']['updateSavedObject'];
   };
 }
 
@@ -826,7 +826,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         this.context.services.notifications.toasts.addSuccess(message);
         redirectAway();
       })
-      .catch((error) => {
+      .catch(() => {
         if (oldField) {
           indexPattern.fields.update(oldField);
         } else {
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index a7c835e766dd95..eb95c213e680dc 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -98,7 +98,7 @@ async function importIndexPattern(
   addJsonFieldToIndexPattern(indexPatternSpec, sourceFilters, 'sourceFilters', title);
   addJsonFieldToIndexPattern(indexPatternSpec, typeMeta, 'typeMeta', title);
   try {
-    emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, overwriteAll, true);
+    emptyPattern = await indexPatterns.createAndSave(indexPatternSpec, overwriteAll, true);
   } catch (err) {
     if (err instanceof DuplicateIndexPatternError) {
       // We can override and we want to prompt for confirmation
@@ -122,7 +122,7 @@ async function importIndexPattern(
       );
 
       if (isConfirmed) {
-        emptyPattern = await indexPatterns.newIndexPatternAndSave(indexPatternSpec, true, true);
+        emptyPattern = await indexPatterns.createAndSave(indexPatternSpec, true, true);
       } else {
         return;
       }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 1f2fecc6bedddd..fec23f8b6e678c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -131,7 +131,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     const indexPatternName = destinationIndex;
 
     try {
-      await mlContext.indexPatterns.newIndexPatternAndSave({
+      await mlContext.indexPatterns.createAndSave({
         title: indexPatternName,
       });
 
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index 43f692f9ce5d67..42be3dd8252f95 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -107,7 +107,7 @@ export function getIndexPatternById(id: string): Promise<IndexPattern> {
     if (id) {
       return indexPatternsContract.get(id);
     } else {
-      return indexPatternsContract.newIndexPattern({});
+      return indexPatternsContract.create({});
     }
   } else {
     throw new Error('Index patterns are not initialized!');
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index ca81b7311f1636..60d14749e101ad 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -191,7 +191,7 @@ export const StepCreateForm: FC<Props> = React.memo(
       const indexPatternName = transformConfig.dest.index;
 
       try {
-        const newIndexPattern = await indexPatterns.newIndexPatternAndSave(
+        const newIndexPattern = await indexPatterns.createAndSave(
           {
             title: indexPatternName,
             timeFieldName,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 68f6bc166cd1da..e5bcc2b6ad4657 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -798,8 +798,6 @@
     "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "Kibanaでデータの可視化と閲覧を行うには、Elasticsearchからデータを取得するためのインデックスパターンの作成が必要です。",
     "data.indexPatterns.fetchFieldErrorTitle": "インデックスパターンのフィールド取得中にエラーが発生 {title} (ID: {id})",
     "data.indexPatterns.unableWriteLabel": "インデックスパターンを書き込めません！このインデックスパターンへの最新の変更を取得するには、ページを更新してください。",
-    "data.indexPatterns.unknownFieldErrorMessage": "インデックスパターン「{title}」のフィールド「{name}」が不明なフィールドタイプを使用しています。",
-    "data.indexPatterns.unknownFieldHeader": "不明なフィールドタイプ {type}",
     "data.noDataPopover.content": "この時間範囲にはデータが含まれていません表示するフィールドを増やし、グラフを作成するには、時間範囲を広げるか、調整してください。",
     "data.noDataPopover.dismissAction": "今後表示しない",
     "data.noDataPopover.subtitle": "ヒント",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index cb43cefdc36554..a70e16131d0b87 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -798,8 +798,6 @@
     "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "若要在 Kibana 中可视化和浏览数据，您需要创建索引模式，以从 Elasticsearch 检索数据。",
     "data.indexPatterns.fetchFieldErrorTitle": "提取索引模式 {title} (ID: {id}) 的字段时出错",
     "data.indexPatterns.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。",
-    "data.indexPatterns.unknownFieldErrorMessage": "indexPattern “{title}” 中的字段 “{name}” 使用未知字段类型。",
-    "data.indexPatterns.unknownFieldHeader": "未知字段类型 {type}",
     "data.noDataPopover.content": "此时间范围不包含任何数据。增大或调整时间范围，以查看更多的字段并创建图表。",
     "data.noDataPopover.dismissAction": "不再显示",
     "data.noDataPopover.subtitle": "提示",

From c69cc9a1a517770d22513f7ce0d159208ef7d106 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 15 Sep 2020 20:47:40 -0500
Subject: [PATCH 35/57] fix create index pattern

---
 .../data/common/index_patterns/index_patterns/index_patterns.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index d22c4f065f2a7f..f7f3018f9b3711 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -401,7 +401,7 @@ export class IndexPatternsService {
 
   async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
     const indexPattern = await this.create(spec, skipFetchFields);
-    await this.create(indexPattern, override);
+    await this.createSavedObject(indexPattern, override);
     await this.setDefault(indexPattern.id as string);
     return indexPattern;
   }

From 2de93f6ca7e51ba49b4d7233fb80b630da611e54 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 15 Sep 2020 21:47:32 -0500
Subject: [PATCH 36/57] field map for spec instead of array

---
 .../index_patterns/fields/field_list.ts       | 13 ++++++--
 .../index_patterns/index_pattern.ts           | 16 ++++-----
 .../index_patterns/index_patterns.ts          | 33 +++++++++++--------
 .../data/common/index_patterns/types.ts       |  4 ++-
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/index_patterns/fields/field_list.ts
index 45a1e30be0c70c..c0eb55a15fead6 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -20,7 +20,7 @@
 import { findIndex } from 'lodash';
 import { IFieldType } from './types';
 import { IndexPatternField } from './index_pattern_field';
-import { FieldSpec } from '../types';
+import { FieldSpec, IndexPatternFieldMap } from '../types';
 import { IndexPattern } from '../index_patterns';
 import { shortenDottedString } from '../../utils';
 
@@ -35,7 +35,9 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
   removeAll(): void;
   replaceAll(specs: FieldSpec[]): void;
   update(field: FieldSpec): void;
-  toSpec(options?: { getFormatterForField?: IndexPattern['getFormatterForField'] }): FieldSpec[];
+  toSpec(options?: {
+    getFormatterForField?: IndexPattern['getFormatterForField'];
+  }): IndexPatternFieldMap;
 }
 
 // extending the array class and using a constructor doesn't work well
@@ -108,7 +110,12 @@ export const fieldList = (
     }: {
       getFormatterForField?: IndexPattern['getFormatterForField'];
     } = {}) {
-      return [...this.map((field) => field.toSpec({ getFormatterForField }))];
+      return {
+        ...this.reduce<IndexPatternFieldMap>((collector, field) => {
+          collector[field.name] = field.toSpec({ getFormatterForField });
+          return collector;
+        }, {}),
+      };
     }
   }
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 781cb8e0d66780..c6d9ba233946b5 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -32,11 +32,9 @@ import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
 import { expandShorthand, MappingObject } from '../../field_mapping';
-import { IndexPatternSpec, TypeMeta, FieldSpec, SourceFilter } from '../types';
+import { IndexPatternSpec, TypeMeta, SourceFilter, IndexPatternFieldMap } from '../types';
 import { SerializedFieldFormat } from '../../../../expressions/common';
 
-const savedObjectType = 'index-pattern';
-
 interface IndexPatternDeps {
   spec?: IndexPatternSpec;
   savedObjectsClient: SavedObjectsClientCommon;
@@ -50,7 +48,7 @@ export class IndexPattern implements IIndexPattern {
   public title: string = '';
   public fieldFormatMap: any;
   public typeMeta?: TypeMeta;
-  public fields: IIndexPatternFieldList & { toSpec: () => FieldSpec[] };
+  public fields: IIndexPatternFieldList & { toSpec: () => IndexPatternFieldMap };
   public timeFieldName: string | undefined;
   public intervalName: string | undefined;
   public type: string | undefined;
@@ -123,7 +121,7 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    this.fields.replaceAll(spec.fields || []);
+    this.fields.replaceAll(Object.values(spec.fields || {}));
     this.type = spec.type;
     this.typeMeta = spec.typeMeta;
 
@@ -150,8 +148,8 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
-  private fieldSpecsToFieldFormatMap = (fldList: IndexPatternSpec['fields'] = []) =>
-    fldList.reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
+  private fieldSpecsToFieldFormatMap = (fldList: IndexPatternSpec['fields'] = {}) =>
+    Object.values(fldList).reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
       if (fieldSpec.format) {
         col[fieldSpec.name] = { ...fieldSpec.format };
       }
@@ -179,7 +177,7 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    this.fields.replaceAll(spec.fields || []);
+    this.fields.replaceAll(Object.values(spec.fields || {}));
     this.typeMeta = spec.typeMeta;
     this.type = spec.type;
 
@@ -299,7 +297,7 @@ export class IndexPattern implements IIndexPattern {
     field.count = count;
 
     try {
-      const res = await this.savedObjectsClient.update(savedObjectType, this.id, this.prepBody(), {
+      const res = await this.savedObjectsClient.update('index-pattern', this.id, this.prepBody(), {
         version: this.version,
       });
       this.version = res.version;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index f7f3018f9b3711..573be1f79132ba 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -36,6 +36,7 @@ import {
   IndexPatternAttributes,
   FieldSpec,
   FieldFormatMap,
+  IndexPatternFieldMap,
 } from '../types';
 import { FieldFormatsStartCommon } from '../../field_formats';
 import { UI_SETTINGS, SavedObject } from '../../../common';
@@ -170,12 +171,12 @@ export class IndexPatternsService {
     }
   };
 
-  private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
+  private isFieldRefreshRequired(specs?: IndexPatternFieldMap): boolean {
     if (!specs) {
       return true;
     }
 
-    return specs.every((spec) => {
+    return Object.values(specs).every((spec) => {
       // See https://github.com/elastic/kibana/pull/8421
       const hasFieldCaps = 'aggregatable' in spec && 'searchable' in spec;
 
@@ -214,20 +215,20 @@ export class IndexPatternsService {
     indexPattern.fields.replaceAll([...fields, ...scripted]);
   };
 
-  private refreshFieldSpecArray = async (
-    fields: FieldSpec[],
+  private refreshFieldSpecMap = async (
+    fields: IndexPatternFieldMap,
     id: string,
     title: string,
     options: GetFieldsOptions
   ) => {
-    const scriptdFields = fields.filter((field) => field.scripted);
+    const scriptdFields = Object.values(fields).filter((field) => field.scripted);
     try {
       const newFields = await this.getFieldsForWildcard(options);
-      return [...newFields, ...scriptdFields];
+      return this.fieldArrayToMap([...newFields, ...scriptdFields]);
     } catch (err) {
       if (err instanceof IndexPatternMissingIndices) {
         this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
-        return [];
+        return {};
       }
 
       this.onError(err, {
@@ -249,6 +250,12 @@ export class IndexPatternsService {
     });
   };
 
+  fieldArrayToMap = (fields: FieldSpec[]) =>
+    fields.reduce<IndexPatternFieldMap>((collector, field) => {
+      collector[field.name] = field;
+      return collector;
+    }, {});
+
   savedObjectToSpec = (savedObject: SavedObject<IndexPatternAttributes>): IndexPatternSpec => {
     const {
       id,
@@ -265,10 +272,10 @@ export class IndexPatternsService {
       },
     } = savedObject;
 
-    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
-    const parsedFields = fields ? JSON.parse(fields) : [];
-    const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
     const parsedSourceFilters = sourceFilters ? JSON.parse(sourceFilters) : undefined;
+    const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
+    const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
+    const parsedFields: FieldSpec[] = fields ? JSON.parse(fields) : [];
 
     this.mergeFieldsAndFormats(parsedFields, parsedFieldFormatMap);
     return {
@@ -278,7 +285,7 @@ export class IndexPatternsService {
       intervalName,
       timeFieldName,
       sourceFilters: parsedSourceFilters,
-      fields: parsedFields,
+      fields: this.fieldArrayToMap(parsedFields),
       typeMeta: parsedTypeMeta,
       type,
     };
@@ -309,7 +316,7 @@ export class IndexPatternsService {
     let isSaveRequired = isFieldRefreshRequired;
     try {
       spec.fields = isFieldRefreshRequired
-        ? await this.refreshFieldSpecArray(spec.fields || [], id, spec.title as string, {
+        ? await this.refreshFieldSpecMap(spec.fields || {}, id, spec.title as string, {
             pattern: title,
             metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
             type,
@@ -335,7 +342,7 @@ export class IndexPatternsService {
     }
 
     Object.entries(parsedFieldFormats).forEach(([fieldName, value]) => {
-      const field = (spec.fields || []).find((fld: FieldSpec) => fld.name === fieldName);
+      const field = spec.fields?.[fieldName];
       if (field) {
         field.format = value;
       }
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index d4e61cda398690..1c9c4840d2db8b 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -168,6 +168,8 @@ export interface FieldSpec {
   indexed?: boolean;
 }
 
+export type IndexPatternFieldMap = Record<string, FieldSpec>;
+
 export interface IndexPatternSpec {
   id?: string;
   version?: string;
@@ -175,7 +177,7 @@ export interface IndexPatternSpec {
   intervalName?: string;
   timeFieldName?: string;
   sourceFilters?: SourceFilter[];
-  fields?: FieldSpec[];
+  fields?: IndexPatternFieldMap;
   typeMeta?: TypeMeta;
   type?: string;
 }

From 0419ad6dcc4988b1a6d47957027469a67a32ce74 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 15 Sep 2020 22:09:52 -0500
Subject: [PATCH 37/57] fix a couple of missed function renames, make
 originalBody readonly

---
 .../index_patterns/index_patterns/index_pattern.ts  | 13 +++++++++----
 .../index_patterns/index_patterns/index_patterns.ts |  7 ++++---
 .../file_upload/public/util/indexing_service.js     |  2 +-
 .../components/import_view/import_view.js           |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index c6d9ba233946b5..5e0486ad1a5121 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -56,16 +56,15 @@ export class IndexPattern implements IIndexPattern {
   public formatField: any;
   public flattenHit: any;
   public metaFields: string[];
-
-  // todo rename
+  // savedObject version
   public version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   public sourceFilters?: SourceFilter[];
-  // todo make read  only, update via  method or factor out
-  public originalBody: { [key: string]: any } = {};
+  private originalBody: { [key: string]: any } = {};
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
 
+  // todo  get rid  of this
   private mapping: MappingObject = expandShorthand({
     title: ES_FIELD_TYPES.TEXT,
     timeFieldName: ES_FIELD_TYPES.KEYWORD,
@@ -130,6 +129,12 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
+  getOriginalBody = () => ({ ...this.originalBody });
+
+  resetOriginalBody = () => {
+    this.originalBody = this.prepBody();
+  };
+
   private serializeFieldFormatMap(flat: any, format: string, field: string | undefined) {
     if (format && field) {
       flat[field] = format;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 573be1f79132ba..ef0e0e084fe1c0 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -367,7 +367,7 @@ export class IndexPatternsService {
       }
     }
     // todo better way to do this
-    indexPattern.originalBody = indexPattern.prepBody();
+    indexPattern.resetOriginalBody();
     return indexPattern;
   };
 
@@ -440,11 +440,12 @@ export class IndexPatternsService {
 
     // get the list of attributes
     const body = indexPattern.prepBody();
+    const originalBody = indexPattern.getOriginalBody();
 
     // get changed keys
     const originalChangedKeys: string[] = [];
     Object.entries(body).forEach(([key, value]) => {
-      if (value !== indexPattern.originalBody[key]) {
+      if (value !== originalBody[key]) {
         originalChangedKeys.push(key);
       }
     });
@@ -468,7 +469,7 @@ export class IndexPatternsService {
 
           const serverChangedKeys: string[] = [];
           Object.entries(updatedBody).forEach(([key, value]) => {
-            if (value !== (body as any)[key] && value !== indexPattern.originalBody[key]) {
+            if (value !== (body as any)[key] && value !== originalBody[key]) {
               serverChangedKeys.push(key);
             }
           });
diff --git a/x-pack/plugins/file_upload/public/util/indexing_service.js b/x-pack/plugins/file_upload/public/util/indexing_service.js
index 3c68c73298f206..28cdb602455b52 100644
--- a/x-pack/plugins/file_upload/public/util/indexing_service.js
+++ b/x-pack/plugins/file_upload/public/util/indexing_service.js
@@ -190,7 +190,7 @@ async function chunkDataAndWriteToIndex({ id, index, data, mappings, settings })
 
 export async function createIndexPattern(indexPatternName) {
   try {
-    const indexPattern = await indexPatternService.newIndexPatternAndSave(
+    const indexPattern = await indexPatternService.createAndSave(
       {
         title: indexPatternName,
       },
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
index 4e061a438ea05c..cf306828f4c01a 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
@@ -603,7 +603,7 @@ export class ImportView extends Component {
 
 async function createKibanaIndexPattern(indexPatternName, indexPatterns, timeFieldName) {
   try {
-    const emptyPattern = await indexPatterns.newIndexPatternAndSave({
+    const emptyPattern = await indexPatterns.createAndSave({
       title: indexPatternName,
       timeFieldName,
     });

From 6570f650204636e91880d69427dcfe98ea59396d Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 01:10:00 -0500
Subject: [PATCH 38/57] move deprecation warning and make isWildcard private

---
 src/plugins/data/common/index.ts                           | 7 +++++++
 .../common/index_patterns/index_patterns/index_pattern.ts  | 2 +-
 src/plugins/data/common/index_patterns/types.ts            | 4 ----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index bc7080e7d450b7..153b6a633b66d1 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -27,3 +27,10 @@ export * from './query';
 export * from './search';
 export * from './types';
 export * from './utils';
+
+/**
+ * Use data plugin interface instead
+ * @deprecated
+ */
+
+export { IndexPatternAttributes } from './types';
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 5e0486ad1a5121..057e0a731aa8de 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -346,7 +346,7 @@ export class IndexPattern implements IIndexPattern {
     return this.typeMeta?.aggs;
   }
 
-  isWildcard() {
+  private isWildcard() {
     return _.includes(this.title, '*');
   }
 
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 1c9c4840d2db8b..72af827dbf1b97 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -43,10 +43,6 @@ export interface IIndexPattern {
   >;
 }
 
-/**
- * Use data plugin interface instead
- * @deprecated
- */
 export interface IndexPatternAttributes {
   type: string;
   fields: string;

From cad1ed9c43777a9f16230d0d48204be8101daf12 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 12:07:16 -0500
Subject: [PATCH 39/57] fix merge

---
 .../index_patterns/index_patterns/index_patterns.ts   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 9cff2a4be698ca..50c8826c7f30cb 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObjectsClientCommon, DuplicateIndexPatternError } from '../..';
+import { SavedObjectsClientCommon } from '../..';
 
 import { createIndexPatternCache } from '.';
 import { IndexPattern } from './index_pattern';
@@ -43,6 +43,7 @@ import { UI_SETTINGS, SavedObject } from '../../../common';
 import { SavedObjectNotFound } from '../../../../kibana_utils/common';
 import { IndexPatternMissingIndices } from '../lib';
 import { findByTitle } from '../utils';
+import { DuplicateIndexPatternError } from '..';
 
 const indexPatternCache = createIndexPatternCache();
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
@@ -121,14 +122,6 @@ export class IndexPatternsService {
     return this.savedObjectsCache.map((obj) => obj?.attributes?.title);
   };
 
-  getFieldsForTimePattern = (options: GetFieldsOptions = {}) => {
-    return this.apiClient.getFieldsForTimePattern(options);
-  };
-
-  getFieldsForWildcard = (options: GetFieldsOptions = {}) => {
-    return this.apiClient.getFieldsForWildcard(options);
-  };
-
   clearCache = (id?: string) => {
     this.savedObjectsCache = null;
     if (id) {

From f166f73d9a105ad227e4676cb898bc62906d39aa Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 12:19:27 -0500
Subject: [PATCH 40/57] remove usage of initFromSpec

---
 .../index_patterns/_fields_fetcher.ts         | 36 -------------------
 .../index_patterns/index_patterns.ts          |  3 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts

diff --git a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts b/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
deleted file mode 100644
index 6b56957abc5a69..00000000000000
--- a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 { GetFieldsOptions, IIndexPatternsApiClient } from '../types';
-
-/** @internal */
-export const createFieldsFetcher = (apiClient: IIndexPatternsApiClient) => {
-  const fieldFetcher = {
-    fetchForWildcard: (pattern: string, options: GetFieldsOptions = {}) => {
-      return apiClient.getFieldsForWildcard({
-        pattern,
-        metaFields: options.metaFields,
-        type: options.type,
-        params: options.params || {},
-      });
-    },
-  };
-
-  return fieldFetcher;
-};
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 50c8826c7f30cb..7fb6069813e973 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -131,7 +131,6 @@ export class IndexPatternsService {
     }
   };
 
-  // rename
   getCache = async () => {
     if (!this.savedObjectsCache) {
       await this.refreshSavedObjectsCache();
@@ -331,7 +330,7 @@ export class IndexPatternsService {
       }
     });
 
-    const indexPattern = await this.specToIndexPattern(spec);
+    const indexPattern = await this.create(spec, true);
     indexPatternCache.set(id, indexPattern);
     if (isSaveRequired) {
       try {

From 8ffa520c9046680cf6ec4e864148b56f23d81bed Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 17:20:07 -0500
Subject: [PATCH 41/57] update docs and fix functional test

---
 ...ata-public.iindexpattern.fieldformatmap.md |  5 ++-
 ...lugin-plugins-data-public.iindexpattern.md |  2 +-
 ...ta-public.iindexpatternfieldlist.tospec.md |  4 +--
 ...plugins-data-public.indexpattern.fields.md |  2 +-
 ...ta-public.indexpattern.getoriginalbody.md} |  8 ++---
 ...s-data-public.indexpattern.initfromspec.md | 22 -------------
 ...plugin-plugins-data-public.indexpattern.md |  7 ++--
 ...-public.indexpattern.resetoriginalbody.md} | 10 ++----
 ...gins-data-public.indexpatternattributes.md |  6 ----
 ...ins-data-public.indexpatternspec.fields.md |  2 +-
 ...in-plugins-data-public.indexpatternspec.md |  2 +-
 .../kibana-plugin-plugins-data-public.md      |  2 +-
 ...ata-server.iindexpattern.fieldformatmap.md |  5 ++-
 ...lugin-plugins-data-server.iindexpattern.md |  2 +-
 ...gins-data-server.indexpatternattributes.md |  6 ----
 .../kibana-plugin-plugins-data-server.md      |  2 +-
 .../index_patterns/index_pattern.ts           | 32 -------------------
 .../index_patterns/index_patterns.ts          | 18 +----------
 src/plugins/data/public/public.api.md         | 31 +++++++++---------
 src/plugins/data/server/server.api.md         |  9 +++---
 .../plugins/index_patterns/server/plugin.ts   |  2 +-
 .../test_suites/data_plugin/index_patterns.ts | 10 +++---
 22 files changed, 55 insertions(+), 134 deletions(-)
 rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.indexpattern.originalbody.md => kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md} (52%)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.initfromspec.md
 rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.indexpattern.iswildcard.md => kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md} (53%)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
index 6d5c8bbde5cee8..2c131c6da99377 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
@@ -7,5 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: FieldFormatMap;
+fieldFormatMap?: Record<string, {
+        id: string;
+        params: unknown;
+    }>;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
index 120e6e2f9b29a7..1cb89822eb605d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>FieldFormatMap</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
index fd20f2944c5be3..0fe62f575a927b 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
@@ -9,7 +9,7 @@
 ```typescript
 toSpec(options?: {
         getFormatterForField?: IndexPattern['getFormatterForField'];
-    }): FieldSpec[];
+    }): IndexPatternFieldMap;
 ```
 
 ## Parameters
@@ -20,5 +20,5 @@ toSpec(options?: {
 
 <b>Returns:</b>
 
-`FieldSpec[]`
+`IndexPatternFieldMap`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fields.md
index d4dca48c7cd7b4..76bc41238526ef 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fields.md
@@ -8,6 +8,6 @@
 
 ```typescript
 fields: IIndexPatternFieldList & {
-        toSpec: () => FieldSpec[];
+        toSpec: () => IndexPatternFieldMap;
     };
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.originalbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
similarity index 52%
rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.originalbody.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
index 4bc3c76afbae98..a63d68fa6a8613 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.originalbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
@@ -1,13 +1,13 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [originalBody](./kibana-plugin-plugins-data-public.indexpattern.originalbody.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md)
 
-## IndexPattern.originalBody property
+## IndexPattern.getOriginalBody property
 
 <b>Signature:</b>
 
 ```typescript
-originalBody: {
-        [key: string]: any;
+getOriginalBody: () => {
+        [x: string]: any;
     };
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.initfromspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.initfromspec.md
deleted file mode 100644
index 764dd116382217..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.initfromspec.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [initFromSpec](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md)
-
-## IndexPattern.initFromSpec() method
-
-<b>Signature:</b>
-
-```typescript
-initFromSpec(spec: IndexPatternSpec): this;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  spec | <code>IndexPatternSpec</code> |  |
-
-<b>Returns:</b>
-
-`this`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index 3500c6e43af257..60749fbe6c6303 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -21,14 +21,15 @@ export declare class IndexPattern implements IIndexPattern
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
 |  [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) |  | <code>any</code> |  |
-|  [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) |  | <code>IIndexPatternFieldList &amp; {</code><br/><code>        toSpec: () =&gt; FieldSpec[];</code><br/><code>    }</code> |  |
+|  [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) |  | <code>IIndexPatternFieldList &amp; {</code><br/><code>        toSpec: () =&gt; IndexPatternFieldMap;</code><br/><code>    }</code> |  |
 |  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>any</code> |  |
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
+|  [getOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: any;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |
 |  [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) |  | <code>string[]</code> |  |
-|  [originalBody](./kibana-plugin-plugins-data-public.indexpattern.originalbody.md) |  | <code>{</code><br/><code>        [key: string]: any;</code><br/><code>    }</code> |  |
+|  [resetOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md) |  | <code>() =&gt; void</code> |  |
 |  [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) |  | <code>SourceFilter[]</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) |  | <code>string &#124; undefined</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) |  | <code>string</code> |  |
@@ -49,11 +50,9 @@ export declare class IndexPattern implements IIndexPattern
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
-|  [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) |  |  |
-|  [isWildcard()](./kibana-plugin-plugins-data-public.indexpattern.iswildcard.md) |  |  |
 |  [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) |  |  |
 |  [prepBody()](./kibana-plugin-plugins-data-public.indexpattern.prepbody.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.iswildcard.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md
similarity index 53%
rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.iswildcard.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md
index e5ea55ef1dd48c..584290c4814454 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.iswildcard.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md
@@ -1,15 +1,11 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [isWildcard](./kibana-plugin-plugins-data-public.indexpattern.iswildcard.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [resetOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md)
 
-## IndexPattern.isWildcard() method
+## IndexPattern.resetOriginalBody property
 
 <b>Signature:</b>
 
 ```typescript
-isWildcard(): boolean;
+resetOriginalBody: () => void;
 ```
-<b>Returns:</b>
-
-`boolean`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
index eff2349f053ffa..77a8ebb0b2d3f6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
@@ -4,12 +4,6 @@
 
 ## IndexPatternAttributes interface
 
-> Warning: This API is now obsolete.
-> 
-> 
-
-Use data plugin interface instead
-
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
index 5723d31dd5df64..386e080dbe6c20 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fields.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fields?: FieldSpec[];
+fields?: IndexPatternFieldMap;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
index 1acf2edf36770c..74c4df126e1bf6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
@@ -14,7 +14,7 @@ export interface IndexPatternSpec
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fields](./kibana-plugin-plugins-data-public.indexpatternspec.fields.md) | <code>FieldSpec[]</code> |  |
+|  [fields](./kibana-plugin-plugins-data-public.indexpatternspec.fields.md) | <code>IndexPatternFieldMap</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.indexpatternspec.id.md) | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpatternspec.intervalname.md) | <code>string</code> |  |
 |  [sourceFilters](./kibana-plugin-plugins-data-public.indexpatternspec.sourcefilters.md) | <code>SourceFilter[]</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index cd0c42d333d675..471078bd4bfea6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -68,7 +68,7 @@
 |  [IIndexPatternFieldList](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.md) |  |
 |  [IKibanaSearchRequest](./kibana-plugin-plugins-data-public.ikibanasearchrequest.md) |  |
 |  [IKibanaSearchResponse](./kibana-plugin-plugins-data-public.ikibanasearchresponse.md) |  |
-|  [IndexPatternAttributes](./kibana-plugin-plugins-data-public.indexpatternattributes.md) | Use data plugin interface instead |
+|  [IndexPatternAttributes](./kibana-plugin-plugins-data-public.indexpatternattributes.md) |  |
 |  [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) |  |
 |  [IndexPatternTypeMeta](./kibana-plugin-plugins-data-public.indexpatterntypemeta.md) |  |
 |  [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
index 1917a09df9cabd..ab9e3171d7d7bd 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
@@ -7,5 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: FieldFormatMap;
+fieldFormatMap?: Record<string, {
+        id: string;
+        params: unknown;
+    }>;
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
index 6069f4a221fac5..a79244a24acf57 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>FieldFormatMap</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-server.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-server.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-server.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
index 4a5b61f5c179b6..40b029da00469d 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
@@ -4,12 +4,6 @@
 
 ## IndexPatternAttributes interface
 
-> Warning: This API is now obsolete.
-> 
-> 
-
-Use data plugin interface instead
-
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index f5b587d86b3491..b2fba101021185 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -48,7 +48,7 @@
 |  [IFieldSubType](./kibana-plugin-plugins-data-server.ifieldsubtype.md) |  |
 |  [IFieldType](./kibana-plugin-plugins-data-server.ifieldtype.md) |  |
 |  [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) |  |
-|  [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) | Use data plugin interface instead |
+|  [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) |  |
 |  [IndexPatternFieldDescriptor](./kibana-plugin-plugins-data-server.indexpatternfielddescriptor.md) |  |
 |  [ISearchOptions](./kibana-plugin-plugins-data-server.isearchoptions.md) |  |
 |  [ISearchSetup](./kibana-plugin-plugins-data-server.isearchsetup.md) |  |
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 057e0a731aa8de..22a5af0f534f7f 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -161,38 +161,6 @@ export class IndexPattern implements IIndexPattern {
       return col;
     }, {});
 
-  // this is swallowed by constructor
-  public initFromSpec(spec: IndexPatternSpec) {
-    // create fieldFormatMap from field list
-    /*
-    const fieldFormatMap: Record<string, SerializedFieldFormat> = {};
-    if (_.isArray(spec.fields)) {
-      spec.fields.forEach((field: FieldSpec) => {
-        if (field.format) {
-          fieldFormatMap[field.name as string] = { ...field.format };
-        }
-      });
-    }
-    */
-    const fieldFormatMap = this.fieldSpecsToFieldFormatMap(spec.fields);
-
-    this.version = spec.version;
-
-    this.title = spec.title || '';
-    this.timeFieldName = spec.timeFieldName;
-    this.sourceFilters = spec.sourceFilters;
-
-    this.fields.replaceAll(Object.values(spec.fields || {}));
-    this.typeMeta = spec.typeMeta;
-    this.type = spec.type;
-
-    this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
-      return this.deserializeFieldFormatMap(mapping);
-    });
-
-    return this;
-  }
-
   getComputedFields() {
     const scriptFields: any = {};
     if (!this.fields) {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 7fb6069813e973..7d470f93c445eb 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -43,7 +43,7 @@ import { UI_SETTINGS, SavedObject } from '../../../common';
 import { SavedObjectNotFound } from '../../../../kibana_utils/common';
 import { IndexPatternMissingIndices } from '../lib';
 import { findByTitle } from '../utils';
-import { DuplicateIndexPatternError } from '..';
+import { DuplicateIndexPatternError } from '../errors';
 
 const indexPatternCache = createIndexPatternCache();
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
@@ -353,22 +353,6 @@ export class IndexPatternsService {
     return indexPattern;
   };
 
-  async specToIndexPattern(spec: IndexPatternSpec) {
-    const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
-    const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
-
-    const indexPattern = new IndexPattern({
-      spec,
-      savedObjectsClient: this.savedObjectsClient,
-      fieldFormats: this.fieldFormats,
-      shortDotsEnable,
-      metaFields,
-    });
-
-    indexPattern.initFromSpec(spec);
-    return indexPattern;
-  }
-
   async create(spec: IndexPatternSpec, skipFetchFields = false): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 76a46e7dd1bd65..c84fc0e1312abc 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1020,10 +1020,11 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
-    // Warning: (ae-forgotten-export) The symbol "FieldFormatMap" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
-    fieldFormatMap?: FieldFormatMap;
+    fieldFormatMap?: Record<string, {
+        id: string;
+        params: unknown;
+    }>;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
@@ -1056,10 +1057,12 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
     removeAll(): void;
     // (undocumented)
     replaceAll(specs: FieldSpec[]): void;
+    // Warning: (ae-forgotten-export) The symbol "IndexPatternFieldMap" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
     toSpec(options?: {
         getFormatterForField?: IndexPattern['getFormatterForField'];
-    }): FieldSpec[];
+    }): IndexPatternFieldMap;
     // (undocumented)
     update(field: FieldSpec): void;
 }
@@ -1099,7 +1102,7 @@ export class IndexPattern implements IIndexPattern {
     fieldFormatMap: any;
     // (undocumented)
     fields: IIndexPatternFieldList & {
-        toSpec: () => FieldSpec[];
+        toSpec: () => IndexPatternFieldMap;
     };
     // (undocumented)
     flattenHit: any;
@@ -1132,6 +1135,10 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     getNonScriptedFields(): IndexPatternField[];
     // (undocumented)
+    getOriginalBody: () => {
+        [x: string]: any;
+    };
+    // (undocumented)
     getScriptedFields(): IndexPatternField[];
     // (undocumented)
     getSourceFiltering(): {
@@ -1142,8 +1149,6 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     id?: string;
     // (undocumented)
-    initFromSpec(spec: IndexPatternSpec): this;
-    // (undocumented)
     intervalName: string | undefined;
     // (undocumented)
     isTimeBased(): boolean;
@@ -1152,14 +1157,8 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     isTimeNanosBased(): boolean;
     // (undocumented)
-    isWildcard(): boolean;
-    // (undocumented)
     metaFields: string[];
     // (undocumented)
-    originalBody: {
-        [key: string]: any;
-    };
-    // (undocumented)
     popularizeField(fieldName: string, unit?: number): Promise<void>;
     // (undocumented)
     prepBody(): {
@@ -1174,6 +1173,8 @@ export class IndexPattern implements IIndexPattern {
     };
     // (undocumented)
     removeScriptedField(fieldName: string): void;
+    // (undocumented)
+    resetOriginalBody: () => void;
     // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -1206,7 +1207,7 @@ export type IndexPatternAggRestrictions = Record<string, {
 
 // Warning: (ae-missing-release-tag) "IndexPatternAttributes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public @deprecated
+// @public (undocumented)
 export interface IndexPatternAttributes {
     // (undocumented)
     fieldFormatMap?: string;
@@ -1362,7 +1363,7 @@ export class IndexPatternSelect extends Component<IndexPatternSelectProps> {
 // @public (undocumented)
 export interface IndexPatternSpec {
     // (undocumented)
-    fields?: FieldSpec[];
+    fields?: IndexPatternFieldMap;
     // (undocumented)
     id?: string;
     // (undocumented)
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index e5a67c606d6ebc..d925f9082378e1 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -603,10 +603,11 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
-    // Warning: (ae-forgotten-export) The symbol "FieldFormatMap" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
-    fieldFormatMap?: FieldFormatMap;
+    fieldFormatMap?: Record<string, {
+        id: string;
+        params: unknown;
+    }>;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
@@ -629,7 +630,7 @@ export type IMetricAggType = MetricAggType;
 
 // Warning: (ae-missing-release-tag) "IndexPatternAttributes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public @deprecated
+// @public (undocumented)
 export interface IndexPatternAttributes {
     // (undocumented)
     fieldFormatMap?: string;
diff --git a/test/plugin_functional/plugins/index_patterns/server/plugin.ts b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
index 1c85f226623cb8..ddf9acb2599834 100644
--- a/test/plugin_functional/plugins/index_patterns/server/plugin.ts
+++ b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
@@ -78,7 +78,7 @@ export class IndexPatternsTestPlugin
         const id = (req.params as Record<string, string>).id;
         const service = await data.indexPatterns.indexPatternsServiceFactory(req);
         const ip = await service.get(id);
-        await service.save(ip);
+        await service.updateSavedObject(ip);
         return res.ok();
       }
     );
diff --git a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
index 2db9eb733f8057..7e736ea7a066f0 100644
--- a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
+++ b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
@@ -46,14 +46,14 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       const body = await (
         await supertest.get(`/api/index-patterns-plugin/get/${indexPatternId}`).expect(200)
       ).body;
-      expect(body.fields.length > 0).to.equal(true);
+      expect(typeof body.id).to.equal('string');
     });
 
     it('can update index pattern', async () => {
-      const body = await (
-        await supertest.get(`/api/index-patterns-plugin/update/${indexPatternId}`).expect(200)
-      ).body;
-      expect(body).to.eql({});
+      const resp = await supertest
+        .get(`/api/index-patterns-plugin/update/${indexPatternId}`)
+        .expect(200);
+      expect(resp.body).to.eql({});
     });
 
     it('can delete index pattern', async () => {

From 1d63577e02288a8ed06ea89cc51b5a9c63b8b0a8 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 21:42:10 -0500
Subject: [PATCH 42/57] fix index pattern wizard test

---
 src/fixtures/stubbed_saved_object_index_pattern.ts |  4 ++--
 .../__snapshots__/step_time_field.test.tsx.snap    | 14 +++++++-------
 .../step_time_field/step_time_field.test.tsx       |  7 ++-----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/fixtures/stubbed_saved_object_index_pattern.ts b/src/fixtures/stubbed_saved_object_index_pattern.ts
index 44b391f14cf9cd..261e451db5452e 100644
--- a/src/fixtures/stubbed_saved_object_index_pattern.ts
+++ b/src/fixtures/stubbed_saved_object_index_pattern.ts
@@ -28,10 +28,10 @@ export function stubbedSavedObjectIndexPattern(id: string | null = null) {
     type: 'index-pattern',
     attributes: {
       timeFieldName: 'timestamp',
-      customFormats: '{}',
+      customFormats: {},
       fields: mockLogstashFields,
       title: 'title',
     },
-    version: 2,
+    version: '2',
   };
 }
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap
index 6cc92d20cfdcc1..544e3ba9831226 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`StepTimeField should render "Custom index pattern ID already exists" wh
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={false}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={Array []}
@@ -117,7 +117,7 @@ exports[`StepTimeField should render a selected timeField 1`] = `
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={true}
     onTimeFieldChanged={[Function]}
     selectedTimeField="@timestamp"
@@ -169,7 +169,7 @@ exports[`StepTimeField should render advanced options 1`] = `
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={false}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={Array []}
@@ -203,7 +203,7 @@ exports[`StepTimeField should render advanced options with an index pattern id 1
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={false}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={Array []}
@@ -237,7 +237,7 @@ exports[`StepTimeField should render any error message 1`] = `
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={false}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={Array []}
@@ -289,7 +289,7 @@ exports[`StepTimeField should render normally 1`] = `
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={false}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={Array []}
@@ -323,7 +323,7 @@ exports[`StepTimeField should render timeFields 1`] = `
   />
   <TimeField
     fetchTimeFields={[Function]}
-    isLoading={false}
+    isLoading={true}
     isVisible={true}
     onTimeFieldChanged={[Function]}
     timeFieldOptions={
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
index 51e060e02bf031..aec010d2dd3f8c 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx
@@ -48,11 +48,8 @@ const fields = [
   },
 ];
 mockContext.data.indexPatterns = {
-  newIndexPattern: () => ({
-    fieldsFetcher: {
-      fetchForWildcard: jest.fn().mockReturnValue(Promise.resolve(fields)),
-    },
-  }),
+  create: () => ({}),
+  getFieldsForWildcard: jest.fn().mockReturnValue(Promise.resolve(fields)),
 } as any;
 
 describe('StepTimeField', () => {

From 9b86c1e62b69438a1416a81043ab51f72a5fddcf Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Wed, 16 Sep 2020 22:01:07 -0500
Subject: [PATCH 43/57] fix index pattern jest test

---
 .../__snapshots__/index_pattern.test.ts.snap  | 326 +++++++++---------
 .../index_patterns/index_pattern.test.ts      | 114 ++----
 2 files changed, 183 insertions(+), 257 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
index 2453611cf02a61..ed84aceb60e5ab 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
@@ -2,13 +2,13 @@
 
 exports[`IndexPattern toSpec should match snapshot 1`] = `
 Object {
-  "fields": Array [
-    Object {
+  "fields": Object {
+    "@tags": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 10,
+      "count": 0,
       "esTypes": Array [
-        "long",
+        "keyword",
       ],
       "format": Object {
         "id": "number",
@@ -17,20 +17,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "bytes",
+      "name": "@tags",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "number",
+      "type": "string",
     },
-    Object {
+    "@timestamp": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 20,
+      "count": 30,
       "esTypes": Array [
-        "boolean",
+        "date",
       ],
       "format": Object {
         "id": "number",
@@ -39,20 +39,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "ssl",
+      "name": "@timestamp",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "boolean",
+      "type": "date",
     },
-    Object {
+    "_id": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 30,
+      "count": 0,
       "esTypes": Array [
-        "date",
+        "_id",
       ],
       "format": Object {
         "id": "number",
@@ -61,20 +61,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "@timestamp",
-      "readFromDocValues": true,
+      "name": "_id",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "date",
+      "type": "string",
     },
-    Object {
+    "_source": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 30,
+      "count": 0,
       "esTypes": Array [
-        "date",
+        "_source",
       ],
       "format": Object {
         "id": "number",
@@ -83,20 +83,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "time",
-      "readFromDocValues": true,
+      "name": "_source",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "date",
+      "type": "_source",
     },
-    Object {
+    "_type": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "keyword",
+        "_type",
       ],
       "format": Object {
         "id": "number",
@@ -105,20 +105,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "@tags",
-      "readFromDocValues": true,
+      "name": "_type",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
       "type": "string",
     },
-    Object {
+    "area": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "date",
+        "geo_shape",
       ],
       "format": Object {
         "id": "number",
@@ -127,20 +127,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "utc_time",
-      "readFromDocValues": true,
+      "name": "area",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "date",
+      "type": "geo_shape",
     },
-    Object {
+    "bytes": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 0,
+      "count": 10,
       "esTypes": Array [
-        "integer",
+        "long",
       ],
       "format": Object {
         "id": "number",
@@ -149,7 +149,7 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "phpmemory",
+      "name": "bytes",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
@@ -157,12 +157,12 @@ Object {
       "subType": undefined,
       "type": "number",
     },
-    Object {
+    "custom_user_field": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "ip",
+        "conflict",
       ],
       "format": Object {
         "id": "number",
@@ -171,20 +171,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "ip",
+      "name": "custom_user_field",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "ip",
+      "type": "conflict",
     },
-    Object {
+    "extension": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "attachment",
+        "text",
       ],
       "format": Object {
         "id": "number",
@@ -193,15 +193,41 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "request_body",
-      "readFromDocValues": true,
+      "name": "extension",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "attachment",
+      "type": "string",
     },
-    Object {
+    "extension.keyword": Object {
+      "aggregatable": true,
+      "conflictDescriptions": undefined,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "lang": undefined,
+      "name": "extension.keyword",
+      "readFromDocValues": true,
+      "script": undefined,
+      "scripted": false,
+      "searchable": true,
+      "subType": Object {
+        "multi": Object {
+          "parent": "extension",
+        },
+      },
+      "type": "string",
+    },
+    "geo.coordinates": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -215,7 +241,7 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "point",
+      "name": "geo.coordinates",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
@@ -223,12 +249,12 @@ Object {
       "subType": undefined,
       "type": "geo_point",
     },
-    Object {
+    "geo.src": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "geo_shape",
+        "keyword",
       ],
       "format": Object {
         "id": "number",
@@ -237,15 +263,15 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "area",
-      "readFromDocValues": false,
+      "name": "geo.src",
+      "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "geo_shape",
+      "type": "string",
     },
-    Object {
+    "hashed": Object {
       "aggregatable": false,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -267,12 +293,12 @@ Object {
       "subType": undefined,
       "type": "murmur3",
     },
-    Object {
+    "ip": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "geo_point",
+        "ip",
       ],
       "format": Object {
         "id": "number",
@@ -281,15 +307,15 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "geo.coordinates",
+      "name": "ip",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "geo_point",
+      "type": "ip",
     },
-    Object {
+    "machine.os": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -303,7 +329,7 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "extension",
+      "name": "machine.os",
       "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
@@ -311,7 +337,7 @@ Object {
       "subType": undefined,
       "type": "string",
     },
-    Object {
+    "machine.os.raw": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -325,19 +351,19 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "extension.keyword",
+      "name": "machine.os.raw",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": Object {
         "multi": Object {
-          "parent": "extension",
+          "parent": "machine.os",
         },
       },
       "type": "string",
     },
-    Object {
+    "non-filterable": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -351,20 +377,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "machine.os",
+      "name": "non-filterable",
       "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
-      "searchable": true,
+      "searchable": false,
       "subType": undefined,
       "type": "string",
     },
-    Object {
-      "aggregatable": true,
+    "non-sortable": Object {
+      "aggregatable": false,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "keyword",
+        "text",
       ],
       "format": Object {
         "id": "number",
@@ -373,24 +399,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "machine.os.raw",
-      "readFromDocValues": true,
+      "name": "non-sortable",
+      "readFromDocValues": false,
       "script": undefined,
       "scripted": false,
-      "searchable": true,
-      "subType": Object {
-        "multi": Object {
-          "parent": "machine.os",
-        },
-      },
+      "searchable": false,
+      "subType": undefined,
       "type": "string",
     },
-    Object {
+    "phpmemory": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "keyword",
+        "integer",
       ],
       "format": Object {
         "id": "number",
@@ -399,20 +421,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "geo.src",
+      "name": "phpmemory",
       "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "string",
+      "type": "number",
     },
-    Object {
+    "point": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "_id",
+        "geo_point",
       ],
       "format": Object {
         "id": "number",
@@ -421,20 +443,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "_id",
-      "readFromDocValues": false,
+      "name": "point",
+      "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "string",
+      "type": "geo_point",
     },
-    Object {
+    "request_body": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "_type",
+        "attachment",
       ],
       "format": Object {
         "id": "number",
@@ -443,20 +465,20 @@ Object {
         },
       },
       "lang": undefined,
-      "name": "_type",
-      "readFromDocValues": false,
+      "name": "request_body",
+      "readFromDocValues": true,
       "script": undefined,
       "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "string",
+      "type": "attachment",
     },
-    Object {
+    "script date": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "_source",
+        "date",
       ],
       "format": Object {
         "id": "number",
@@ -464,43 +486,21 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": undefined,
-      "name": "_source",
+      "lang": "painless",
+      "name": "script date",
       "readFromDocValues": false,
-      "script": undefined,
-      "scripted": false,
+      "script": "1234",
+      "scripted": true,
       "searchable": true,
       "subType": undefined,
-      "type": "_source",
+      "type": "date",
     },
-    Object {
+    "script murmur3": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "text",
-      ],
-      "format": Object {
-        "id": "number",
-        "params": Object {
-          "pattern": "$0,0.[00]",
-        },
-      },
-      "lang": undefined,
-      "name": "non-filterable",
-      "readFromDocValues": false,
-      "script": undefined,
-      "scripted": false,
-      "searchable": false,
-      "subType": undefined,
-      "type": "string",
-    },
-    Object {
-      "aggregatable": false,
-      "conflictDescriptions": undefined,
-      "count": 0,
-      "esTypes": Array [
-        "text",
+        "murmur3",
       ],
       "format": Object {
         "id": "number",
@@ -508,21 +508,21 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": undefined,
-      "name": "non-sortable",
+      "lang": "expression",
+      "name": "script murmur3",
       "readFromDocValues": false,
-      "script": undefined,
-      "scripted": false,
-      "searchable": false,
+      "script": "1234",
+      "scripted": true,
+      "searchable": true,
       "subType": undefined,
-      "type": "string",
+      "type": "murmur3",
     },
-    Object {
+    "script number": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "conflict",
+        "long",
       ],
       "format": Object {
         "id": "number",
@@ -530,16 +530,16 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": undefined,
-      "name": "custom_user_field",
-      "readFromDocValues": true,
-      "script": undefined,
-      "scripted": false,
+      "lang": "expression",
+      "name": "script number",
+      "readFromDocValues": false,
+      "script": "1234",
+      "scripted": true,
       "searchable": true,
       "subType": undefined,
-      "type": "conflict",
+      "type": "number",
     },
-    Object {
+    "script string": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
@@ -561,12 +561,12 @@ Object {
       "subType": undefined,
       "type": "string",
     },
-    Object {
+    "ssl": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 0,
+      "count": 20,
       "esTypes": Array [
-        "long",
+        "boolean",
       ],
       "format": Object {
         "id": "number",
@@ -574,19 +574,19 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": "expression",
-      "name": "script number",
-      "readFromDocValues": false,
-      "script": "1234",
-      "scripted": true,
+      "lang": undefined,
+      "name": "ssl",
+      "readFromDocValues": true,
+      "script": undefined,
+      "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "number",
+      "type": "boolean",
     },
-    Object {
+    "time": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
-      "count": 0,
+      "count": 30,
       "esTypes": Array [
         "date",
       ],
@@ -596,21 +596,21 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": "painless",
-      "name": "script date",
-      "readFromDocValues": false,
-      "script": "1234",
-      "scripted": true,
+      "lang": undefined,
+      "name": "time",
+      "readFromDocValues": true,
+      "script": undefined,
+      "scripted": false,
       "searchable": true,
       "subType": undefined,
       "type": "date",
     },
-    Object {
+    "utc_time": Object {
       "aggregatable": true,
       "conflictDescriptions": undefined,
       "count": 0,
       "esTypes": Array [
-        "murmur3",
+        "date",
       ],
       "format": Object {
         "id": "number",
@@ -618,22 +618,22 @@ Object {
           "pattern": "$0,0.[00]",
         },
       },
-      "lang": "expression",
-      "name": "script murmur3",
-      "readFromDocValues": false,
-      "script": "1234",
-      "scripted": true,
+      "lang": undefined,
+      "name": "utc_time",
+      "readFromDocValues": true,
+      "script": undefined,
+      "scripted": false,
       "searchable": true,
       "subType": undefined,
-      "type": "murmur3",
+      "type": "date",
     },
-  ],
+  },
   "id": "test-pattern",
   "sourceFilters": undefined,
   "timeFieldName": "timestamp",
   "title": "title",
-  "type": undefined,
+  "type": "index-pattern",
   "typeMeta": undefined,
-  "version": 2,
+  "version": "2",
 }
 `;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index aa62cda222f945..7ba8168a6f2ad7 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { defaults, map, last } from 'lodash';
+import { map, last } from 'lodash';
 
 import { IndexPattern } from './index_pattern';
 
@@ -63,73 +63,33 @@ jest.mock('../../field_mapping', () => {
   };
 });
 
-let mockFieldsFetcherResponse: any[] = [];
-
-jest.mock('./_fields_fetcher', () => ({
-  createFieldsFetcher: jest.fn().mockImplementation(() => ({
-    fetch: jest.fn().mockImplementation(() => {
-      return new Promise((resolve) => resolve(mockFieldsFetcherResponse));
-    }),
-    every: jest.fn(),
-  })),
-}));
-
-let object: any = {};
-
-const savedObjectsClient = {
-  create: jest.fn(),
-  get: jest.fn().mockImplementation(() => object),
-  update: jest.fn().mockImplementation(async (type, id, body, { version }) => {
-    if (object.version !== version) {
-      throw new Object({
-        res: {
-          status: 409,
-        },
-      });
-    }
-    object.attributes.title = body.title;
-    object.version += 'a';
-    return {
-      id: object.id,
-      version: object.version,
-    };
-  }),
-};
-
 // helper function to create index patterns
-function create(id: string, payload?: any): Promise<IndexPattern> {
-  const indexPattern = new IndexPattern({
-    spec: { id },
-    savedObjectsClient: savedObjectsClient as any,
+function create(id: string) {
+  const {
+    type,
+    version,
+    attributes: { timeFieldName, fields, title },
+  } = stubbedSavedObjectIndexPattern(id);
+
+  return new IndexPattern({
+    spec: { id, type, version, timeFieldName, fields, title },
+    savedObjectsClient: {} as any,
     fieldFormats: fieldFormatsMock,
     shortDotsEnable: false,
     metaFields: [],
   });
-
-  setDocsourcePayload(id, payload);
-
-  return indexPattern.init();
-}
-
-function setDocsourcePayload(id: string | null, providedPayload: any) {
-  object = defaults(providedPayload || {}, stubbedSavedObjectIndexPattern(id));
 }
 
 describe('IndexPattern', () => {
-  const indexPatternId = 'test-pattern';
-
   let indexPattern: IndexPattern;
 
   // create an indexPattern instance for each test
   beforeEach(() => {
-    return create(indexPatternId).then((pattern: IndexPattern) => {
-      indexPattern = pattern;
-    });
+    indexPattern = create('test-pattern');
   });
 
   describe('api', () => {
     test('should have expected properties', () => {
-      expect(indexPattern).toHaveProperty('refreshFields');
       expect(indexPattern).toHaveProperty('popularizeField');
       expect(indexPattern).toHaveProperty('getScriptedFields');
       expect(indexPattern).toHaveProperty('getNonScriptedFields');
@@ -141,13 +101,6 @@ describe('IndexPattern', () => {
     });
   });
 
-  describe('init', () => {
-    test('should append the found fields', () => {
-      expect(savedObjectsClient.get).toHaveBeenCalled();
-      expect(indexPattern.fields).toHaveLength(mockLogStashFields().length);
-    });
-  });
-
   describe('fields', () => {
     test('should have expected properties on fields', function () {
       expect(indexPattern.fields[0]).toHaveProperty('displayName');
@@ -212,39 +165,6 @@ describe('IndexPattern', () => {
     });
   });
 
-  describe('refresh fields', () => {
-    test('should fetch fields from the fieldsFetcher', async () => {
-      expect(indexPattern.fields.length).toBeGreaterThan(2);
-
-      mockFieldsFetcherResponse = [{ name: 'foo' }, { name: 'bar' }];
-
-      await indexPattern.refreshFields();
-
-      mockFieldsFetcherResponse = [];
-
-      const newFields = indexPattern.getNonScriptedFields();
-
-      expect(newFields).toHaveLength(2);
-      expect([...newFields.map((f) => f.name)]).toEqual(['foo', 'bar']);
-    });
-
-    test('should preserve the scripted fields', async () => {
-      // add spy to indexPattern.getScriptedFields
-      // sinon.spy(indexPattern, 'getScriptedFields');
-
-      // refresh fields, which will fetch
-      await indexPattern.refreshFields();
-
-      // called to append scripted fields to the response from mapper.getFieldsForIndexPattern
-      // sinon.assert.calledOnce(indexPattern.getScriptedFields);
-      expect(indexPattern.getScriptedFields().map((f) => f.name)).toEqual(
-        mockLogStashFields()
-          .filter((f: IndexPatternField) => f.scripted)
-          .map((f: IndexPatternField) => f.name)
-      );
-    });
-  });
-
   describe('add and remove scripted fields', () => {
     test('should append the scripted field', async () => {
       // keep a copy of the current scripted field count
@@ -313,8 +233,14 @@ describe('IndexPattern', () => {
       } as FieldFormat;
       indexPattern.getFormatterForField = () => formatter;
       const spec = indexPattern.toSpec();
-      const restoredPattern = await create(spec.id as string);
-      restoredPattern.initFromSpec(spec);
+      // const restoredPattern = await create(spec);
+      const restoredPattern = new IndexPattern({
+        spec,
+        savedObjectsClient: {} as any,
+        fieldFormats: fieldFormatsMock,
+        shortDotsEnable: false,
+        metaFields: [],
+      });
       expect(restoredPattern.id).toEqual(indexPattern.id);
       expect(restoredPattern.title).toEqual(indexPattern.title);
       expect(restoredPattern.timeFieldName).toEqual(indexPattern.timeFieldName);

From bdcb83a4a34e2e3f896cd3a1e09758f59cb3af70 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Thu, 17 Sep 2020 12:00:25 -0500
Subject: [PATCH 44/57] remove comment

---
 .../data/common/index_patterns/index_patterns/index_patterns.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 7d470f93c445eb..a9355666042792 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -348,7 +348,7 @@ export class IndexPatternsService {
         });
       }
     }
-    // todo better way to do this
+
     indexPattern.resetOriginalBody();
     return indexPattern;
   };

From 751d0f437c56ae5f06a8a6dd5f45ebd387661500 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 18 Sep 2020 10:30:47 -0500
Subject: [PATCH 45/57] clean up index pattern jest test

---
 .../index_patterns/index_pattern.test.ts             | 12 +-----------
 test/functional/apps/management/_import_objects.js   |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index 7ba8168a6f2ad7..91286a38f16a08 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -22,9 +22,8 @@ import { map, last } from 'lodash';
 import { IndexPattern } from './index_pattern';
 
 import { DuplicateField } from '../../../../kibana_utils/common';
-// @ts-ignore
+// @ts-expect-error
 import mockLogStashFields from '../../../../../fixtures/logstash_fields';
-// @ts-ignore
 import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_saved_object_index_pattern';
 import { IndexPatternField } from '../fields';
 
@@ -168,7 +167,6 @@ describe('IndexPattern', () => {
   describe('add and remove scripted fields', () => {
     test('should append the scripted field', async () => {
       // keep a copy of the current scripted field count
-      // const saveSpy = sinon.spy(indexPattern, 'save');
       const oldCount = indexPattern.getScriptedFields().length;
 
       // add a new scripted field
@@ -186,7 +184,6 @@ describe('IndexPattern', () => {
       );
 
       const scriptedFields = indexPattern.getScriptedFields();
-      // expect(saveSpy.callCount).to.equal(1);
       expect(scriptedFields).toHaveLength(oldCount + 1);
       expect((indexPattern.fields.getByName(scriptedField.name) as IndexPatternField).name).toEqual(
         scriptedField.name
@@ -194,14 +191,12 @@ describe('IndexPattern', () => {
     });
 
     test('should remove scripted field, by name', async () => {
-      // const saveSpy = sinon.spy(indexPattern, 'save');
       const scriptedFields = indexPattern.getScriptedFields();
       const oldCount = scriptedFields.length;
       const scriptedField = last(scriptedFields)!;
 
       await indexPattern.removeScriptedField(scriptedField.name);
 
-      // expect(saveSpy.callCount).to.equal(1);
       expect(indexPattern.getScriptedFields().length).toEqual(oldCount - 1);
       expect(indexPattern.fields.getByName(scriptedField.name)).toEqual(undefined);
     });
@@ -233,7 +228,6 @@ describe('IndexPattern', () => {
       } as FieldFormat;
       indexPattern.getFormatterForField = () => formatter;
       const spec = indexPattern.toSpec();
-      // const restoredPattern = await create(spec);
       const restoredPattern = new IndexPattern({
         spec,
         savedObjectsClient: {} as any,
@@ -251,26 +245,22 @@ describe('IndexPattern', () => {
 
   describe('popularizeField', () => {
     test('should increment the popularity count by default', () => {
-      // const saveSpy = sinon.stub(indexPattern, 'save');
       indexPattern.fields.forEach(async (field) => {
         const oldCount = field.count || 0;
 
         await indexPattern.popularizeField(field.name);
 
-        // expect(saveSpy.callCount).to.equal(i + 1);
         expect(field.count).toEqual(oldCount + 1);
       });
     });
 
     test('should increment the popularity count', () => {
-      // const saveSpy = sinon.stub(indexPattern, 'save');
       indexPattern.fields.forEach(async (field) => {
         const oldCount = field.count || 0;
         const incrementAmount = 4;
 
         await indexPattern.popularizeField(field.name, incrementAmount);
 
-        // expect(saveSpy.callCount).to.equal(i + 1);
         expect(field.count).toEqual(oldCount + incrementAmount);
       });
     });
diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js
index d0d1580f394f2a..3941b117e6efe8 100644
--- a/test/functional/apps/management/_import_objects.js
+++ b/test/functional/apps/management/_import_objects.js
@@ -169,7 +169,7 @@ export default function ({ getService, getPageObjects }) {
         expect(isSavedObjectImported).to.be(false);
       });
 
-      it('should import saved objects with index patterns when index patterns already exists - ndjson', async () => {
+      it('should import saved objects with index patterns when index patterns already exists', async () => {
         // First, import the objects
         await PageObjects.savedObjects.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.ndjson')
@@ -387,7 +387,7 @@ export default function ({ getService, getPageObjects }) {
         expect(isSavedObjectImported).to.be(false);
       });
 
-      it('should import saved objects with index patterns when index patterns already exists - json', async () => {
+      it('should import saved objects with index patterns when index patterns already exists', async () => {
         // First, import the objects
         await PageObjects.savedObjects.importFile(
           path.join(__dirname, 'exports', '_import_objects_with_index_patterns.json')

From 0718d99c9985723e093ab14a664799536a18d164 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 18 Sep 2020 11:44:59 -0500
Subject: [PATCH 46/57] add index pattern service test

---
 .../__snapshots__/index_patterns.test.ts.snap | 22 ++++++++++
 .../index_patterns/index_patterns.test.ts     | 44 ++++++++++++++++++-
 .../management/_index_pattern_popularity.js   |  1 +
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap

diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap
new file mode 100644
index 00000000000000..752fdcf11991ce
--- /dev/null
+++ b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_patterns.test.ts.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IndexPatterns savedObjectToSpec 1`] = `
+Object {
+  "fields": Object {},
+  "id": "id",
+  "intervalName": undefined,
+  "sourceFilters": Array [
+    Object {
+      "value": "item1",
+    },
+    Object {
+      "value": "item2",
+    },
+  ],
+  "timeFieldName": "@timestamp",
+  "title": "kibana-*",
+  "type": "",
+  "typeMeta": Object {},
+  "version": "version",
+}
+`;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index ff4e02c751f1ae..b22437ebbdb4e4 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { defaults } from 'lodash';
-import { IndexPatternsService } from '.';
+import { IndexPatternsService, IndexPattern } from '.';
 import { fieldFormatsMock } from '../../field_formats/mocks';
 import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_saved_object_index_pattern';
 import { UiSettingsCommon, SavedObjectsClientCommon, SavedObject } from '../types';
@@ -169,4 +169,46 @@ describe('IndexPatterns', () => {
 
     expect(result.res.status).toBe(409);
   });
+
+  test('create', async () => {
+    const title = 'kibana-*';
+    indexPatterns.refreshFields = jest.fn();
+
+    const indexPattern = await indexPatterns.create({ title }, true);
+    expect(indexPattern).toBeInstanceOf(IndexPattern);
+    expect(indexPattern.title).toBe(title);
+    expect(indexPatterns.refreshFields).not.toBeCalled();
+
+    await indexPatterns.create({ title });
+    expect(indexPatterns.refreshFields).toBeCalled();
+  });
+
+  test('createAndSave', async () => {
+    const title = 'kibana-*';
+    indexPatterns.createSavedObject = jest.fn();
+    indexPatterns.setDefault = jest.fn();
+    await indexPatterns.createAndSave({ title });
+    expect(indexPatterns.createSavedObject).toBeCalled();
+    expect(indexPatterns.setDefault).toBeCalled();
+  });
+
+  test('savedObjectToSpec', () => {
+    const savedObject = {
+      id: 'id',
+      version: 'version',
+      attributes: {
+        title: 'kibana-*',
+        timeFieldName: '@timestamp',
+        fields: '[]',
+        sourceFilters: '[{"value":"item1"},{"value":"item2"}]',
+        fieldFormatMap: '{"field":{}}',
+        typeMeta: '{}',
+        type: '',
+      },
+      type: 'index-pattern',
+      references: [],
+    };
+
+    expect(indexPatterns.savedObjectToSpec(savedObject)).toMatchSnapshot();
+  });
 });
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index ad9a9fd25644a3..530b8e1111a0c6 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -57,6 +57,7 @@ export default function ({ getService, getPageObjects }) {
       // Cancel saving the popularity change
       await PageObjects.settings.controlChangeCancel();
       await PageObjects.settings.openControlsByName(fieldName);
+      // check that it is 0 (previous increase was cancelled
       const popularity = await PageObjects.settings.getPopularity();
       log.debug('popularity = ' + popularity);
       expect(popularity).to.be('0');

From 9251caaf7cb9f9319290499d7ed653424b33cdd7 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 18 Sep 2020 12:49:39 -0500
Subject: [PATCH 47/57] stop using expandShorthand

---
 ...ata-public.indexpattern.getoriginalbody.md | 13 ----
 ...plugin-plugins-data-public.indexpattern.md |  6 +-
 ...ugins-data-public.indexpattern.prepbody.md | 33 ---------
 ...a-public.indexpattern.resetoriginalbody.md | 11 ---
 .../index_patterns/index_pattern.ts           | 67 +++++++------------
 .../index_patterns/index_patterns.ts          | 10 +--
 src/plugins/data/public/public.api.md         | 26 +++----
 7 files changed, 46 insertions(+), 120 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
deleted file mode 100644
index a63d68fa6a8613..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md)
-
-## IndexPattern.getOriginalBody property
-
-<b>Signature:</b>
-
-```typescript
-getOriginalBody: () => {
-        [x: string]: any;
-    };
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index 60749fbe6c6303..d335d699295414 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -25,11 +25,11 @@ export declare class IndexPattern implements IIndexPattern
 |  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>any</code> |  |
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
-|  [getOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalbody.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: any;</code><br/><code>    }</code> |  |
+|  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: any;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |
 |  [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) |  | <code>string[]</code> |  |
-|  [resetOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md) |  | <code>() =&gt; void</code> |  |
+|  [resetOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md) |  | <code>() =&gt; void</code> |  |
 |  [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) |  | <code>SourceFilter[]</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) |  | <code>string &#124; undefined</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) |  | <code>string</code> |  |
@@ -43,6 +43,7 @@ export declare class IndexPattern implements IIndexPattern
 |  --- | --- | --- |
 |  [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) |  |  |
 |  [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) |  |  |
+|  [getAsSavedObjectBody()](./kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md) |  |  |
 |  [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) |  |  |
 |  [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) |  |  |
 |  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  |  |
@@ -54,7 +55,6 @@ export declare class IndexPattern implements IIndexPattern
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) |  |  |
 |  [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) |  |  |
-|  [prepBody()](./kibana-plugin-plugins-data-public.indexpattern.prepbody.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
 |  [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) |  |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
deleted file mode 100644
index 1d77b2a55860e2..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [prepBody](./kibana-plugin-plugins-data-public.indexpattern.prepbody.md)
-
-## IndexPattern.prepBody() method
-
-<b>Signature:</b>
-
-```typescript
-prepBody(): {
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-    };
-```
-<b>Returns:</b>
-
-`{
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-    }`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md
deleted file mode 100644
index 584290c4814454..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [resetOriginalBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalbody.md)
-
-## IndexPattern.resetOriginalBody property
-
-<b>Signature:</b>
-
-```typescript
-resetOriginalBody: () => void;
-```
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 22a5af0f534f7f..6cefc43f705ab8 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -31,7 +31,6 @@ import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields'
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
-import { expandShorthand, MappingObject } from '../../field_mapping';
 import { IndexPatternSpec, TypeMeta, SourceFilter, IndexPatternFieldMap } from '../types';
 import { SerializedFieldFormat } from '../../../../expressions/common';
 
@@ -60,33 +59,10 @@ export class IndexPattern implements IIndexPattern {
   public version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   public sourceFilters?: SourceFilter[];
-  private originalBody: { [key: string]: any } = {};
+  private originalSavedObjectBody: { [key: string]: any } = {};
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
 
-  // todo  get rid  of this
-  private mapping: MappingObject = expandShorthand({
-    title: ES_FIELD_TYPES.TEXT,
-    timeFieldName: ES_FIELD_TYPES.KEYWORD,
-    intervalName: ES_FIELD_TYPES.KEYWORD,
-    fields: 'json',
-    sourceFilters: 'json',
-    fieldFormatMap: {
-      type: ES_FIELD_TYPES.TEXT,
-      _serialize: (map = {}) => {
-        const serialized = _.transform(map, this.serializeFieldFormatMap);
-        return _.isEmpty(serialized) ? undefined : JSON.stringify(serialized);
-      },
-      _deserialize: (map = '{}') => {
-        return _.mapValues(JSON.parse(map), (mapping) => {
-          return this.deserializeFieldFormatMap(mapping);
-        });
-      },
-    },
-    type: ES_FIELD_TYPES.KEYWORD,
-    typeMeta: 'json',
-  });
-
   constructor({
     spec = {},
     savedObjectsClient,
@@ -129,18 +105,12 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
-  getOriginalBody = () => ({ ...this.originalBody });
+  getOriginalSavedObjectBody = () => ({ ...this.originalSavedObjectBody });
 
-  resetOriginalBody = () => {
-    this.originalBody = this.prepBody();
+  resetOriginalSavedObjectBody = () => {
+    this.originalSavedObjectBody = this.getAsSavedObjectBody();
   };
 
-  private serializeFieldFormatMap(flat: any, format: string, field: string | undefined) {
-    if (format && field) {
-      flat[field] = format;
-    }
-  }
-
   private deserializeFieldFormatMap(mapping: any) {
     try {
       return this.fieldFormats.getInstance(mapping.id, mapping.params);
@@ -270,9 +240,14 @@ export class IndexPattern implements IIndexPattern {
     field.count = count;
 
     try {
-      const res = await this.savedObjectsClient.update('index-pattern', this.id, this.prepBody(), {
-        version: this.version,
-      });
+      const res = await this.savedObjectsClient.update(
+        'index-pattern',
+        this.id,
+        this.getAsSavedObjectBody(),
+        {
+          version: this.version,
+        }
+      );
       this.version = res.version;
     } catch (e) {
       // no need for an error message here
@@ -318,16 +293,24 @@ export class IndexPattern implements IIndexPattern {
     return _.includes(this.title, '*');
   }
 
-  prepBody() {
+  getAsSavedObjectBody() {
+    const serializeFieldFormatMap = (flat: any, format: string, field: string | undefined) => {
+      if (format && field) {
+        flat[field] = format;
+      }
+    };
+    const serialized = _.transform(this.fieldFormatMap, serializeFieldFormatMap);
+    const fieldFormatMap = _.isEmpty(serialized) ? undefined : JSON.stringify(serialized);
+
     return {
       title: this.title,
       timeFieldName: this.timeFieldName,
       intervalName: this.intervalName,
-      sourceFilters: this.mapping.sourceFilters._serialize!(this.sourceFilters),
-      fields: this.mapping.fields._serialize!(this.fields),
-      fieldFormatMap: this.mapping.fieldFormatMap._serialize!(this.fieldFormatMap),
+      sourceFilters: this.sourceFilters ? JSON.stringify(this.sourceFilters) : undefined,
+      fields: this.fields ? JSON.stringify(this.fields) : undefined,
+      fieldFormatMap,
       type: this.type,
-      typeMeta: this.mapping.typeMeta._serialize!(this.typeMeta),
+      typeMeta: this.typeMeta ? JSON.stringify(this.typeMeta) : undefined,
     };
   }
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index a9355666042792..bc7a30ec7463ae 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -349,7 +349,7 @@ export class IndexPatternsService {
       }
     }
 
-    indexPattern.resetOriginalBody();
+    indexPattern.resetOriginalSavedObjectBody();
     return indexPattern;
   };
 
@@ -389,7 +389,7 @@ export class IndexPatternsService {
       }
     }
 
-    const body = indexPattern.prepBody();
+    const body = indexPattern.getAsSavedObjectBody();
     const response = await this.savedObjectsClient.create(savedObjectType, body, {
       id: indexPattern.id,
     });
@@ -405,8 +405,8 @@ export class IndexPatternsService {
     if (!indexPattern.id) return;
 
     // get the list of attributes
-    const body = indexPattern.prepBody();
-    const originalBody = indexPattern.getOriginalBody();
+    const body = indexPattern.getAsSavedObjectBody();
+    const originalBody = indexPattern.getOriginalSavedObjectBody();
 
     // get changed keys
     const originalChangedKeys: string[] = [];
@@ -426,7 +426,7 @@ export class IndexPatternsService {
         if (err?.res?.status === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
           const samePattern = await this.get(indexPattern.id as string);
           // What keys changed from now and what the server returned
-          const updatedBody = samePattern.prepBody();
+          const updatedBody = samePattern.getAsSavedObjectBody();
 
           // Build a list of changed keys from the server response
           // and ensure we ignore the key if the server response
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index c84fc0e1312abc..9570b6e14d34d8 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1120,6 +1120,17 @@ export class IndexPattern implements IIndexPattern {
         time_zone?: string | undefined;
     }>> | undefined;
     // (undocumented)
+    getAsSavedObjectBody(): {
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
+    };
+    // (undocumented)
     getComputedFields(): {
         storedFields: string[];
         scriptFields: any;
@@ -1135,7 +1146,7 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     getNonScriptedFields(): IndexPatternField[];
     // (undocumented)
-    getOriginalBody: () => {
+    getOriginalSavedObjectBody: () => {
         [x: string]: any;
     };
     // (undocumented)
@@ -1161,20 +1172,9 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     popularizeField(fieldName: string, unit?: number): Promise<void>;
     // (undocumented)
-    prepBody(): {
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-    };
-    // (undocumented)
     removeScriptedField(fieldName: string): void;
     // (undocumented)
-    resetOriginalBody: () => void;
+    resetOriginalSavedObjectBody: () => void;
     // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)

From a1094206d6af98405695dc659d01f28de0a01f7d Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 18 Sep 2020 12:49:59 -0500
Subject: [PATCH 48/57] stop using expandShorthand

---
 ...ublic.indexpattern.getassavedobjectbody.md | 33 +++++++++++++++++++
 ...indexpattern.getoriginalsavedobjectbody.md | 13 ++++++++
 ...dexpattern.resetoriginalsavedobjectbody.md | 11 +++++++
 3 files changed, 57 insertions(+)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
new file mode 100644
index 00000000000000..aa15a048cf86f0
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
@@ -0,0 +1,33 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getAsSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md)
+
+## IndexPattern.getAsSavedObjectBody() method
+
+<b>Signature:</b>
+
+```typescript
+getAsSavedObjectBody(): {
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
+    };
+```
+<b>Returns:</b>
+
+`{
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
+    }`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
new file mode 100644
index 00000000000000..569cd4c006934a
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md)
+
+## IndexPattern.getOriginalSavedObjectBody property
+
+<b>Signature:</b>
+
+```typescript
+getOriginalSavedObjectBody: () => {
+        [x: string]: any;
+    };
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md
new file mode 100644
index 00000000000000..d5e430895201f7
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [resetOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md)
+
+## IndexPattern.resetOriginalSavedObjectBody property
+
+<b>Signature:</b>
+
+```typescript
+resetOriginalSavedObjectBody: () => void;
+```

From 9991d623ad5cbde011dbc50ae8463fd7584b97f1 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 20 Sep 2020 23:14:07 -0500
Subject: [PATCH 49/57] improved types

---
 ...ata-public.iindexpattern.fieldformatmap.md |  5 +-
 ...lugin-plugins-data-public.iindexpattern.md |  2 +-
 ...ta-public.indexpattern.addscriptedfield.md |  6 +-
 ...data-public.indexpattern.fieldformatmap.md |  2 +-
 ...ins-data-public.indexpattern.flattenhit.md |  2 +-
 ...ns-data-public.indexpattern.formatfield.md |  2 +-
 ...gins-data-public.indexpattern.formathit.md |  5 +-
 ...ublic.indexpattern.getassavedobjectbody.md |  2 +
 ...ublic.indexpattern.getformatterforfield.md |  2 +
 ...indexpattern.getoriginalsavedobjectbody.md | 11 ++-
 ...-public.indexpattern.getsourcefiltering.md |  2 +
 ...plugin-plugins-data-public.indexpattern.md | 22 ++---
 ...public.indexpattern.removescriptedfield.md |  2 +
 ...dexpattern.resetoriginalsavedobjectbody.md |  2 +
 ....indexpatternfield.conflictdescriptions.md |  2 +
 ...ins-data-public.indexpatternfield.count.md |  2 +
 ...gins-data-public.indexpatternfield.lang.md |  2 +
 ...n-plugins-data-public.indexpatternfield.md |  8 +-
 ...ns-data-public.indexpatternfield.script.md |  2 +
 ...ata-server.iindexpattern.fieldformatmap.md |  5 +-
 ...lugin-plugins-data-server.iindexpattern.md |  2 +-
 .../fields/index_pattern_field.ts             | 12 +++
 .../index_patterns/index_pattern.ts           | 81 +++++++++++++++--
 .../index_patterns/index_patterns.ts          | 90 ++++++++++++++++++-
 .../data/common/index_patterns/types.ts       |  8 +-
 src/plugins/data/public/public.api.md         | 41 +++++----
 src/plugins/data/server/server.api.md         |  7 +-
 .../sidebar/lib/field_calculator.test.ts      |  2 +-
 .../components/table/table.test.tsx           |  4 +-
 29 files changed, 257 insertions(+), 78 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
index 2c131c6da99377..60ac95bc21af2e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
index 1cb89822eb605d..f755d487099e5b 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, SerializedFieldFormat&lt;unknown&gt; &#124; undefined&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
index 4bbbd83c65e105..cc3468531fffae 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
@@ -4,10 +4,12 @@
 
 ## IndexPattern.addScriptedField() method
 
+Add scripted field to field list
+
 <b>Signature:</b>
 
 ```typescript
-addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
+addScriptedField(name: string, script: string, fieldType?: string, lang?: string): Promise<void>;
 ```
 
 ## Parameters
@@ -16,7 +18,7 @@ addScriptedField(name: string, script: string, fieldType: string | undefined, la
 |  --- | --- | --- |
 |  name | <code>string</code> |  |
 |  script | <code>string</code> |  |
-|  fieldType | <code>string &#124; undefined</code> |  |
+|  fieldType | <code>string</code> |  |
 |  lang | <code>string</code> |  |
 
 <b>Returns:</b>
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md
index b89b244d9826c4..904d52fcd57512 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap: any;
+fieldFormatMap: Record<string, any>;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.flattenhit.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.flattenhit.md
index db28d95197bb38..049c3e5e990f71 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.flattenhit.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.flattenhit.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-flattenHit: any;
+flattenHit: (hit: Record<string, any>, deep?: boolean) => Record<string, any>;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
index 5a475d6161ac34..a605bd502bb8cc 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-formatField: any;
+formatField: FormatField;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
index ac515d374a93f3..9b8e945fedab07 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
@@ -7,5 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-formatHit: any;
+formatHit: {
+        (hit: Record<string, any>, type?: string): any;
+        formatField: FormatField;
+    };
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
index aa15a048cf86f0..2c5f30e4889ea5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
@@ -4,6 +4,8 @@
 
 ## IndexPattern.getAsSavedObjectBody() method
 
+Returns index pattern as saved object body for saving
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md
index 7984f7aff1d2df..09b3125f7c521a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md
@@ -4,6 +4,8 @@
 
 ## IndexPattern.getFormatterForField() method
 
+Provide a field, get its formatter
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
index 569cd4c006934a..349da63c13ca73 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md
@@ -4,10 +4,19 @@
 
 ## IndexPattern.getOriginalSavedObjectBody property
 
+Get last saved saved object fields
+
 <b>Signature:</b>
 
 ```typescript
 getOriginalSavedObjectBody: () => {
-        [x: string]: any;
+        title?: string | undefined;
+        timeFieldName?: string | undefined;
+        intervalName?: string | undefined;
+        fields?: string | undefined;
+        sourceFilters?: string | undefined;
+        fieldFormatMap?: string | undefined;
+        typeMeta?: string | undefined;
+        type?: string | undefined;
     };
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md
index 121d32c7c40c83..4ce0144b73882b 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md
@@ -4,6 +4,8 @@
 
 ## IndexPattern.getSourceFiltering() method
 
+Get the source filtering configuration for that index.
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index d335d699295414..d6e2e77f87ab99 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -20,16 +20,16 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) |  | <code>any</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) |  | <code>Record&lt;string, any&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) |  | <code>IIndexPatternFieldList &amp; {</code><br/><code>        toSpec: () =&gt; IndexPatternFieldMap;</code><br/><code>    }</code> |  |
-|  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>any</code> |  |
-|  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
-|  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
-|  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        [x: string]: any;</code><br/><code>    }</code> |  |
+|  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>(hit: Record&lt;string, any&gt;, deep?: boolean) =&gt; Record&lt;string, any&gt;</code> |  |
+|  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>FormatField</code> |  |
+|  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>{</code><br/><code>        (hit: Record&lt;string, any&gt;, type?: string): any;</code><br/><code>        formatField: FormatField;</code><br/><code>    }</code> |  |
+|  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        title?: string &#124; undefined;</code><br/><code>        timeFieldName?: string &#124; undefined;</code><br/><code>        intervalName?: string &#124; undefined;</code><br/><code>        fields?: string &#124; undefined;</code><br/><code>        sourceFilters?: string &#124; undefined;</code><br/><code>        fieldFormatMap?: string &#124; undefined;</code><br/><code>        typeMeta?: string &#124; undefined;</code><br/><code>        type?: string &#124; undefined;</code><br/><code>    }</code> | Get last saved saved object fields |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |
 |  [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) |  | <code>string[]</code> |  |
-|  [resetOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md) |  | <code>() =&gt; void</code> |  |
+|  [resetOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md) |  | <code>() =&gt; void</code> | Reset last saved saved object fields. used after saving |
 |  [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) |  | <code>SourceFilter[]</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) |  | <code>string &#124; undefined</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) |  | <code>string</code> |  |
@@ -41,20 +41,20 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) |  |  |
+|  [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) |  | Add scripted field to field list |
 |  [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) |  |  |
-|  [getAsSavedObjectBody()](./kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md) |  |  |
+|  [getAsSavedObjectBody()](./kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md) |  | Returns index pattern as saved object body for saving |
 |  [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) |  |  |
 |  [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) |  |  |
-|  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  |  |
+|  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  | Provide a field, get its formatter |
 |  [getNonScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md) |  |  |
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
-|  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
+|  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  | Get the source filtering configuration for that index. |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) |  |  |
 |  [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) |  |  |
-|  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
+|  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  | Remove scripted field from field list |
 |  [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) |  |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
index e902d9c42b082f..aaaebdaccca5d7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
@@ -4,6 +4,8 @@
 
 ## IndexPattern.removeScriptedField() method
 
+Remove scripted field from field list
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md
index d5e430895201f7..6bbc13d8fd410d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.resetoriginalsavedobjectbody.md
@@ -4,6 +4,8 @@
 
 ## IndexPattern.resetOriginalSavedObjectBody property
 
+Reset last saved saved object fields. used after saving
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md
index 6d62053726197f..9b226266f0b5a5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md
@@ -4,6 +4,8 @@
 
 ## IndexPatternField.conflictDescriptions property
 
+Description of field type conflicts across different indices in the same index pattern
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.count.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.count.md
index 84c0a75fd206dd..1b8e13a38c6d99 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.count.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.count.md
@@ -4,6 +4,8 @@
 
 ## IndexPatternField.count property
 
+Count is used for field popularity
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
index 0a8446d40e5ec0..b81218eb088866 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
@@ -4,6 +4,8 @@
 
 ## IndexPatternField.lang property
 
+Script field language
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
index 215188ffa26073..4f49a9a8fc3ab8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
@@ -21,15 +21,15 @@ export declare class IndexPatternField implements IFieldType
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
 |  [aggregatable](./kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md) |  | <code>boolean</code> |  |
-|  [conflictDescriptions](./kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md) |  | <code>Record&lt;string, string[]&gt; &#124; undefined</code> |  |
-|  [count](./kibana-plugin-plugins-data-public.indexpatternfield.count.md) |  | <code>number</code> |  |
+|  [conflictDescriptions](./kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md) |  | <code>Record&lt;string, string[]&gt; &#124; undefined</code> | Description of field type conflicts across different indices in the same index pattern |
+|  [count](./kibana-plugin-plugins-data-public.indexpatternfield.count.md) |  | <code>number</code> | Count is used for field popularity |
 |  [displayName](./kibana-plugin-plugins-data-public.indexpatternfield.displayname.md) |  | <code>string</code> |  |
 |  [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.md) |  | <code>string[] &#124; undefined</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-public.indexpatternfield.filterable.md) |  | <code>boolean</code> |  |
-|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string &#124; undefined</code> |  |
+|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string &#124; undefined</code> | Script field language |
 |  [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) |  | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md) |  | <code>boolean</code> |  |
-|  [script](./kibana-plugin-plugins-data-public.indexpatternfield.script.md) |  | <code>string &#124; undefined</code> |  |
+|  [script](./kibana-plugin-plugins-data-public.indexpatternfield.script.md) |  | <code>string &#124; undefined</code> | Script field code |
 |  [scripted](./kibana-plugin-plugins-data-public.indexpatternfield.scripted.md) |  | <code>boolean</code> |  |
 |  [searchable](./kibana-plugin-plugins-data-public.indexpatternfield.searchable.md) |  | <code>boolean</code> |  |
 |  [sortable](./kibana-plugin-plugins-data-public.indexpatternfield.sortable.md) |  | <code>boolean</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.script.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.script.md
index 27f9c797c92f29..7501e191d93638 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.script.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.script.md
@@ -4,6 +4,8 @@
 
 ## IndexPatternField.script property
 
+Script field code
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
index ab9e3171d7d7bd..0704fee763c7d1 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
index a79244a24acf57..33e8b241355fd3 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.md
@@ -14,7 +14,7 @@ export interface IIndexPattern
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, {</code><br/><code>        id: string;</code><br/><code>        params: unknown;</code><br/><code>    }&gt;</code> |  |
+|  [fieldFormatMap](./kibana-plugin-plugins-data-server.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, SerializedFieldFormat&lt;unknown&gt; &#124; undefined&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-server.iindexpattern.fields.md) | <code>IFieldType[]</code> |  |
 |  [id](./kibana-plugin-plugins-data-server.iindexpattern.id.md) | <code>string</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-server.iindexpattern.timefieldname.md) | <code>string</code> |  |
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
index e39fb0e37bf6e4..fdda3739f433c6 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
@@ -35,6 +35,9 @@ export class IndexPatternField implements IFieldType {
   }
 
   // writable attrs
+  /**
+   * Count is used for field popularity
+   */
   public get count() {
     return this.spec.count || 0;
   }
@@ -43,6 +46,9 @@ export class IndexPatternField implements IFieldType {
     this.spec.count = count;
   }
 
+  /**
+   * Script field code
+   */
   public get script() {
     return this.spec.script;
   }
@@ -51,6 +57,9 @@ export class IndexPatternField implements IFieldType {
     this.spec.script = script;
   }
 
+  /**
+   * Script field language
+   */
   public get lang() {
     return this.spec.lang;
   }
@@ -59,6 +68,9 @@ export class IndexPatternField implements IFieldType {
     this.spec.lang = lang;
   }
 
+  /**
+   * Description of field type conflicts across different indices in the same index pattern
+   */
   public get conflictDescriptions() {
     return this.spec.conflictDescriptions;
   }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 6cefc43f705ab8..17d3ba2c2ef22f 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -42,24 +42,40 @@ interface IndexPatternDeps {
   metaFields: string[];
 }
 
+interface SavedObjectBody {
+  title?: string;
+  timeFieldName?: string;
+  intervalName?: string;
+  fields?: string;
+  sourceFilters?: string;
+  fieldFormatMap?: string;
+  typeMeta?: string;
+  type?: string;
+}
+
+type FormatFieldFn = (hit: Record<string, any>, fieldName: string) => any;
+
 export class IndexPattern implements IIndexPattern {
   public id?: string;
   public title: string = '';
-  public fieldFormatMap: any;
+  public fieldFormatMap: Record<string, any>;
   public typeMeta?: TypeMeta;
   public fields: IIndexPatternFieldList & { toSpec: () => IndexPatternFieldMap };
   public timeFieldName: string | undefined;
   public intervalName: string | undefined;
   public type: string | undefined;
-  public formatHit: any;
-  public formatField: any;
-  public flattenHit: any;
+  public formatHit: {
+    (hit: Record<string, any>, type?: string): any;
+    formatField: FormatFieldFn;
+  };
+  public formatField: FormatFieldFn;
+  public flattenHit: (hit: Record<string, any>, deep?: boolean) => Record<string, any>;
   public metaFields: string[];
   // savedObject version
   public version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   public sourceFilters?: SourceFilter[];
-  private originalSavedObjectBody: { [key: string]: any } = {};
+  private originalSavedObjectBody: SavedObjectBody = {};
   private shortDotsEnable: boolean = false;
   private fieldFormats: FieldFormatsStartCommon;
 
@@ -105,12 +121,22 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
+  /**
+   * Get last saved saved object fields
+   */
   getOriginalSavedObjectBody = () => ({ ...this.originalSavedObjectBody });
 
+  /**
+   * Reset last saved saved object fields. used after saving
+   */
   resetOriginalSavedObjectBody = () => {
     this.originalSavedObjectBody = this.getAsSavedObjectBody();
   };
 
+  /**
+   * TODO
+   * @param mapping
+   */
   private deserializeFieldFormatMap(mapping: any) {
     try {
       return this.fieldFormats.getInstance(mapping.id, mapping.params);
@@ -123,6 +149,10 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
+  /**
+   * Extracts FieldFormatMap from FieldSpec map
+   * @param fldList FieldSpec map
+   */
   private fieldSpecsToFieldFormatMap = (fldList: IndexPatternSpec['fields'] = {}) =>
     Object.values(fldList).reduce<Record<string, SerializedFieldFormat>>((col, fieldSpec) => {
       if (fieldSpec.format) {
@@ -186,14 +216,29 @@ export class IndexPattern implements IIndexPattern {
     };
   }
 
-  // Get the source filtering configuration for that index.
+  /**
+   * Get the source filtering configuration for that index.
+   */
   getSourceFiltering() {
     return {
       excludes: (this.sourceFilters && this.sourceFilters.map((filter: any) => filter.value)) || [],
     };
   }
 
-  async addScriptedField(name: string, script: string, fieldType: string = 'string', lang: string) {
+  /**
+   * Add scripted field to field list
+   *
+   * @param name field name
+   * @param script script code
+   * @param fieldType
+   * @param lang
+   */
+  async addScriptedField(
+    name: string,
+    script: string,
+    fieldType: string = 'string',
+    lang: string = 'painless'
+  ) {
     const scriptedFields = this.getScriptedFields();
     const names = _.map(scriptedFields, 'name');
 
@@ -214,6 +259,11 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
+  /**
+   * Remove scripted field from field list
+   * @param fieldName
+   */
+
   removeScriptedField(fieldName: string) {
     const field = this.fields.getByName(fieldName);
     if (field) {
@@ -289,12 +339,22 @@ export class IndexPattern implements IIndexPattern {
     return this.typeMeta?.aggs;
   }
 
+  /**
+   * Does this index pattern title include a '*'
+   */
   private isWildcard() {
     return _.includes(this.title, '*');
   }
 
+  /**
+   * Returns index pattern as saved object body for saving
+   */
   getAsSavedObjectBody() {
-    const serializeFieldFormatMap = (flat: any, format: string, field: string | undefined) => {
+    const serializeFieldFormatMap = (
+      flat: any,
+      format: FieldFormat | undefined,
+      field: string | undefined
+    ) => {
       if (format && field) {
         flat[field] = format;
       }
@@ -314,6 +374,11 @@ export class IndexPattern implements IIndexPattern {
     };
   }
 
+  /**
+   * Provide a field, get its formatter
+   * @param field
+   */
+
   getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat {
     return (
       this.fieldFormatMap[field.name] ||
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index bc7a30ec7463ae..ef252d513a7719 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -94,6 +94,9 @@ export class IndexPatternsService {
     );
   }
 
+  /**
+   * Refresh cache of index pattern ids and titles
+   */
   private async refreshSavedObjectsCache() {
     this.savedObjectsCache = await this.savedObjectsClient.find<IndexPatternSavedObjectAttrs>({
       type: 'index-pattern',
@@ -102,6 +105,10 @@ export class IndexPatternsService {
     });
   }
 
+  /**
+   * Get list of index pattern ids
+   * @param refresh Force refresh of index pattern list
+   */
   getIds = async (refresh: boolean = false) => {
     if (!this.savedObjectsCache || refresh) {
       await this.refreshSavedObjectsCache();
@@ -112,6 +119,10 @@ export class IndexPatternsService {
     return this.savedObjectsCache.map((obj) => obj?.id);
   };
 
+  /**
+   * Get list of index pattern titles
+   * @param refresh Force refresh of index pattern list
+   */
   getTitles = async (refresh: boolean = false): Promise<string[]> => {
     if (!this.savedObjectsCache || refresh) {
       await this.refreshSavedObjectsCache();
@@ -122,6 +133,10 @@ export class IndexPatternsService {
     return this.savedObjectsCache.map((obj) => obj?.attributes?.title);
   };
 
+  /**
+   * Clear index pattern list cache
+   * @param id optionally clear a single id
+   */
   clearCache = (id?: string) => {
     this.savedObjectsCache = null;
     if (id) {
@@ -138,6 +153,9 @@ export class IndexPatternsService {
     return this.savedObjectsCache;
   };
 
+  /**
+   * Get default index pattern
+   */
   getDefault = async () => {
     const defaultIndexPatternId = await this.config.get('defaultIndex');
     if (defaultIndexPatternId) {
@@ -147,6 +165,11 @@ export class IndexPatternsService {
     return null;
   };
 
+  /**
+   * Optionally set default index pattern, unless force = true
+   * @param id
+   * @param force
+   */
   setDefault = async (id: string, force = false) => {
     if (force || !this.config.get('defaultIndex')) {
       await this.config.set('defaultIndex', id);
@@ -169,6 +192,10 @@ export class IndexPatternsService {
     });
   }
 
+  /**
+   * Get field list by providing { pattern }
+   * @param options
+   */
   getFieldsForWildcard = async (options: GetFieldsOptions = {}) => {
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
     return this.apiClient.getFieldsForWildcard({
@@ -179,6 +206,10 @@ export class IndexPatternsService {
     });
   };
 
+  /**
+   * Get field list by providing an index patttern (or spec)
+   * @param options
+   */
   getFieldsForIndexPattern = async (
     indexPattern: IndexPattern | IndexPatternSpec,
     options: GetFieldsOptions = {}
@@ -190,13 +221,23 @@ export class IndexPatternsService {
       params: indexPattern.typeMeta && indexPattern.typeMeta.params,
     });
 
-  // grab fields, grab scripted fields, mash together
+  /**
+   * Refresh field list for a given index pattern
+   * @param indexPattern
+   */
   refreshFields = async (indexPattern: IndexPattern) => {
     const fields = await this.getFieldsForIndexPattern(indexPattern);
     const scripted = indexPattern.getScriptedFields().map((field) => field.spec);
     indexPattern.fields.replaceAll([...fields, ...scripted]);
   };
 
+  /**
+   * Refreshes a field list from a spec before an index pattern instance is created
+   * @param fields
+   * @param id
+   * @param title
+   * @param options
+   */
   private refreshFieldSpecMap = async (
     fields: IndexPatternFieldMap,
     id: string,
@@ -223,6 +264,11 @@ export class IndexPatternsService {
     return fields;
   };
 
+  /**
+   * Applies a set of formats to a set of fields
+   * @param fieldSpecs
+   * @param fieldFormatMap
+   */
   private mergeFieldsAndFormats = (fieldSpecs: FieldSpec[], fieldFormatMap: FieldFormatMap) => {
     Object.entries(fieldFormatMap).forEach(([fieldName, value]) => {
       const field = fieldSpecs.find((fld: FieldSpec) => fld.name === fieldName);
@@ -232,12 +278,21 @@ export class IndexPatternsService {
     });
   };
 
+  /**
+   * Converts field array to map
+   * @param fields
+   */
   fieldArrayToMap = (fields: FieldSpec[]) =>
     fields.reduce<IndexPatternFieldMap>((collector, field) => {
       collector[field.name] = field;
       return collector;
     }, {});
 
+  /**
+   * Converts index pattern saved object to index pattern spec
+   * @param savedObject
+   */
+
   savedObjectToSpec = (savedObject: SavedObject<IndexPatternAttributes>): IndexPatternSpec => {
     const {
       id,
@@ -273,6 +328,11 @@ export class IndexPatternsService {
     };
   };
 
+  /**
+   * Get an index pattern by id. Cache optimized
+   * @param id
+   */
+
   get = async (id: string): Promise<IndexPattern> => {
     const cache = indexPatternCache.get(id);
     if (cache) {
@@ -353,6 +413,11 @@ export class IndexPatternsService {
     return indexPattern;
   };
 
+  /**
+   * Create a new index pattern instance
+   * @param spec
+   * @param skipFetchFields
+   */
   async create(spec: IndexPatternSpec, skipFetchFields = false): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
@@ -372,6 +437,13 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
+  /**
+   * Create a new index pattern and save it right away
+   * @param spec
+   * @param override Overwrite if existing index pattern exists
+   * @param skipFetchFields
+   */
+
   async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
     const indexPattern = await this.create(spec, skipFetchFields);
     await this.createSavedObject(indexPattern, override);
@@ -379,6 +451,12 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
+  /**
+   * Save a new index pattern
+   * @param indexPattern
+   * @param override Overwrite if existing index pattern exists
+   */
+
   async createSavedObject(indexPattern: IndexPattern, override = false) {
     const dupe = await findByTitle(this.savedObjectsClient, indexPattern.title);
     if (dupe) {
@@ -398,6 +476,12 @@ export class IndexPatternsService {
     return indexPattern;
   }
 
+  /**
+   * Save existing index pattern. Will attempt to merge differences if there are conflicts
+   * @param indexPattern
+   * @param saveAttempts
+   */
+
   async updateSavedObject(
     indexPattern: IndexPattern,
     saveAttempts: number = 0
@@ -411,7 +495,7 @@ export class IndexPatternsService {
     // get changed keys
     const originalChangedKeys: string[] = [];
     Object.entries(body).forEach(([key, value]) => {
-      if (value !== originalBody[key]) {
+      if (value !== (originalBody as any)[key]) {
         originalChangedKeys.push(key);
       }
     });
@@ -435,7 +519,7 @@ export class IndexPatternsService {
 
           const serverChangedKeys: string[] = [];
           Object.entries(updatedBody).forEach(([key, value]) => {
-            if (value !== (body as any)[key] && value !== originalBody[key]) {
+            if (value !== (body as any)[key] && value !== (originalBody as any)[key]) {
               serverChangedKeys.push(key);
             }
           });
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 72af827dbf1b97..43b51a9bbd6451 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -34,13 +34,7 @@ export interface IIndexPattern {
   type?: string;
   timeFieldName?: string;
   getTimeField?(): IFieldType | undefined;
-  fieldFormatMap?: Record<
-    string,
-    {
-      id: string;
-      params: unknown;
-    }
-  >;
+  fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
 }
 
 export interface IndexPatternAttributes {
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 9570b6e14d34d8..48d2b51cf62498 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1020,11 +1020,10 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
+    // Warning: (ae-forgotten-export) The symbol "SerializedFieldFormat" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+    fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
@@ -1096,20 +1095,22 @@ export type IMetricAggType = MetricAggType;
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
     constructor({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
+    addScriptedField(name: string, script: string, fieldType?: string, lang?: string): Promise<void>;
     // (undocumented)
-    addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
-    // (undocumented)
-    fieldFormatMap: any;
+    fieldFormatMap: Record<string, any>;
     // (undocumented)
     fields: IIndexPatternFieldList & {
         toSpec: () => IndexPatternFieldMap;
     };
     // (undocumented)
-    flattenHit: any;
+    flattenHit: (hit: Record<string, any>, deep?: boolean) => Record<string, any>;
     // (undocumented)
-    formatField: any;
+    formatField: FormatField;
     // (undocumented)
-    formatHit: any;
+    formatHit: {
+        (hit: Record<string, any>, type?: string): any;
+        formatField: FormatField;
+    };
     // (undocumented)
     getAggregationRestrictions(): Record<string, Record<string, {
         agg?: string | undefined;
@@ -1119,7 +1120,6 @@ export class IndexPattern implements IIndexPattern {
         delay?: string | undefined;
         time_zone?: string | undefined;
     }>> | undefined;
-    // (undocumented)
     getAsSavedObjectBody(): {
         title: string;
         timeFieldName: string | undefined;
@@ -1141,17 +1141,21 @@ export class IndexPattern implements IIndexPattern {
     };
     // (undocumented)
     getFieldByName(name: string): IndexPatternField | undefined;
-    // (undocumented)
     getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat;
     // (undocumented)
     getNonScriptedFields(): IndexPatternField[];
-    // (undocumented)
     getOriginalSavedObjectBody: () => {
-        [x: string]: any;
+        title?: string | undefined;
+        timeFieldName?: string | undefined;
+        intervalName?: string | undefined;
+        fields?: string | undefined;
+        sourceFilters?: string | undefined;
+        fieldFormatMap?: string | undefined;
+        typeMeta?: string | undefined;
+        type?: string | undefined;
     };
     // (undocumented)
     getScriptedFields(): IndexPatternField[];
-    // (undocumented)
     getSourceFiltering(): {
         excludes: any[];
     };
@@ -1171,9 +1175,7 @@ export class IndexPattern implements IIndexPattern {
     metaFields: string[];
     // (undocumented)
     popularizeField(fieldName: string, unit?: number): Promise<void>;
-    // (undocumented)
     removeScriptedField(fieldName: string): void;
-    // (undocumented)
     resetOriginalSavedObjectBody: () => void;
     // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts
     //
@@ -1234,10 +1236,8 @@ export class IndexPatternField implements IFieldType {
     constructor(spec: FieldSpec, displayName: string);
     // (undocumented)
     get aggregatable(): boolean;
-    // (undocumented)
     get conflictDescriptions(): Record<string, string[]> | undefined;
     set conflictDescriptions(conflictDescriptions: Record<string, string[]> | undefined);
-    // (undocumented)
     get count(): number;
     set count(count: number);
     // (undocumented)
@@ -1246,14 +1246,12 @@ export class IndexPatternField implements IFieldType {
     get esTypes(): string[] | undefined;
     // (undocumented)
     get filterable(): boolean;
-    // (undocumented)
     get lang(): string | undefined;
     set lang(lang: string | undefined);
     // (undocumented)
     get name(): string;
     // (undocumented)
     get readFromDocValues(): boolean;
-    // (undocumented)
     get script(): string | undefined;
     set script(script: string | undefined);
     // (undocumented)
@@ -2218,6 +2216,7 @@ export const UI_SETTINGS: {
 // src/plugins/data/common/es_query/filters/match_all_filter.ts:28:3 - (ae-forgotten-export) The symbol "MatchAllFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/phrase_filter.ts:33:3 - (ae-forgotten-export) The symbol "PhraseFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/phrases_filter.ts:31:3 - (ae-forgotten-export) The symbol "PhrasesFilterMeta" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:69:5 - (ae-forgotten-export) The symbol "FormatField" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/search/aggs/types.ts:98:51 - (ae-forgotten-export) The symbol "AggTypesRegistryStart" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/field_formats/field_formats_service.ts:67:3 - (ae-forgotten-export) The symbol "FormatFactory" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:66:23 - (ae-forgotten-export) The symbol "FilterLabel" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index d925f9082378e1..06a6a9ce0d1836 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -603,11 +603,10 @@ export interface IFieldType {
 export interface IIndexPattern {
     // (undocumented)
     [key: string]: any;
+    // Warning: (ae-forgotten-export) The symbol "SerializedFieldFormat" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    fieldFormatMap?: Record<string, {
-        id: string;
-        params: unknown;
-    }>;
+    fieldFormatMap?: Record<string, SerializedFieldFormat<unknown> | undefined>;
     // (undocumented)
     fields: IFieldType[];
     // (undocumented)
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
index 8746883a5d9680..dad208c8156755 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
@@ -142,7 +142,7 @@ describe('fieldCalculator', function () {
     let hits: any;
 
     beforeEach(function () {
-      hits = _.each(_.cloneDeep(realHits), indexPattern.flattenHit);
+      hits = _.each(_.cloneDeep(realHits), (hit) => indexPattern.flattenHit(hit));
     });
 
     it('Should return an array of values for _source fields', function () {
diff --git a/src/plugins/discover/public/application/components/table/table.test.tsx b/src/plugins/discover/public/application/components/table/table.test.tsx
index 07e9e0a129a262..2874e2483275b7 100644
--- a/src/plugins/discover/public/application/components/table/table.test.tsx
+++ b/src/plugins/discover/public/application/components/table/table.test.tsx
@@ -22,7 +22,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewTable } from './table';
 import { indexPatterns, IndexPattern } from '../../../../../data/public';
 
-const indexPattern = {
+const indexPattern = ({
   fields: {
     getAll: () => [
       {
@@ -60,7 +60,7 @@ const indexPattern = {
   metaFields: ['_index', '_score'],
   flattenHit: undefined,
   formatHit: jest.fn((hit) => hit._source),
-} as IndexPattern;
+} as unknown) as IndexPattern;
 
 indexPattern.fields.getByName = (name: string) => {
   return indexPattern.fields.getAll().find((field) => field.name === name);

From 3f9e4e5b0507dfe912fb3a5a8731011bff97bda1 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Sun, 20 Sep 2020 23:33:29 -0500
Subject: [PATCH 50/57] update docs

---
 ...a-plugin-plugins-data-public.indexpattern.formatfield.md | 2 +-
 ...ana-plugin-plugins-data-public.indexpattern.formathit.md | 2 +-
 .../kibana-plugin-plugins-data-public.indexpattern.md       | 4 ++--
 src/plugins/data/public/public.api.md                       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
index a605bd502bb8cc..aadaddca6cc85a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formatfield.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-formatField: FormatField;
+formatField: FormatFieldFn;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
index 9b8e945fedab07..2be76bf1c1e05d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.formathit.md
@@ -9,6 +9,6 @@
 ```typescript
 formatHit: {
         (hit: Record<string, any>, type?: string): any;
-        formatField: FormatField;
+        formatField: FormatFieldFn;
     };
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index d6e2e77f87ab99..2ff575bc4fc225 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -23,8 +23,8 @@ export declare class IndexPattern implements IIndexPattern
 |  [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) |  | <code>Record&lt;string, any&gt;</code> |  |
 |  [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) |  | <code>IIndexPatternFieldList &amp; {</code><br/><code>        toSpec: () =&gt; IndexPatternFieldMap;</code><br/><code>    }</code> |  |
 |  [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) |  | <code>(hit: Record&lt;string, any&gt;, deep?: boolean) =&gt; Record&lt;string, any&gt;</code> |  |
-|  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>FormatField</code> |  |
-|  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>{</code><br/><code>        (hit: Record&lt;string, any&gt;, type?: string): any;</code><br/><code>        formatField: FormatField;</code><br/><code>    }</code> |  |
+|  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>FormatFieldFn</code> |  |
+|  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>{</code><br/><code>        (hit: Record&lt;string, any&gt;, type?: string): any;</code><br/><code>        formatField: FormatFieldFn;</code><br/><code>    }</code> |  |
 |  [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) |  | <code>() =&gt; {</code><br/><code>        title?: string &#124; undefined;</code><br/><code>        timeFieldName?: string &#124; undefined;</code><br/><code>        intervalName?: string &#124; undefined;</code><br/><code>        fields?: string &#124; undefined;</code><br/><code>        sourceFilters?: string &#124; undefined;</code><br/><code>        fieldFormatMap?: string &#124; undefined;</code><br/><code>        typeMeta?: string &#124; undefined;</code><br/><code>        type?: string &#124; undefined;</code><br/><code>    }</code> | Get last saved saved object fields |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
 |  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 48d2b51cf62498..1eebcb6a5a87ca 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1105,11 +1105,11 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     flattenHit: (hit: Record<string, any>, deep?: boolean) => Record<string, any>;
     // (undocumented)
-    formatField: FormatField;
+    formatField: FormatFieldFn;
     // (undocumented)
     formatHit: {
         (hit: Record<string, any>, type?: string): any;
-        formatField: FormatField;
+        formatField: FormatFieldFn;
     };
     // (undocumented)
     getAggregationRestrictions(): Record<string, Record<string, {
@@ -2216,7 +2216,7 @@ export const UI_SETTINGS: {
 // src/plugins/data/common/es_query/filters/match_all_filter.ts:28:3 - (ae-forgotten-export) The symbol "MatchAllFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/phrase_filter.ts:33:3 - (ae-forgotten-export) The symbol "PhraseFilterMeta" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/es_query/filters/phrases_filter.ts:31:3 - (ae-forgotten-export) The symbol "PhrasesFilterMeta" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:69:5 - (ae-forgotten-export) The symbol "FormatField" needs to be exported by the entry point index.d.ts
+// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:69:5 - (ae-forgotten-export) The symbol "FormatFieldFn" needs to be exported by the entry point index.d.ts
 // src/plugins/data/common/search/aggs/types.ts:98:51 - (ae-forgotten-export) The symbol "AggTypesRegistryStart" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/field_formats/field_formats_service.ts:67:3 - (ae-forgotten-export) The symbol "FormatFactory" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:66:23 - (ae-forgotten-export) The symbol "FilterLabel" needs to be exported by the entry point index.d.ts

From dd2caff346695651f1d3f3a3b0aab1977abeb18f Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 21 Sep 2020 14:51:06 -0500
Subject: [PATCH 51/57] fix file import

---
 .../file_based/components/import_view/import_view.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
index e49deaed447972..2ad0c9b1ac2633 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js
@@ -215,7 +215,7 @@ export class ImportView extends Component {
                 // mappings, use this field as the time field.
                 // This relies on the field being populated by
                 // the ingest pipeline on ingest
-                if (mappings[DEFAULT_TIME_FIELD] !== undefined) {
+                if (mappings.properties[DEFAULT_TIME_FIELD] !== undefined) {
                   timeFieldName = DEFAULT_TIME_FIELD;
                   this.setState({ timeFieldName });
                 }

From 5b3d1043d1c4b6d809b383e8a099797ffd29b136 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Mon, 21 Sep 2020 16:44:44 -0500
Subject: [PATCH 52/57] add docs

---
 ...blic.indexpatternsservice._constructor_.md | 20 +++++
 ...-public.indexpatternsservice.clearcache.md | 13 ++++
 ...data-public.indexpatternsservice.create.md | 25 ++++++
 ...blic.indexpatternsservice.createandsave.md | 26 +++++++
 ....indexpatternsservice.createsavedobject.md | 25 ++++++
 ...data-public.indexpatternsservice.delete.md | 24 ++++++
 ...tternsservice.ensuredefaultindexpattern.md | 11 +++
 ...ic.indexpatternsservice.fieldarraytomap.md | 13 ++++
 ...ns-data-public.indexpatternsservice.get.md | 13 ++++
 ...ta-public.indexpatternsservice.getcache.md | 11 +++
 ...-public.indexpatternsservice.getdefault.md | 13 ++++
 ...atternsservice.getfieldsforindexpattern.md | 13 ++++
 ...dexpatternsservice.getfieldsforwildcard.md | 13 ++++
 ...data-public.indexpatternsservice.getids.md | 13 ++++
 ...a-public.indexpatternsservice.gettitles.md | 13 ++++
 ...lugins-data-public.indexpatternsservice.md | 46 +++++++++++
 ...blic.indexpatternsservice.refreshfields.md | 13 ++++
 ....indexpatternsservice.savedobjecttospec.md | 13 ++++
 ...-public.indexpatternsservice.setdefault.md | 13 ++++
 ....indexpatternsservice.updatesavedobject.md | 25 ++++++
 .../kibana-plugin-plugins-data-public.md      |  7 +-
 ...lugins-data-server.indexpatternsservice.md | 19 +++++
 ...-data-server.indexpatternsservice.setup.md | 22 ++++++
 ...-data-server.indexpatternsservice.start.md | 27 +++++++
 .../kibana-plugin-plugins-data-server.md      |  1 +
 ...plugin-plugins-data-server.plugin.start.md |  4 +-
 src/plugins/data/public/index.ts              |  2 +
 src/plugins/data/public/public.api.md         | 76 +++++++++++++------
 src/plugins/data/server/index.ts              |  2 +
 src/plugins/data/server/server.api.md         | 22 +++++-
 30 files changed, 508 insertions(+), 30 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.create.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.delete.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.get.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getids.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md
 create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md
 create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setup.md
 create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md
new file mode 100644
index 00000000000000..ab397efb1fe0ea
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md)
+
+## IndexPatternsService.(constructor)
+
+Constructs a new instance of the `IndexPatternsService` class
+
+<b>Signature:</b>
+
+```typescript
+constructor({ uiSettings, savedObjectsClient, apiClient, fieldFormats, onNotification, onError, onRedirectNoIndexPattern, }: IndexPatternsServiceDeps);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  { uiSettings, savedObjectsClient, apiClient, fieldFormats, onNotification, onError, onRedirectNoIndexPattern, } | <code>IndexPatternsServiceDeps</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md
new file mode 100644
index 00000000000000..b3712183250867
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [clearCache](./kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md)
+
+## IndexPatternsService.clearCache property
+
+Clear index pattern list cache
+
+<b>Signature:</b>
+
+```typescript
+clearCache: (id?: string | undefined) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.create.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.create.md
new file mode 100644
index 00000000000000..d7152ba617cc62
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.create.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [create](./kibana-plugin-plugins-data-public.indexpatternsservice.create.md)
+
+## IndexPatternsService.create() method
+
+Create a new index pattern instance
+
+<b>Signature:</b>
+
+```typescript
+create(spec: IndexPatternSpec, skipFetchFields?: boolean): Promise<IndexPattern>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  spec | <code>IndexPatternSpec</code> |  |
+|  skipFetchFields | <code>boolean</code> |  |
+
+<b>Returns:</b>
+
+`Promise<IndexPattern>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md
new file mode 100644
index 00000000000000..eebfbb506fb77e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [createAndSave](./kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md)
+
+## IndexPatternsService.createAndSave() method
+
+Create a new index pattern and save it right away
+
+<b>Signature:</b>
+
+```typescript
+createAndSave(spec: IndexPatternSpec, override?: boolean, skipFetchFields?: boolean): Promise<IndexPattern>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  spec | <code>IndexPatternSpec</code> |  |
+|  override | <code>boolean</code> |  |
+|  skipFetchFields | <code>boolean</code> |  |
+
+<b>Returns:</b>
+
+`Promise<IndexPattern>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md
new file mode 100644
index 00000000000000..8efb33c423b012
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [createSavedObject](./kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md)
+
+## IndexPatternsService.createSavedObject() method
+
+Save a new index pattern
+
+<b>Signature:</b>
+
+```typescript
+createSavedObject(indexPattern: IndexPattern, override?: boolean): Promise<IndexPattern>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  indexPattern | <code>IndexPattern</code> |  |
+|  override | <code>boolean</code> |  |
+
+<b>Returns:</b>
+
+`Promise<IndexPattern>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.delete.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.delete.md
new file mode 100644
index 00000000000000..aba31ab2c0d29f
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.delete.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [delete](./kibana-plugin-plugins-data-public.indexpatternsservice.delete.md)
+
+## IndexPatternsService.delete() method
+
+Deletes an index pattern from .kibana index
+
+<b>Signature:</b>
+
+```typescript
+delete(indexPatternId: string): Promise<{}>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  indexPatternId | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`Promise<{}>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md
new file mode 100644
index 00000000000000..3b6a8c7e4a04f1
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [ensureDefaultIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md)
+
+## IndexPatternsService.ensureDefaultIndexPattern property
+
+<b>Signature:</b>
+
+```typescript
+ensureDefaultIndexPattern: EnsureDefaultIndexPattern;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
new file mode 100644
index 00000000000000..ed365fe03f9805
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [fieldArrayToMap](./kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md)
+
+## IndexPatternsService.fieldArrayToMap property
+
+Converts field array to map
+
+<b>Signature:</b>
+
+```typescript
+fieldArrayToMap: (fields: FieldSpec[]) => Record<string, FieldSpec>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.get.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.get.md
new file mode 100644
index 00000000000000..4aad6df6b413b1
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.get.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [get](./kibana-plugin-plugins-data-public.indexpatternsservice.get.md)
+
+## IndexPatternsService.get property
+
+Get an index pattern by id. Cache optimized
+
+<b>Signature:</b>
+
+```typescript
+get: (id: string) => Promise<IndexPattern>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md
new file mode 100644
index 00000000000000..ad2a167bd8c74f
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getCache](./kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md)
+
+## IndexPatternsService.getCache property
+
+<b>Signature:</b>
+
+```typescript
+getCache: () => Promise<SavedObject<IndexPatternSavedObjectAttrs>[] | null | undefined>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md
new file mode 100644
index 00000000000000..01d4efeffe9211
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md)
+
+## IndexPatternsService.getDefault property
+
+Get default index pattern
+
+<b>Signature:</b>
+
+```typescript
+getDefault: () => Promise<IndexPattern | null>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md
new file mode 100644
index 00000000000000..c06c3c6f684922
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md)
+
+## IndexPatternsService.getFieldsForIndexPattern property
+
+Get field list by providing an index patttern (or spec)
+
+<b>Signature:</b>
+
+```typescript
+getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions) => Promise<any>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md
new file mode 100644
index 00000000000000..aec84866b9e585
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md)
+
+## IndexPatternsService.getFieldsForWildcard property
+
+Get field list by providing { pattern }
+
+<b>Signature:</b>
+
+```typescript
+getFieldsForWildcard: (options?: GetFieldsOptions) => Promise<any>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getids.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getids.md
new file mode 100644
index 00000000000000..a012e0dc9d9c53
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getids.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md)
+
+## IndexPatternsService.getIds property
+
+Get list of index pattern ids
+
+<b>Signature:</b>
+
+```typescript
+getIds: (refresh?: boolean) => Promise<string[]>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md
new file mode 100644
index 00000000000000..04cc294a79dfca
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md)
+
+## IndexPatternsService.getTitles property
+
+Get list of index pattern titles
+
+<b>Signature:</b>
+
+```typescript
+getTitles: (refresh?: boolean) => Promise<string[]>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md
new file mode 100644
index 00000000000000..0022bff34a8e76
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md
@@ -0,0 +1,46 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md)
+
+## IndexPatternsService class
+
+<b>Signature:</b>
+
+```typescript
+export declare class IndexPatternsService 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)({ uiSettings, savedObjectsClient, apiClient, fieldFormats, onNotification, onError, onRedirectNoIndexPattern, })](./kibana-plugin-plugins-data-public.indexpatternsservice._constructor_.md) |  | Constructs a new instance of the <code>IndexPatternsService</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [clearCache](./kibana-plugin-plugins-data-public.indexpatternsservice.clearcache.md) |  | <code>(id?: string &#124; undefined) =&gt; void</code> | Clear index pattern list cache |
+|  [ensureDefaultIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md) |  | <code>EnsureDefaultIndexPattern</code> |  |
+|  [fieldArrayToMap](./kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md) |  | <code>(fields: FieldSpec[]) =&gt; Record&lt;string, FieldSpec&gt;</code> | Converts field array to map |
+|  [get](./kibana-plugin-plugins-data-public.indexpatternsservice.get.md) |  | <code>(id: string) =&gt; Promise&lt;IndexPattern&gt;</code> | Get an index pattern by id. Cache optimized |
+|  [getCache](./kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md) |  | <code>() =&gt; Promise&lt;SavedObject&lt;IndexPatternSavedObjectAttrs&gt;[] &#124; null &#124; undefined&gt;</code> |  |
+|  [getDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md) |  | <code>() =&gt; Promise&lt;IndexPattern &#124; null&gt;</code> | Get default index pattern |
+|  [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) |  | <code>(indexPattern: IndexPattern &#124; IndexPatternSpec, options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing an index patttern (or spec) |
+|  [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) |  | <code>(options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing { pattern } |
+|  [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md) |  | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern ids |
+|  [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md) |  | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern titles |
+|  [refreshFields](./kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md) |  | <code>(indexPattern: IndexPattern) =&gt; Promise&lt;void&gt;</code> | Refresh field list for a given index pattern |
+|  [savedObjectToSpec](./kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md) |  | <code>(savedObject: SavedObject&lt;IndexPatternAttributes&gt;) =&gt; IndexPatternSpec</code> | Converts index pattern saved object to index pattern spec |
+|  [setDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md) |  | <code>(id: string, force?: boolean) =&gt; Promise&lt;void&gt;</code> | Optionally set default index pattern, unless force = true |
+
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [create(spec, skipFetchFields)](./kibana-plugin-plugins-data-public.indexpatternsservice.create.md) |  | Create a new index pattern instance |
+|  [createAndSave(spec, override, skipFetchFields)](./kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md) |  | Create a new index pattern and save it right away |
+|  [createSavedObject(indexPattern, override)](./kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md) |  | Save a new index pattern |
+|  [delete(indexPatternId)](./kibana-plugin-plugins-data-public.indexpatternsservice.delete.md) |  | Deletes an index pattern from .kibana index |
+|  [updateSavedObject(indexPattern, saveAttempts)](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md) |  | Save existing index pattern. Will attempt to merge differences if there are conflicts |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md
new file mode 100644
index 00000000000000..b7c47efbb445ae
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [refreshFields](./kibana-plugin-plugins-data-public.indexpatternsservice.refreshfields.md)
+
+## IndexPatternsService.refreshFields property
+
+Refresh field list for a given index pattern
+
+<b>Signature:</b>
+
+```typescript
+refreshFields: (indexPattern: IndexPattern) => Promise<void>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md
new file mode 100644
index 00000000000000..7bd40c9cafd429
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [savedObjectToSpec](./kibana-plugin-plugins-data-public.indexpatternsservice.savedobjecttospec.md)
+
+## IndexPatternsService.savedObjectToSpec property
+
+Converts index pattern saved object to index pattern spec
+
+<b>Signature:</b>
+
+```typescript
+savedObjectToSpec: (savedObject: SavedObject<IndexPatternAttributes>) => IndexPatternSpec;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md
new file mode 100644
index 00000000000000..2bf8eaa03d1ae9
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [setDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.setdefault.md)
+
+## IndexPatternsService.setDefault property
+
+Optionally set default index pattern, unless force = true
+
+<b>Signature:</b>
+
+```typescript
+setDefault: (id: string, force?: boolean) => Promise<void>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md
new file mode 100644
index 00000000000000..3973f5d4c3e7b4
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) &gt; [updateSavedObject](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md)
+
+## IndexPatternsService.updateSavedObject() method
+
+Save existing index pattern. Will attempt to merge differences if there are conflicts
+
+<b>Signature:</b>
+
+```typescript
+updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number): Promise<void | Error>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  indexPattern | <code>IndexPattern</code> |  |
+|  saveAttempts | <code>number</code> |  |
+
+<b>Returns:</b>
+
+`Promise<void | Error>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 471078bd4bfea6..506f141984052a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -17,6 +17,7 @@
 |  [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) |  |
 |  [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) |  |
 |  [IndexPatternSelect](./kibana-plugin-plugins-data-public.indexpatternselect.md) |  |
+|  [IndexPatternsService](./kibana-plugin-plugins-data-public.indexpatternsservice.md) |  |
 |  [OptionedParamType](./kibana-plugin-plugins-data-public.optionedparamtype.md) |  |
 |  [Plugin](./kibana-plugin-plugins-data-public.plugin.md) |  |
 |  [RequestTimeoutError](./kibana-plugin-plugins-data-public.requesttimeouterror.md) | Class used to signify that a request timed out. Useful for applications to conditionally handle this type of error differently than other errors. |
@@ -58,7 +59,6 @@
 |  [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md) |  |
 |  [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) |  |
 |  [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) |  |
-|  [Filter](./kibana-plugin-plugins-data-public.filter.md) |  |
 |  [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) |  |
 |  [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) |  |
 |  [IEsSearchResponse](./kibana-plugin-plugins-data-public.iessearchresponse.md) |  |
@@ -77,7 +77,6 @@
 |  [ISearchStartSearchSource](./kibana-plugin-plugins-data-public.isearchstartsearchsource.md) | high level search service |
 |  [KueryNode](./kibana-plugin-plugins-data-public.kuerynode.md) |  |
 |  [OptionedValueProp](./kibana-plugin-plugins-data-public.optionedvalueprop.md) |  |
-|  [Query](./kibana-plugin-plugins-data-public.query.md) |  |
 |  [QueryState](./kibana-plugin-plugins-data-public.querystate.md) | All query state service state |
 |  [QueryStateChange](./kibana-plugin-plugins-data-public.querystatechange.md) |  |
 |  [QuerySuggestionBasic](./kibana-plugin-plugins-data-public.querysuggestionbasic.md) | \* |
@@ -92,7 +91,6 @@
 |  [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) | search source fields |
 |  [TabbedAggColumn](./kibana-plugin-plugins-data-public.tabbedaggcolumn.md) | \* |
 |  [TabbedTable](./kibana-plugin-plugins-data-public.tabbedtable.md) | \* |
-|  [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) |  |
 
 ## Variables
 
@@ -147,6 +145,7 @@
 |  [FieldFormatsContentType](./kibana-plugin-plugins-data-public.fieldformatscontenttype.md) | \* |
 |  [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md) |  |
 |  [FieldFormatsStart](./kibana-plugin-plugins-data-public.fieldformatsstart.md) |  |
+|  [Filter](./kibana-plugin-plugins-data-public.filter.md) |  |
 |  [IAggConfig](./kibana-plugin-plugins-data-public.iaggconfig.md) |  AggConfig This class represents an aggregation, which is displayed in the left-hand nav of the Visualize app. |
 |  [IAggType](./kibana-plugin-plugins-data-public.iaggtype.md) |  |
 |  [IFieldFormat](./kibana-plugin-plugins-data-public.ifieldformat.md) |  |
@@ -164,6 +163,7 @@
 |  [ParsedInterval](./kibana-plugin-plugins-data-public.parsedinterval.md) |  |
 |  [PhraseFilter](./kibana-plugin-plugins-data-public.phrasefilter.md) |  |
 |  [PhrasesFilter](./kibana-plugin-plugins-data-public.phrasesfilter.md) |  |
+|  [Query](./kibana-plugin-plugins-data-public.query.md) |  |
 |  [QueryStart](./kibana-plugin-plugins-data-public.querystart.md) |  |
 |  [QuerySuggestion](./kibana-plugin-plugins-data-public.querysuggestion.md) | \* |
 |  [QuerySuggestionGetFn](./kibana-plugin-plugins-data-public.querysuggestiongetfn.md) |  |
@@ -175,4 +175,5 @@
 |  [TabbedAggRow](./kibana-plugin-plugins-data-public.tabbedaggrow.md) | \* |
 |  [TimefilterContract](./kibana-plugin-plugins-data-public.timefiltercontract.md) |  |
 |  [TimeHistoryContract](./kibana-plugin-plugins-data-public.timehistorycontract.md) |  |
+|  [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) |  |
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md
new file mode 100644
index 00000000000000..aa78c055f4f5c2
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-server.indexpatternsservice.md)
+
+## IndexPatternsService class
+
+<b>Signature:</b>
+
+```typescript
+export declare class IndexPatternsService implements Plugin<void, IndexPatternsServiceStart> 
+```
+
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [setup(core)](./kibana-plugin-plugins-data-server.indexpatternsservice.setup.md) |  |  |
+|  [start(core, { fieldFormats, logger })](./kibana-plugin-plugins-data-server.indexpatternsservice.start.md) |  |  |
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setup.md
new file mode 100644
index 00000000000000..a354fbc2a477bd
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.setup.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-server.indexpatternsservice.md) &gt; [setup](./kibana-plugin-plugins-data-server.indexpatternsservice.setup.md)
+
+## IndexPatternsService.setup() method
+
+<b>Signature:</b>
+
+```typescript
+setup(core: CoreSetup): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  core | <code>CoreSetup</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md
new file mode 100644
index 00000000000000..d35dc3aa110008
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPatternsService](./kibana-plugin-plugins-data-server.indexpatternsservice.md) &gt; [start](./kibana-plugin-plugins-data-server.indexpatternsservice.start.md)
+
+## IndexPatternsService.start() method
+
+<b>Signature:</b>
+
+```typescript
+start(core: CoreStart, { fieldFormats, logger }: IndexPatternsServiceStartDeps): {
+        indexPatternsServiceFactory: (kibanaRequest: KibanaRequest) => Promise<IndexPatternsCommonService>;
+    };
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  core | <code>CoreStart</code> |  |
+|  { fieldFormats, logger } | <code>IndexPatternsServiceStartDeps</code> |  |
+
+<b>Returns:</b>
+
+`{
+        indexPatternsServiceFactory: (kibanaRequest: KibanaRequest) => Promise<IndexPatternsCommonService>;
+    }`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index 874aa547fe9ece..f7d75f6c2b6583 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -10,6 +10,7 @@
 |  --- | --- |
 |  [AggParamType](./kibana-plugin-plugins-data-server.aggparamtype.md) |  |
 |  [IndexPatternsFetcher](./kibana-plugin-plugins-data-server.indexpatternsfetcher.md) |  |
+|  [IndexPatternsService](./kibana-plugin-plugins-data-server.indexpatternsservice.md) |  |
 |  [OptionedParamType](./kibana-plugin-plugins-data-server.optionedparamtype.md) |  |
 |  [Plugin](./kibana-plugin-plugins-data-server.plugin.md) |  |
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
index 455c5ecdd8195a..84aeb4cf80cce9 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
@@ -13,7 +13,7 @@ start(core: CoreStart): {
             fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise<import("../common").FieldFormatsRegistry>;
         };
         indexPatterns: {
-            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../common").IndexPatternsService>;
+            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../public").IndexPatternsService>;
         };
     };
 ```
@@ -32,7 +32,7 @@ start(core: CoreStart): {
             fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise<import("../common").FieldFormatsRegistry>;
         };
         indexPatterns: {
-            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../common").IndexPatternsService>;
+            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../public").IndexPatternsService>;
         };
     }`
 
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index fbf00113a35e34..db9718d187a54b 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -230,6 +230,8 @@ import {
   formatHitProvider,
 } from './index_patterns';
 
+export type { IndexPatternsService } from './index_patterns';
+
 // Index patterns namespace:
 export const indexPatterns = {
   ILLEGAL_CHARACTERS_KEY,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 70fda09ec9da27..0dcbc3c7e07d32 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1316,7 +1316,6 @@ export const indexPatterns: {
     formatHitProvider: typeof formatHitProvider;
 };
 
-// Warning: (ae-forgotten-export) The symbol "IndexPatternsService" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "IndexPatternsContract" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1373,6 +1372,39 @@ export interface IndexPatternSpec {
     version?: string;
 }
 
+// Warning: (ae-missing-release-tag) "IndexPatternsService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class IndexPatternsService {
+    // Warning: (ae-forgotten-export) The symbol "IndexPatternsServiceDeps" needs to be exported by the entry point index.d.ts
+    constructor({ uiSettings, savedObjectsClient, apiClient, fieldFormats, onNotification, onError, onRedirectNoIndexPattern, }: IndexPatternsServiceDeps);
+    clearCache: (id?: string | undefined) => void;
+    create(spec: IndexPatternSpec, skipFetchFields?: boolean): Promise<IndexPattern>;
+    createAndSave(spec: IndexPatternSpec, override?: boolean, skipFetchFields?: boolean): Promise<IndexPattern>;
+    createSavedObject(indexPattern: IndexPattern, override?: boolean): Promise<IndexPattern>;
+    delete(indexPatternId: string): Promise<{}>;
+    // Warning: (ae-forgotten-export) The symbol "EnsureDefaultIndexPattern" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    ensureDefaultIndexPattern: EnsureDefaultIndexPattern;
+    fieldArrayToMap: (fields: FieldSpec[]) => Record<string, FieldSpec>;
+    get: (id: string) => Promise<IndexPattern>;
+    // Warning: (ae-forgotten-export) The symbol "IndexPatternSavedObjectAttrs" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    getCache: () => Promise<SavedObject<IndexPatternSavedObjectAttrs>[] | null | undefined>;
+    getDefault: () => Promise<IndexPattern | null>;
+    getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions) => Promise<any>;
+    // Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts
+    getFieldsForWildcard: (options?: GetFieldsOptions) => Promise<any>;
+    getIds: (refresh?: boolean) => Promise<string[]>;
+    getTitles: (refresh?: boolean) => Promise<string[]>;
+    refreshFields: (indexPattern: IndexPattern) => Promise<void>;
+    savedObjectToSpec: (savedObject: SavedObject<IndexPatternAttributes>) => IndexPatternSpec;
+    setDefault: (id: string, force?: boolean) => Promise<void>;
+    updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number): Promise<void | Error>;
+}
+
 // Warning: (ae-missing-release-tag) "TypeMeta" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -2235,27 +2267,27 @@ export const UI_SETTINGS: {
 // src/plugins/data/public/index.ts:178:26 - (ae-forgotten-export) The symbol "UrlFormat" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:178:26 - (ae-forgotten-export) The symbol "StringFormat" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:178:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getFromSavedObject" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:386:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:395:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:396:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:403:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:407:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "getFromSavedObject" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:398:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:400:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:404:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:408:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:45:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 03baff49103099..7d43e75ce50159 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -289,3 +289,5 @@ export const config: PluginConfigDescriptor<ConfigSchema> = {
   },
   schema: configSchema,
 };
+
+export type { IndexPatternsService } from './index_patterns';
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 06e48f8adc5cb5..15b9e025756b19 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -36,6 +36,7 @@ import { ConfigDeprecationProvider } from '@kbn/config';
 import { CoreSetup } from 'src/core/server';
 import { CoreSetup as CoreSetup_2 } from 'kibana/server';
 import { CoreStart } from 'src/core/server';
+import { CoreStart as CoreStart_2 } from 'kibana/server';
 import { CountParams } from 'elasticsearch';
 import { CreateDocumentParams } from 'elasticsearch';
 import { DeleteDocumentByQueryParams } from 'elasticsearch';
@@ -126,6 +127,7 @@ import { PackageInfo } from '@kbn/config';
 import { PathConfigType } from '@kbn/utils';
 import { PingParams } from 'elasticsearch';
 import { Plugin as Plugin_2 } from 'src/core/server';
+import { Plugin as Plugin_3 } from 'kibana/server';
 import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/server';
 import { PutScriptParams } from 'elasticsearch';
 import { PutTemplateParams } from 'elasticsearch';
@@ -689,6 +691,21 @@ export class IndexPatternsFetcher {
     }): Promise<IndexPatternFieldDescriptor[]>;
 }
 
+// Warning: (ae-forgotten-export) The symbol "IndexPatternsServiceStart" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "IndexPatternsService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class IndexPatternsService implements Plugin_3<void, IndexPatternsServiceStart> {
+    // (undocumented)
+    setup(core: CoreSetup_2): void;
+    // Warning: (ae-forgotten-export) The symbol "IndexPatternsServiceStartDeps" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    start(core: CoreStart_2, { fieldFormats, logger }: IndexPatternsServiceStartDeps): {
+        indexPatternsServiceFactory: (kibanaRequest: KibanaRequest) => Promise<IndexPatternsService_2>;
+    };
+}
+
 // Warning: (ae-missing-release-tag) "ISearchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -888,7 +905,7 @@ export class Plugin implements Plugin_2<PluginSetup, PluginStart, DataPluginSetu
             fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise<import("../common").FieldFormatsRegistry>;
         };
         indexPatterns: {
-            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../common").IndexPatternsService>;
+            indexPatternsServiceFactory: (kibanaRequest: import("../../../core/server").KibanaRequest<unknown, unknown, unknown, any>) => Promise<import("../public").IndexPatternsService>;
         };
     };
     // (undocumented)
@@ -922,8 +939,6 @@ export interface PluginStart {
     //
     // (undocumented)
     fieldFormats: FieldFormatsStart;
-    // Warning: (ae-forgotten-export) The symbol "IndexPatternsServiceStart" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
     indexPatterns: IndexPatternsServiceStart;
     // (undocumented)
@@ -1144,6 +1159,7 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
 // src/plugins/data/server/index.ts:244:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:248:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:251:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index_patterns/index_patterns_service.ts:50:14 - (ae-forgotten-export) The symbol "IndexPatternsService" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/plugin.ts:88:66 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)

From 59ec32447682667bffbbbea623534e21eb2b2b4c Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 22 Sep 2020 10:25:38 -0500
Subject: [PATCH 53/57] don't load field list for data frame analytics

---
 .../use_create_analytics_form.ts                       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index fec23f8b6e678c..1c8bfafeb10ffa 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -131,9 +131,13 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     const indexPatternName = destinationIndex;
 
     try {
-      await mlContext.indexPatterns.createAndSave({
-        title: indexPatternName,
-      });
+      await mlContext.indexPatterns.createAndSave(
+        {
+          title: indexPatternName,
+        },
+        false,
+        true
+      );
 
       addRequestMessage({
         message: i18n.translate(

From 498637b78b2d3232e9fc8bb6cb0d5302bb6b6438 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 22 Sep 2020 12:59:51 -0500
Subject: [PATCH 54/57] remove todo

---
 .../common/index_patterns/index_patterns/index_pattern.ts   | 6 +++---
 .../common/index_patterns/index_patterns/index_patterns.ts  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 17d3ba2c2ef22f..e9d66c75270468 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -134,12 +134,12 @@ export class IndexPattern implements IIndexPattern {
   };
 
   /**
-   * TODO
+   * Converts field format spec to field format instance
    * @param mapping
    */
-  private deserializeFieldFormatMap(mapping: any) {
+  private deserializeFieldFormatMap(mapping: SerializedFieldFormat<Record<string, any>>) {
     try {
-      return this.fieldFormats.getInstance(mapping.id, mapping.params);
+      return this.fieldFormats.getInstance(mapping.id as string, mapping.params);
     } catch (err) {
       if (err instanceof FieldFormatNotFoundError) {
         return undefined;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index ef252d513a7719..87541f21725865 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -269,7 +269,7 @@ export class IndexPatternsService {
    * @param fieldSpecs
    * @param fieldFormatMap
    */
-  private mergeFieldsAndFormats = (fieldSpecs: FieldSpec[], fieldFormatMap: FieldFormatMap) => {
+  private addFormatsToFields = (fieldSpecs: FieldSpec[], fieldFormatMap: FieldFormatMap) => {
     Object.entries(fieldFormatMap).forEach(([fieldName, value]) => {
       const field = fieldSpecs.find((fld: FieldSpec) => fld.name === fieldName);
       if (field) {
@@ -314,7 +314,7 @@ export class IndexPatternsService {
     const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
     const parsedFields: FieldSpec[] = fields ? JSON.parse(fields) : [];
 
-    this.mergeFieldsAndFormats(parsedFields, parsedFieldFormatMap);
+    this.addFormatsToFields(parsedFields, parsedFieldFormatMap);
     return {
       id,
       version,

From e3b5407e8709bab4272da60500b16cda39637abe Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 22 Sep 2020 16:44:29 -0500
Subject: [PATCH 55/57] catch on field refresh

---
 .../index_patterns/index_patterns.ts          | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 87541f21725865..07449b0df59f46 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -226,9 +226,23 @@ export class IndexPatternsService {
    * @param indexPattern
    */
   refreshFields = async (indexPattern: IndexPattern) => {
-    const fields = await this.getFieldsForIndexPattern(indexPattern);
-    const scripted = indexPattern.getScriptedFields().map((field) => field.spec);
-    indexPattern.fields.replaceAll([...fields, ...scripted]);
+    try {
+      const fields = await this.getFieldsForIndexPattern(indexPattern);
+      const scripted = indexPattern.getScriptedFields().map((field) => field.spec);
+      indexPattern.fields.replaceAll([...fields, ...scripted]);
+    } catch (err) {
+      if (err instanceof IndexPatternMissingIndices) {
+        this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
+        return {};
+      }
+
+      this.onError(err, {
+        title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
+          defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})',
+          values: { id: indexPattern.id, title: indexPattern.title },
+        }),
+      });
+    }
   };
 
   /**

From ae0d9ee403e9e788dad2a3708dd3b90e199f5ab6 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 22 Sep 2020 16:50:05 -0500
Subject: [PATCH 56/57] remove comment

---
 .../public/components/edit_index_pattern/edit_index_pattern.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 078a76961da8e7..67a20c428040f4 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -121,7 +121,6 @@ export const EditIndexPattern = withRouter(
     const refreshFields = () => {
       overlays.openConfirm(confirmMessage, confirmModalOptionsRefresh).then(async (isConfirmed) => {
         if (isConfirmed) {
-          // todo catch error as in index_pattern
           await data.indexPatterns.refreshFields(indexPattern);
           await data.indexPatterns.updateSavedObject(indexPattern);
           setFields(indexPattern.getNonScriptedFields());

From 305f3f882d595302658f0ae648600ab0b4858b7b Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 22 Sep 2020 18:02:26 -0500
Subject: [PATCH 57/57] fix return type

---
 .../data/common/index_patterns/index_patterns/index_patterns.ts | 1 -
 src/plugins/data/public/index.ts                                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 07449b0df59f46..c56954ba6a29b3 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -233,7 +233,6 @@ export class IndexPatternsService {
     } catch (err) {
       if (err instanceof IndexPatternMissingIndices) {
         this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
-        return {};
       }
 
       this.onError(err, {
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index db9718d187a54b..42c8864bb0bc02 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -268,7 +268,7 @@ export {
   fieldList,
 } from '../common';
 
-export * from '../common/index_patterns/errors';
+export { DuplicateIndexPatternError } from '../common/index_patterns/errors';
 
 /*
  * Autocomplete query suggestions: