From 37ce10158ad8911bbbd951a5b5e329858beec091 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Mon, 10 Aug 2020 09:08:36 +0200
Subject: [PATCH 01/10] RFC: encryption key rotation support for the
 `encryptedSavedObjects` plugin (#72828)

---
 rfcs/text/0012_encryption_key_rotation.md | 119 ++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 rfcs/text/0012_encryption_key_rotation.md

diff --git a/rfcs/text/0012_encryption_key_rotation.md b/rfcs/text/0012_encryption_key_rotation.md
new file mode 100644
index 0000000000000..d984d1157a0a1
--- /dev/null
+++ b/rfcs/text/0012_encryption_key_rotation.md
@@ -0,0 +1,119 @@
+- Start Date: 2020-07-22
+- RFC PR: [#72828](https://github.com/elastic/kibana/pull/72828)
+- Kibana Issue: (leave this empty)
+
+# Summary
+
+This RFC proposes a way of the encryption key (`xpack.encryptedSavedObjects.encryptionKey`) rotation that would allow administrators to seamlessly change existing encryption key without any data loss and manual intervention.
+
+# Basic example
+
+When administrators decide to rotate encryption key they will have to generate a new one and move the old key(s) to the `keyRotation` section in the `kibana.yml`:
+
+```yaml
+xpack.encryptedSavedObjects:
+  encryptionKey: "NEW-encryption-key"
+  keyRotation:
+    decryptionOnlyKeys: ["OLD-encryption-key-1", "OLD-encryption-key-2"]
+```
+
+Before old decryption-only key is disposed administrators may want to call a dedicated and _protected_ API endpoint that will go through all registered Saved Objects with encrypted attributes and try to re-encrypt them with the primary encryption key:
+
+```http request
+POST https://localhost:5601/api/encrypted_saved_objects/rotate_key?conflicts=abort
+Content-Type: application/json
+Kbn-Xsrf: true
+```
+
+# Motivation
+
+Today when encryption key changes we can no longer decrypt Saved Objects attributes that were previously encrypted with the `EncryptedSavedObjects` plugin. We handle this case in two different ways depending on whether consumers explicitly requested decryption or not:
+
+* If consumers explicitly request decryption via  `getDecryptedAsInternalUser()` we abort operation and throw exception.
+* If consumers fetch Saved Objects with encrypted attributes that should be automatically decrypted (the ones with `dangerouslyExposeValue: true` marker) via standard Saved Objects APIs we don't abort operation, but rather strip all encrypted attributes from the response and record decryption error in the `error` Saved Object field.
+* If Kibana tries to migrate encrypted Saved Objects at the start up time we abort operation and throw exception. 
+
+In both of these cases we throw or record error with the specific type to allow consumers to gracefully handle this scenario and either drop Saved Objects with unrecoverable encrypted attributes or facilitate the process of re-entering and re-encryption of the new values.
+
+This approach works reasonably well in some scenarios, but it may become very troublesome if we have to deal with lots of Saved Objects. Moreover, we'd like to recommend our users to periodically rotate encryption keys even if they aren't compromised. Hence, we need to provide a way of seamless migration of the existing encrypted Saved Objects to a new encryption key.
+
+There are two main scenarios we'd like to cover in this RFC:
+
+## Encryption key is not available
+
+Administrators may lose existing encryption key or explicitly decide to not use it if it was compromised and users can no longer trust encrypted content that may have been tampered with. In this scenario encrypted portion of the existing Saved Objects is considered lost, and the only way to recover from this state is a manual intervention described previously. That means `EncryptedSavedObjects` plugin consumers __should__ continue supporting this scenario even after we implement a proper encryption key rotation mechanism described in this RFC.
+
+## Encryption key is available, but needs to be rotated
+
+In this scenario a new encryption key (primary encryption key) will be generated, and we will use it to encrypt new or updated Saved Objects. We will still need to know the old encryption key to decrypt existing attributes, but we will no longer use this key to encrypt any of the new or existing Saved Objects. It's also should be possible to have multiple old decryption-only keys.
+
+The old old decryption-only keys should be eventually disposed and users should have a way to make sure all existing Saved Objects are re-encrypted with the new primary encryption key.
+
+__NOTE:__ users can get into a state when different Saved Objects are encrypted with different encryption keys even if they didn't intend to rotate the encryption key. We anticipate that it can happen during initial Elastic Stack HA setup, when by mistake or intentionally different Kibana instances were using different encryption keys. Key rotation mechanism can help to fix this issue without a data loss.
+
+# Detailed design
+
+The core idea is that when the encryption key needs to be rotated then a new key is generated and becomes a primary one, and the old one moves to the `keyRotation` section:
+
+```yaml
+xpack.encryptedSavedObjects:
+  encryptionKey: "NEW-encryption-key"
+  keyRotation:
+    decryptionOnlyKeys: ["OLD-encryption-key"]
+```
+
+As the name implies, the key from the `decryptionOnlyKeys` is only used to decrypt content that we cannot decrypt with the primary encryption key. It's allowed to have multiple decryption-only keys at the same time. When user creates a new Saved Object or updates the existing one then its content is always encrypted with the primary encryption key. Config schema won't allow having the same key in `encryptionKey` and `decryptionOnlyKeys`.
+
+Having multiple decryption keys at the same time brings one problem though: we need to figure out which key to use to decrypt specific Saved Object. If our encryption keys could have a unique ID that we would store together with the encrypted data (we cannot use encryption key hash for that for obvious reasons) we could know for sure which key to use, but we don't have such functionality right now and it may not be the easiest one to manage through `yml` configuration anyway. 
+
+Instead, this RFC proposes to try available existing decryption keys one by one to decrypt Saved Object and always start from the primary one. This way we won't incur any penalty while decrypting Saved Objects that are already encrypted with the primary encryption key, but there will still be some cost when we have to perform multiple decryption attempts. See the [`Drawbacks`](#drawbacks) section for the details.
+
+Technically just having `decryptionOnlyKeys` would be enough to cover the majority of the use cases, but the old decryption-only keys should be eventually disposed. At this point administrators would like to make sure _all_ Saved Objects are encrypted with the new primary encryption key. Another reason to re-encrypt all existing Saved Objects with the new key at once is to preventively reduce the performance impact of the multiple decryption attempts.
+
+We'd like to make this process as simple as possible while meeting the following requirements:
+
+* It should not be required to restart Kibana to perform this type of migration since Saved Objects encrypted with the another encryption key can theoretically appear at any point in time.
+* It should be possible to integrate this operation into other operational flows our users may have and any user-friendly key management UIs we may introduce in this future.
+* Any possible failures that may happen during this operation shouldn't make Kibana nonfunctional.
+* Ordinary users should not be able to trigger this migration since it may consume a considerable amount of computing resources.
+
+We think that the best option we have right now is a dedicated API endpoint that would trigger this migration:
+
+```http request
+POST https://localhost:5601/api/encrypted_saved_objects/rotate_key?conflicts=abort
+Content-Type: application/json
+Kbn-Xsrf: true
+```
+
+This will be a protected endpoint and only user with enough privileges will be able to use it.
+
+Under the hood we'll scroll over all Saved Objects that are registered with `EncryptedSavedObjects` plugin and re-encrypt attributes only for those of them that can only be decrypted with any of the old decryption-only keys. Saved Objects that can be decrypted with the primary encryption key will be ignored. We'll also ignore the ones that cannot be decrypted with any of the available decryption keys at all, and presumably return their IDs in the response.
+
+As for any other encryption or decryption operation we'll record relevant bits in the audit logs.
+
+# Benefits
+
+* The concept of decryption-only keys is easy to grasp and allows Kibana to function even if it has a mix of Saved Objects encrypted with different encryption keys.
+* Support of the key rotation out of the box decreases the chances of the data loss and makes `EncryptedSavedObjects` story more secure and approachable overall.
+
+# Drawbacks
+
+* Multiple decryption attempts affect performance. See [the performance test results](https://github.com/elastic/kibana/pull/72420#issue-453400211) for more details, but making two decryption attempts is basically twice as slow as with a single attempt. Although it's only relevant for the encrypted Saved Objects migration performed at the start up time and batch operations that trigger automatic decryption (only for the Saved Objects registered with `dangerouslyExposeValue: true` marker that nobody is using in Kibana right now), we may have more use cases in the future.
+* Historically we supported Kibana features with either configuration or dedicated UI, but in this case we want to introduce an API endpoint that _should be_ used directly. We may have a key management UI in the future though.
+
+# Alternatives
+
+We cannot think of any better alternative for `decryptionOnlyKeys` at the moment, but instead of API endpoint for the batch re-encryption we could potentially use another `kibana.yml` config option. For example `keyRotation.mode: onWrite | onStart | both`, but it feels a bit hacky and cannot be really integrated with anything else.
+
+# Adoption strategy
+
+Adoption strategy is pretty straightforward since the feature is an enhancement and doesn't bring any BWC concerns.
+
+# How we teach this
+
+Key rotation is a well-known paradigm. We'll update `README.md` of the `EncryptedSavedObjects` plugin and create a dedicated section in the public Kibana documentation.
+
+# Unresolved questions
+
+* Is it reasonable to have this feature in Basic?
+* Are there any other use-cases that are not covered by the proposal?

From 0a65e172a1563c9b0e39d06c5a4c0a3a4af480ec Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Mon, 10 Aug 2020 09:30:51 +0200
Subject: [PATCH 02/10] [ES UI Shared] Added README (#72034)

* Added readme to es-ui-shared

* implement PR feedback; clarify terms and tighten grammar

* added note about intended users of es ui shared modules
---
 src/plugins/es_ui_shared/README.md | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/plugins/es_ui_shared/README.md

diff --git a/src/plugins/es_ui_shared/README.md b/src/plugins/es_ui_shared/README.md
new file mode 100644
index 0000000000000..5a9091e2dd1eb
--- /dev/null
+++ b/src/plugins/es_ui_shared/README.md
@@ -0,0 +1,32 @@
+## ES UI shared modules
+
+This plugin contains reusable code in the form of self-contained modules (or libraries). Each of these modules exports a set of functionality relevant to the domain of the module.
+
+**Please note**: Modules in ES UI shared are intended for use by the ES UI Management Team (elastic/es-ui@) only. Please reach out to us if there is something you would like to contribute or use in these modules.
+
+## Files and folders overview
+
+- `./public` | `./server`. Folders for grouping server or public code according to the Kibana plugin pattern.
+- `./__packages_do_not_import__` is where actual functionality is kept. This enables modules more control over what functionality is directly exported and prevents parts of modules to be depended on externally in unintended ways.
+- `./public/index.ts` | `./server/index.ts` These files export modules (simple JavaScript objects). For example, `Monaco` is the name of a module. In this way, modules namespace all of their exports and do not have to be concerned about name collisions from other modules.
+
+## Conventions for adding code
+
+When adding new functionality, look at the folders in `./__packages_do_not_import__` and consider whether your functionality falls into any of those modules.
+
+If it does not, you should create a module and expose it to public or server code (or both) following the conventions described above.
+
+### Example
+
+If I wanted to add functionality for calculating a Fibonacci sequence browser-side one would do the following:
+
+1. Create a folder `./__packages_do_not_import__/math`. The name of the folder should be a snake_case version of the module name. In this case `Math` -> `math`. Another case, `IndexManagement` -> `index_management`.
+2. Write your function in `./__packages_do_not_import__/math/calculate_fibonacci.ts`, adding any relevant tests in the same folder.
+3. Export functionality intended _for consumers_ from `./__packages_do_not_import__/math/index.ts`.
+4. Create a folder `./public/math`.
+5. Export all functionality from `./__packages_do_not_import__/math` in `./public/math/index.ts`.
+6. In `./public/index.ts` import `./public/math` using `import * as Math from './public/math;`. The name (`Math`) given here is really important and will be what consumers depend on.
+7. Add the `Math` module to the list of exported modules in `./public/index.ts`, e.g. `export { <...other modules>, Math }`
+8. Use `Math` in your public side code elsewhere!
+
+This example assumes no other appropriate home for such a function exists.

From ce025732a17bb1a1488e6d01abf73545d9a393ba Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Mon, 10 Aug 2020 10:09:30 +0200
Subject: [PATCH 03/10] add retry for checking Add button (#74551)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../test/functional/apps/dashboard/_async_dashboard.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
index cc30a7a7e640f..8851c83dea1ff 100644
--- a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
+++ b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
@@ -27,8 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'timePicker',
   ]);
 
-  // Flakky: https://github.com/elastic/kibana/issues/65949
-  describe.skip('sample data dashboard', function describeIndexTests() {
+  describe('sample data dashboard', function describeIndexTests() {
     before(async () => {
       await PageObjects.common.sleep(5000);
       await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
@@ -36,8 +35,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.home.addSampleDataSet('flights');
-      const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
-      expect(isInstalled).to.be(true);
+      await retry.tryForTime(10000, async () => {
+        const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
+        expect(isInstalled).to.be(true);
+      });
+
       // add the range of the sample data so we can pick it in the quick pick list
       const SAMPLE_DATA_RANGE = `[
         {

From ad8502c8d9cbf35822ed187aae9ea31e5eca21ab Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 10 Aug 2020 01:25:29 -0700
Subject: [PATCH 04/10] update code-exploration docs

---
 docs/developer/architecture/code-exploration.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developer/architecture/code-exploration.asciidoc b/docs/developer/architecture/code-exploration.asciidoc
index bb7222020180c..d9502e4cb47ee 100644
--- a/docs/developer/architecture/code-exploration.asciidoc
+++ b/docs/developer/architecture/code-exploration.asciidoc
@@ -86,9 +86,9 @@ Contains the Discover application and the saved search embeddable.
 Embeddables are re-usable widgets that can be rendered in any environment or plugin. Developers can embed them directly in their plugin. End users can dynamically add them to any embeddable containers.
 
 
-- {kib-repo}blob/{branch}/src/plugins/es_ui_shared[esUiShared]
+- {kib-repo}blob/{branch}/src/plugins/es_ui_shared/README.md[esUiShared]
 
-WARNING: Missing README.
+This plugin contains reusable code in the form of self-contained modules (or libraries). Each of these modules exports a set of functionality relevant to the domain of the module.
 
 
 - {kib-repo}blob/{branch}/src/plugins/expressions/README.md[expressions]

From f7f2988aa2d6a557ee2aa6aa184ea774bb57f345 Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Mon, 10 Aug 2020 13:04:57 +0200
Subject: [PATCH 05/10] [ML] Functional tests - stabilize DFA job type check
 (#74631)

This PR stabilizes the data frame analytics job type assertion by adding a retry.
---
 .../ml/data_frame_analytics_creation.ts        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index a49febfe68f61..d8df2fb869ed7 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -46,14 +46,16 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async assertJobTypeSelection(expectedSelection: string) {
-      const actualSelection = await testSubjects.getAttribute(
-        'mlAnalyticsCreateJobWizardJobTypeSelect',
-        'value'
-      );
-      expect(actualSelection).to.eql(
-        expectedSelection,
-        `Job type selection should be '${expectedSelection}' (got '${actualSelection}')`
-      );
+      await retry.tryForTime(5000, async () => {
+        const actualSelection = await testSubjects.getAttribute(
+          'mlAnalyticsCreateJobWizardJobTypeSelect',
+          'value'
+        );
+        expect(actualSelection).to.eql(
+          expectedSelection,
+          `Job type selection should be '${expectedSelection}' (got '${actualSelection}')`
+        );
+      });
     },
 
     async selectJobType(jobType: string) {

From cccf15a3f42943aa81393fe532bfb4ce48ea6994 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Mon, 10 Aug 2020 07:35:12 -0500
Subject: [PATCH 06/10] Index pattern field class refactor (#73180)

- Better distinction and relationship between IndexPatternField and its spec
- IndexPatternField class is no longer defined via object mutation
- Reduction of dependencies
- UI code moved into Index Pattern class (will be removed in next ticket)
- IndexPattern field list was previously composed of IndexPatternFields or specs, now only IndexPatternFields
- IndexPattern field list was previously redefined when loading fields, now only its contents are replaced.
---
 ...ins-data-public.fieldlist._constructor_.md |  23 +++
 ...lugin-plugins-data-public.fieldlist.add.md |  11 +
 ...plugins-data-public.fieldlist.getbyname.md |  11 +
 ...plugins-data-public.fieldlist.getbytype.md |  11 +
 ...na-plugin-plugins-data-public.fieldlist.md |  31 +++
 ...in-plugins-data-public.fieldlist.remove.md |  11 +
 ...plugins-data-public.fieldlist.removeall.md |  11 +
 ...lugins-data-public.fieldlist.replaceall.md |  11 +
 ...in-plugins-data-public.fieldlist.tospec.md |  25 +++
 ...in-plugins-data-public.fieldlist.update.md |  11 +
 ...-public.getindexpatternfieldlistcreator.md |  11 -
 ...public.iindexpatternfieldlist.getbyname.md |   6 +-
 ...public.iindexpatternfieldlist.getbytype.md |   6 +-
 ...gins-data-public.iindexpatternfieldlist.md |   4 +-
 ...public.iindexpatternfieldlist.removeall.md |  15 ++
 ...ublic.iindexpatternfieldlist.replaceall.md |  22 ++
 ...data-public.indexpattern.getfieldbyname.md |   4 +-
 ...ublic.indexpattern.getformatterforfield.md |  22 ++
 ...ublic.indexpattern.getnonscriptedfields.md |   4 +-
 ...a-public.indexpattern.getscriptedfields.md |   4 +-
 ...s-data-public.indexpattern.gettimefield.md |   4 +-
 ...plugin-plugins-data-public.indexpattern.md |   3 +-
 ...public.indexpattern.removescriptedfield.md |   4 +-
 ...-public.indexpatternfield._constructor_.md |  12 +-
 ...a-public.indexpatternfield.aggregatable.md |   2 +-
 ....indexpatternfield.conflictdescriptions.md |   4 +-
 ...ins-data-public.indexpatternfield.count.md |   4 +-
 ...ta-public.indexpatternfield.displayname.md |   2 +-
 ...s-data-public.indexpatternfield.estypes.md |   2 +-
 ...ata-public.indexpatternfield.filterable.md |   2 +-
 ...ns-data-public.indexpatternfield.format.md |   2 +-
 ...a-public.indexpatternfield.indexpattern.md |   2 +-
 ...gins-data-public.indexpatternfield.lang.md |   4 +-
 ...n-plugins-data-public.indexpatternfield.md |  28 ++-
 ...gins-data-public.indexpatternfield.name.md |   2 +-
 ...lic.indexpatternfield.readfromdocvalues.md |   2 +-
 ...ns-data-public.indexpatternfield.script.md |   4 +-
 ...-data-public.indexpatternfield.scripted.md |   2 +-
 ...ata-public.indexpatternfield.searchable.md |   2 +-
 ...-data-public.indexpatternfield.sortable.md |   2 +-
 ...ins-data-public.indexpatternfield.spec.md} |   6 +-
 ...s-data-public.indexpatternfield.subtype.md |   2 +-
 ...ns-data-public.indexpatternfield.tojson.md |  41 ++++
 ...ns-data-public.indexpatternfield.tospec.md |  36 +++-
 ...gins-data-public.indexpatternfield.type.md |   2 +-
 ...a-public.indexpatternfield.visualizable.md |   2 +-
 .../kibana-plugin-plugins-data-public.md      |   2 +-
 ....snap => index_pattern_field.test.ts.snap} |   0
 .../common/index_patterns/fields/field.ts     | 176 ----------------
 .../index_patterns/fields/field_list.ts       | 159 ++++++++-------
 .../common/index_patterns/fields/index.ts     |   2 +-
 ...ld.test.ts => index_pattern_field.test.ts} | 105 ++--------
 .../fields/index_pattern_field.ts             | 188 ++++++++++++++++++
 .../index_patterns/fields/obj_define.js       | 158 ---------------
 .../index_patterns/fields/obj_define.test.js  | 149 --------------
 .../index_patterns/index_pattern.test.ts      |  22 +-
 .../index_patterns/index_pattern.ts           | 119 ++++++-----
 .../index_patterns/index_patterns.ts          |  28 +--
 .../data/common/index_patterns/types.ts       |  15 +-
 .../kbn_field_types/kbn_field_types.test.ts   |   4 +-
 .../common/kbn_field_types/kbn_field_types.ts |   6 +-
 .../kbn_field_types_factory.ts                |   8 +-
 src/plugins/data/public/index.ts              |   5 +-
 .../data/public/index_patterns/index.ts       |   6 +-
 src/plugins/data/public/public.api.md         | 169 +++++++++++-----
 .../public/search/aggs/agg_configs.test.ts    |   2 +-
 .../public/search/aggs/param_types/field.ts   |   2 +-
 .../doc_table/components/row_headers.test.js  |  43 ++--
 .../sidebar/discover_field.test.tsx           |  30 +--
 .../components/sidebar/discover_sidebar.tsx   |  11 +-
 .../lib/get_index_pattern_field_list.ts       |  12 +-
 .../components/sidebar/lib/group_fields.tsx   |   4 +-
 .../create_edit_field/create_edit_field.tsx   |  31 ++-
 .../indexed_fields_table.test.tsx.snap        |  20 +-
 .../indexed_fields_table.test.tsx             |  21 +-
 .../indexed_fields_table.tsx                  |   2 +-
 .../__snapshots__/field_editor.test.tsx.snap  |   5 +
 .../editors/string/string.tsx                 |   2 +-
 .../field_editor/field_editor.test.tsx        |  23 ++-
 .../components/field_editor/field_editor.tsx  | 166 ++++++++--------
 .../public/components/test_utils.tsx          |   4 +-
 src/test_utils/public/stub_index_pattern.js   |  22 +-
 .../management/_index_pattern_popularity.js   |   2 +-
 .../apps/management/_scripted_fields.js       |   3 +-
 .../management/_scripted_fields_filter.js     |   4 +-
 85 files changed, 1086 insertions(+), 1076 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md
 rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.indexpatternfield.__spec.md => kibana-plugin-plugins-data-public.indexpatternfield.spec.md} (56%)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
 rename src/plugins/data/common/index_patterns/fields/__snapshots__/{field.test.ts.snap => index_pattern_field.test.ts.snap} (100%)
 delete mode 100644 src/plugins/data/common/index_patterns/fields/field.ts
 rename src/plugins/data/common/index_patterns/fields/{field.test.ts => index_pattern_field.test.ts} (64%)
 create mode 100644 src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
 delete mode 100644 src/plugins/data/common/index_patterns/fields/obj_define.js
 delete mode 100644 src/plugins/data/common/index_patterns/fields/obj_define.test.js

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
new file mode 100644
index 0000000000000..3b60ac0f48edd
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
@@ -0,0 +1,23 @@
+<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.fieldlist._constructor_.md)
+
+## FieldList.(constructor)
+
+Constructs a new instance of the `FieldList` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  indexPattern | <code>IndexPattern</code> |  |
+|  specs | <code>FieldSpec[]</code> |  |
+|  shortDotsEnable | <code>boolean</code> |  |
+|  onNotification | <code>() =&gt; void</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md
new file mode 100644
index 0000000000000..ae3d82f0cc3ea
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [add](./kibana-plugin-plugins-data-public.fieldlist.add.md)
+
+## FieldList.add property
+
+<b>Signature:</b>
+
+```typescript
+readonly add: (field: FieldSpec) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md
new file mode 100644
index 0000000000000..af368d003423a
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [getByName](./kibana-plugin-plugins-data-public.fieldlist.getbyname.md)
+
+## FieldList.getByName property
+
+<b>Signature:</b>
+
+```typescript
+readonly getByName: (name: IndexPatternField['name']) => IndexPatternField | undefined;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md
new file mode 100644
index 0000000000000..16bae3ee7c555
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [getByType](./kibana-plugin-plugins-data-public.fieldlist.getbytype.md)
+
+## FieldList.getByType property
+
+<b>Signature:</b>
+
+```typescript
+readonly getByType: (type: IndexPatternField['type']) => any[];
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
new file mode 100644
index 0000000000000..ef740575dff4e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
@@ -0,0 +1,31 @@
+<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md)
+
+## FieldList class
+
+<b>Signature:</b>
+
+```typescript
+export declare class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(indexPattern, specs, shortDotsEnable, onNotification)](./kibana-plugin-plugins-data-public.fieldlist._constructor_.md) |  | Constructs a new instance of the <code>FieldList</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [add](./kibana-plugin-plugins-data-public.fieldlist.add.md) |  | <code>(field: FieldSpec) =&gt; void</code> |  |
+|  [getByName](./kibana-plugin-plugins-data-public.fieldlist.getbyname.md) |  | <code>(name: IndexPatternField['name']) =&gt; IndexPatternField &#124; undefined</code> |  |
+|  [getByType](./kibana-plugin-plugins-data-public.fieldlist.getbytype.md) |  | <code>(type: IndexPatternField['type']) =&gt; any[]</code> |  |
+|  [remove](./kibana-plugin-plugins-data-public.fieldlist.remove.md) |  | <code>(field: IFieldType) =&gt; void</code> |  |
+|  [removeAll](./kibana-plugin-plugins-data-public.fieldlist.removeall.md) |  | <code>() =&gt; void</code> |  |
+|  [replaceAll](./kibana-plugin-plugins-data-public.fieldlist.replaceall.md) |  | <code>(specs: FieldSpec[]) =&gt; void</code> |  |
+|  [toSpec](./kibana-plugin-plugins-data-public.fieldlist.tospec.md) |  | <code>() =&gt; {</code><br/><code>        count: number;</code><br/><code>        script: string &#124; undefined;</code><br/><code>        lang: string &#124; undefined;</code><br/><code>        conflictDescriptions: Record&lt;string, string[]&gt; &#124; undefined;</code><br/><code>        name: string;</code><br/><code>        type: string;</code><br/><code>        esTypes: string[] &#124; undefined;</code><br/><code>        scripted: boolean;</code><br/><code>        searchable: boolean;</code><br/><code>        aggregatable: boolean;</code><br/><code>        readFromDocValues: boolean;</code><br/><code>        subType: import(&quot;../types&quot;).IFieldSubType &#124; undefined;</code><br/><code>        format: any;</code><br/><code>    }[]</code> |  |
+|  [update](./kibana-plugin-plugins-data-public.fieldlist.update.md) |  | <code>(field: FieldSpec) =&gt; void</code> |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md
new file mode 100644
index 0000000000000..149410adb3550
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [remove](./kibana-plugin-plugins-data-public.fieldlist.remove.md)
+
+## FieldList.remove property
+
+<b>Signature:</b>
+
+```typescript
+readonly remove: (field: IFieldType) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md
new file mode 100644
index 0000000000000..92a45349ad005
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [removeAll](./kibana-plugin-plugins-data-public.fieldlist.removeall.md)
+
+## FieldList.removeAll property
+
+<b>Signature:</b>
+
+```typescript
+readonly removeAll: () => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md
new file mode 100644
index 0000000000000..5330440e6b96a
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [replaceAll](./kibana-plugin-plugins-data-public.fieldlist.replaceall.md)
+
+## FieldList.replaceAll property
+
+<b>Signature:</b>
+
+```typescript
+readonly replaceAll: (specs: FieldSpec[]) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md
new file mode 100644
index 0000000000000..e646339feb495
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [toSpec](./kibana-plugin-plugins-data-public.fieldlist.tospec.md)
+
+## FieldList.toSpec property
+
+<b>Signature:</b>
+
+```typescript
+readonly toSpec: () => {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+        format: any;
+    }[];
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md
new file mode 100644
index 0000000000000..c718e47b31b50
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [update](./kibana-plugin-plugins-data-public.fieldlist.update.md)
+
+## FieldList.update property
+
+<b>Signature:</b>
+
+```typescript
+readonly update: (field: FieldSpec) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md
deleted file mode 100644
index 880acdc8956d4..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.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; [getIndexPatternFieldListCreator](./kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md)
-
-## getIndexPatternFieldListCreator variable
-
-<b>Signature:</b>
-
-```typescript
-getIndexPatternFieldListCreator: ({ fieldFormats, onNotification, }: FieldListDependencies) => CreateIndexPatternFieldList
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbyname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbyname.md
index 14b5aa7137dc2..e277df87fe908 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbyname.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbyname.md
@@ -7,16 +7,16 @@
 <b>Signature:</b>
 
 ```typescript
-getByName(name: Field['name']): Field | undefined;
+getByName(name: IndexPatternField['name']): IndexPatternField | undefined;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | <code>Field['name']</code> |  |
+|  name | <code>IndexPatternField['name']</code> |  |
 
 <b>Returns:</b>
 
-`Field | undefined`
+`IndexPatternField | undefined`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbytype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbytype.md
index 3c65b78e5291d..9a7b3ab36b0c1 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbytype.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbytype.md
@@ -7,16 +7,16 @@
 <b>Signature:</b>
 
 ```typescript
-getByType(type: Field['type']): Field[];
+getByType(type: IndexPatternField['type']): IndexPatternField[];
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  type | <code>Field['type']</code> |  |
+|  type | <code>IndexPatternField['type']</code> |  |
 
 <b>Returns:</b>
 
-`Field[]`
+`IndexPatternField[]`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
index 47d7c7491aa86..4ab012a2601d2 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-export interface IIndexPatternFieldList extends Array<Field> 
+export interface IIndexPatternFieldList extends Array<IndexPatternField> 
 ```
 
 ## Methods
@@ -18,5 +18,7 @@ export interface IIndexPatternFieldList extends Array<Field>
 |  [getByName(name)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbyname.md) |  |
 |  [getByType(type)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.getbytype.md) |  |
 |  [remove(field)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.remove.md) |  |
+|  [removeAll()](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md) |  |
+|  [replaceAll(specs)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md) |  |
 |  [update(field)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.update.md) |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md
new file mode 100644
index 0000000000000..55e7ca98e2637
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md
@@ -0,0 +1,15 @@
+<!-- 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; [IIndexPatternFieldList](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.md) &gt; [removeAll](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md)
+
+## IIndexPatternFieldList.removeAll() method
+
+<b>Signature:</b>
+
+```typescript
+removeAll(): void;
+```
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md
new file mode 100644
index 0000000000000..c7e8cdd578bfe
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.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-public](./kibana-plugin-plugins-data-public.md) &gt; [IIndexPatternFieldList](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.md) &gt; [replaceAll](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md)
+
+## IIndexPatternFieldList.replaceAll() method
+
+<b>Signature:</b>
+
+```typescript
+replaceAll(specs: FieldSpec[]): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  specs | <code>FieldSpec[]</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md
index e6a23c5c70aab..75cdfd0a2e22e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-getFieldByName(name: string): Field | void;
+getFieldByName(name: string): IndexPatternField | undefined;
 ```
 
 ## Parameters
@@ -18,5 +18,5 @@ getFieldByName(name: string): Field | void;
 
 <b>Returns:</b>
 
-`Field | void`
+`IndexPatternField | undefined`
 
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
new file mode 100644
index 0000000000000..7984f7aff1d2d
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.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-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getFormatterForField](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md)
+
+## IndexPattern.getFormatterForField() method
+
+<b>Signature:</b>
+
+```typescript
+getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  field | <code>IndexPatternField &#124; IndexPatternField['spec']</code> |  |
+
+<b>Returns:</b>
+
+`FieldFormat`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
index 4e49304484815..77ce6f6f23a67 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-getNonScriptedFields(): Field[];
+getNonScriptedFields(): IndexPatternField[];
 ```
 <b>Returns:</b>
 
-`Field[]`
+`IndexPatternField[]`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
index 9ab4f9a9aaed5..055f07367c96e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-getScriptedFields(): Field[];
+getScriptedFields(): IndexPatternField[];
 ```
 <b>Returns:</b>
 
-`Field[]`
+`IndexPatternField[]`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.gettimefield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.gettimefield.md
index 8e68e8c35aff7..24de0be3794bb 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.gettimefield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.gettimefield.md
@@ -7,9 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-getTimeField(): Field | undefined;
+getTimeField(): IndexPatternField | undefined;
 ```
 <b>Returns:</b>
 
-`Field | undefined`
+`IndexPatternField | undefined`
 
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 a37f115358922..d340aaeeef25e 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
@@ -42,6 +42,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [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) |  |  |
+|  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  |  |
 |  [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) |  |  |
@@ -55,7 +56,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [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(field)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
+|  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
 |  [save(saveAttempts)](./kibana-plugin-plugins-data-public.indexpattern.save.md) |  |  |
 |  [toJSON()](./kibana-plugin-plugins-data-public.indexpattern.tojson.md) |  |  |
 |  [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 2a6811f501152..42c6dd72b8c4e 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
@@ -7,14 +7,14 @@
 <b>Signature:</b>
 
 ```typescript
-removeScriptedField(field: IFieldType): Promise<void | Error>;
+removeScriptedField(fieldName: string): Promise<void | Error>;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  field | <code>IFieldType</code> |  |
+|  fieldName | <code>string</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
index 7a195702b6f13..10b65bdccdf87 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
@@ -4,20 +4,20 @@
 
 ## IndexPatternField.(constructor)
 
-Constructs a new instance of the `Field` class
+Constructs a new instance of the `IndexPatternField` class
 
 <b>Signature:</b>
 
 ```typescript
-constructor(indexPattern: IIndexPattern, spec: FieldSpecExportFmt | FieldSpec | Field, shortDotsEnable: boolean, { fieldFormats, onNotification }: FieldDependencies);
+constructor(indexPattern: IndexPattern, spec: FieldSpec, displayName: string, onNotification: OnNotification);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  indexPattern | <code>IIndexPattern</code> |  |
-|  spec | <code>FieldSpecExportFmt &#124; FieldSpec &#124; Field</code> |  |
-|  shortDotsEnable | <code>boolean</code> |  |
-|  { fieldFormats, onNotification } | <code>FieldDependencies</code> |  |
+|  indexPattern | <code>IndexPattern</code> |  |
+|  spec | <code>FieldSpec</code> |  |
+|  displayName | <code>string</code> |  |
+|  onNotification | <code>OnNotification</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md
index 267c8f786b5dd..6ef87d08600a3 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-aggregatable?: boolean;
+get aggregatable(): boolean;
 ```
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 ec19a4854bf0e..6d62053726197 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
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-conflictDescriptions?: FieldSpecConflictDescriptions;
+get conflictDescriptions(): Record<string, string[]> | undefined;
+
+set conflictDescriptions(conflictDescriptions: Record<string, string[]> | undefined);
 ```
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 8e848276f21c4..84c0a75fd206d 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
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-count?: number;
+get count(): number;
+
+set count(count: number);
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.displayname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.displayname.md
index ed9630f92fc97..c0ce2fff419bf 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.displayname.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.displayname.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-displayName?: string;
+readonly displayName: string;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.estypes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.estypes.md
index dec74df099d43..ac088cb69a3d6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.estypes.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.estypes.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-esTypes?: string[];
+get esTypes(): string[] | undefined;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.filterable.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.filterable.md
index 4290c4a2f86b3..1149047c0eccd 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.filterable.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.filterable.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-filterable?: boolean;
+get filterable(): boolean;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
index d5df8ed628cb0..f28d5b1bca7e5 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-format: any;
+get format(): FieldFormat;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
index 4acaaa8c0dc2c..3d145cce9d07d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-indexPattern?: IIndexPattern;
+readonly indexPattern: IndexPattern;
 ```
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 f731be8f613cf..0a8446d40e5ec 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
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-lang?: string;
+get lang(): string | undefined;
+
+set lang(lang: string | undefined);
 ```
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 d82999e7a96af..713b29ea3a3d3 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
@@ -7,37 +7,43 @@
 <b>Signature:</b>
 
 ```typescript
-export declare class Field implements IFieldType 
+export declare class IndexPatternField implements IFieldType 
 ```
 
 ## Constructors
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(indexPattern, spec, shortDotsEnable, { fieldFormats, onNotification })](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>Field</code> class |
+|  [(constructor)(indexPattern, spec, displayName, onNotification)](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>IndexPatternField</code> class |
 
 ## Properties
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [$$spec](./kibana-plugin-plugins-data-public.indexpatternfield.__spec.md) |  | <code>FieldSpec</code> |  |
 |  [aggregatable](./kibana-plugin-plugins-data-public.indexpatternfield.aggregatable.md) |  | <code>boolean</code> |  |
-|  [conflictDescriptions](./kibana-plugin-plugins-data-public.indexpatternfield.conflictdescriptions.md) |  | <code>FieldSpecConflictDescriptions</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> |  |
 |  [displayName](./kibana-plugin-plugins-data-public.indexpatternfield.displayname.md) |  | <code>string</code> |  |
-|  [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.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> |  |
-|  [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) |  | <code>any</code> |  |
-|  [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md) |  | <code>IIndexPattern</code> |  |
-|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string</code> |  |
+|  [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) |  | <code>FieldFormat</code> |  |
+|  [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md) |  | <code>IndexPattern</code> |  |
+|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string &#124; undefined</code> |  |
 |  [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</code> |  |
+|  [script](./kibana-plugin-plugins-data-public.indexpatternfield.script.md) |  | <code>string &#124; undefined</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> |  |
-|  [subType](./kibana-plugin-plugins-data-public.indexpatternfield.subtype.md) |  | <code>IFieldSubType</code> |  |
-|  [toSpec](./kibana-plugin-plugins-data-public.indexpatternfield.tospec.md) |  | <code>() =&gt; FieldSpecExportFmt</code> |  |
+|  [spec](./kibana-plugin-plugins-data-public.indexpatternfield.spec.md) |  | <code>FieldSpec</code> |  |
+|  [subType](./kibana-plugin-plugins-data-public.indexpatternfield.subtype.md) |  | <code>import(&quot;../types&quot;).IFieldSubType &#124; undefined</code> |  |
 |  [type](./kibana-plugin-plugins-data-public.indexpatternfield.type.md) |  | <code>string</code> |  |
 |  [visualizable](./kibana-plugin-plugins-data-public.indexpatternfield.visualizable.md) |  | <code>boolean</code> |  |
 
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [toJSON()](./kibana-plugin-plugins-data-public.indexpatternfield.tojson.md) |  |  |
+|  [toSpec()](./kibana-plugin-plugins-data-public.indexpatternfield.tospec.md) |  |  |
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.name.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.name.md
index cb24621e73209..c690edeafea6e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.name.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.name.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-name: string;
+get name(): string;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md
index 4b012c26a8620..22f727e3c00e8 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-readFromDocValues?: boolean;
+get readFromDocValues(): boolean;
 ```
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 132ba25a47637..27f9c797c92f2 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
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-script?: string;
+get script(): string | undefined;
+
+set script(script: string | undefined);
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.scripted.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.scripted.md
index 1dd6bc865a75d..f3810b9698a11 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.scripted.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.scripted.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-scripted?: boolean;
+get scripted(): boolean;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.searchable.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.searchable.md
index 42f984d851435..431907b154dc0 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.searchable.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.searchable.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-searchable?: boolean;
+get searchable(): boolean;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.sortable.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.sortable.md
index 72d225185140b..871320c9586d3 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.sortable.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.sortable.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-sortable?: boolean;
+get sortable(): boolean;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.__spec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.spec.md
similarity index 56%
rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.__spec.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.spec.md
index f52a3324af36f..9884faaa6c7bb 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.__spec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.spec.md
@@ -1,11 +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; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [$$spec](./kibana-plugin-plugins-data-public.indexpatternfield.__spec.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [spec](./kibana-plugin-plugins-data-public.indexpatternfield.spec.md)
 
-## IndexPatternField.$$spec property
+## IndexPatternField.spec property
 
 <b>Signature:</b>
 
 ```typescript
-$$spec: FieldSpec;
+readonly spec: FieldSpec;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.subtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.subtype.md
index 2d807f8a5739c..5c3c4d54ad099 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.subtype.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.subtype.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-subType?: IFieldSubType;
+get subType(): import("../types").IFieldSubType | undefined;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
new file mode 100644
index 0000000000000..a6a3a5a093c8e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
@@ -0,0 +1,41 @@
+<!-- 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; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [toJSON](./kibana-plugin-plugins-data-public.indexpatternfield.tojson.md)
+
+## IndexPatternField.toJSON() method
+
+<b>Signature:</b>
+
+```typescript
+toJSON(): {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+    };
+```
+<b>Returns:</b>
+
+`{
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+    }`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
index 35714faa03bc9..5037cb0049e82 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
@@ -2,10 +2,42 @@
 
 [Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [toSpec](./kibana-plugin-plugins-data-public.indexpatternfield.tospec.md)
 
-## IndexPatternField.toSpec property
+## IndexPatternField.toSpec() method
 
 <b>Signature:</b>
 
 ```typescript
-toSpec: () => FieldSpecExportFmt;
+toSpec(): {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+        format: any;
+    };
 ```
+<b>Returns:</b>
+
+`{
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+        format: any;
+    }`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.type.md
index c8483c9b83c9a..45085b9e74bcc 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.type.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.type.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-type: string;
+get type(): string;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.visualizable.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.visualizable.md
index dd661ae779c11..9ed689752503a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.visualizable.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.visualizable.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-visualizable?: boolean;
+get visualizable(): boolean;
 ```
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 db41936f35cca..c8d45804a3729 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) |  |
+|  [FieldList](./kibana-plugin-plugins-data-public.fieldlist.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) |  |
@@ -103,7 +104,6 @@
 |  [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) |  |
 |  [FilterBar](./kibana-plugin-plugins-data-public.filterbar.md) |  |
-|  [getIndexPatternFieldListCreator](./kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md) |  |
 |  [getKbnTypeNames](./kibana-plugin-plugins-data-public.getkbntypenames.md) | Get the esTypes known by all kbnFieldTypes {<!-- -->Array<string>} |
 |  [indexPatterns](./kibana-plugin-plugins-data-public.indexpatterns.md) |  |
 |  [injectSearchSourceReferences](./kibana-plugin-plugins-data-public.injectsearchsourcereferences.md) |  |
diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/field.test.ts.snap b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
similarity index 100%
rename from src/plugins/data/common/index_patterns/fields/__snapshots__/field.test.ts.snap
rename to src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
diff --git a/src/plugins/data/common/index_patterns/fields/field.ts b/src/plugins/data/common/index_patterns/fields/field.ts
deleted file mode 100644
index 81c7aff8a0faa..0000000000000
--- a/src/plugins/data/common/index_patterns/fields/field.ts
+++ /dev/null
@@ -1,176 +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 { i18n } from '@kbn/i18n';
-// @ts-ignore
-import { ObjDefine } from './obj_define';
-import { IIndexPattern } from '../../types';
-import {
-  IFieldType,
-  getKbnFieldType,
-  IFieldSubType,
-  FieldFormat,
-  shortenDottedString,
-} from '../../../common';
-import {
-  OnNotification,
-  FieldSpec,
-  FieldSpecConflictDescriptions,
-  FieldSpecExportFmt,
-} from '../types';
-import { FieldFormatsStartCommon } from '../../field_formats';
-
-interface FieldDependencies {
-  fieldFormats: FieldFormatsStartCommon;
-  onNotification: OnNotification;
-}
-
-export class Field implements IFieldType {
-  name: string;
-  type: string;
-  script?: string;
-  lang?: string;
-  count?: number;
-  // esTypes might be undefined on old index patterns that have not been refreshed since we added
-  // this prop. It is also undefined on scripted fields.
-  esTypes?: string[];
-  aggregatable?: boolean;
-  filterable?: boolean;
-  searchable?: boolean;
-  sortable?: boolean;
-  visualizable?: boolean;
-  scripted?: boolean;
-  subType?: IFieldSubType;
-  displayName?: string;
-  indexPattern?: IIndexPattern;
-  readFromDocValues?: boolean;
-  format: any;
-  $$spec: FieldSpec;
-  conflictDescriptions?: FieldSpecConflictDescriptions;
-
-  constructor(
-    indexPattern: IIndexPattern,
-    spec: FieldSpecExportFmt | FieldSpec | Field,
-    shortDotsEnable: boolean,
-    { fieldFormats, onNotification }: FieldDependencies
-  ) {
-    // unwrap old instances of Field
-    if (spec instanceof Field) spec = spec.$$spec;
-
-    // construct this object using ObjDefine class, which
-    // extends the Field.prototype but gets it's properties
-    // defined using the logic below
-    const obj = new ObjDefine(spec, Field.prototype);
-
-    if (spec.name === '_source') {
-      spec.type = '_source';
-    }
-
-    // find the type for this field, fallback to unknown type
-    let type = getKbnFieldType(spec.type);
-    if (spec.type && !type) {
-      const title = i18n.translate('data.indexPatterns.unknownFieldHeader', {
-        values: { type: spec.type },
-        defaultMessage: 'Unknown field type {type}',
-      });
-      const text = i18n.translate('data.indexPatterns.unknownFieldErrorMessage', {
-        values: { name: spec.name, title: indexPattern.title },
-        defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
-      });
-      onNotification({ title, text, color: 'danger', iconType: 'alert' });
-    }
-
-    if (!type) type = getKbnFieldType('unknown');
-
-    let format: any = spec.format;
-
-    if (!FieldFormat.isInstanceOfFieldFormat(format)) {
-      format =
-        (indexPattern.fieldFormatMap && indexPattern.fieldFormatMap[spec.name]) ||
-        fieldFormats.getDefaultInstance(spec.type, spec.esTypes);
-    }
-
-    const indexed = !!spec.indexed;
-    const scripted = !!spec.scripted;
-    const searchable = !!spec.searchable || scripted;
-    const aggregatable = !!spec.aggregatable || scripted;
-    const readFromDocValues = !!spec.readFromDocValues && !scripted;
-    const sortable = spec.name === '_score' || ((indexed || aggregatable) && type && type.sortable);
-    const filterable =
-      spec.name === '_id' || scripted || ((indexed || searchable) && type && type.filterable);
-    const visualizable = aggregatable;
-
-    this.name = '';
-    obj.fact('name');
-    this.type = '';
-    obj.fact('type');
-    obj.fact('esTypes');
-    obj.writ('count', spec.count || 0);
-
-    // scripted objs
-    obj.fact('scripted', scripted);
-    obj.writ('script', scripted ? spec.script : null);
-    obj.writ('lang', scripted ? spec.lang || 'painless' : null);
-
-    // stats
-    obj.fact('searchable', searchable);
-    obj.fact('aggregatable', aggregatable);
-    obj.fact('readFromDocValues', readFromDocValues);
-
-    // usage flags, read-only and won't be saved
-    obj.comp('format', format);
-    obj.comp('sortable', sortable);
-    obj.comp('filterable', filterable);
-    obj.comp('visualizable', visualizable);
-
-    // computed values
-    obj.comp('indexPattern', indexPattern);
-    obj.comp('displayName', shortDotsEnable ? shortenDottedString(spec.name) : spec.name);
-    this.$$spec = spec;
-    obj.comp('$$spec', spec);
-
-    // conflict info
-    obj.writ('conflictDescriptions');
-
-    // multi info
-    obj.fact('subType');
-
-    const newObj = obj.create();
-    newObj.toSpec = function () {
-      return {
-        count: this.count,
-        script: this.script,
-        lang: this.lang,
-        conflictDescriptions: this.conflictDescriptions,
-        name: this.name,
-        type: this.type,
-        esTypes: this.esTypes,
-        scripted: this.scripted,
-        searchable: this.searchable,
-        aggregatable: this.aggregatable,
-        readFromDocValues: this.readFromDocValues,
-        subType: this.subType,
-        format: this.indexPattern?.fieldFormatMap[this.name]?.toJSON() || undefined,
-      };
-    };
-    return newObj;
-  }
-  // only providing type info as constructor returns new object instead of `this`
-  toSpec = () => (({} as unknown) as FieldSpecExportFmt);
-}
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 c1ca5341328ce..207002f42bbce 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -18,95 +18,110 @@
  */
 
 import { findIndex } from 'lodash';
-import { IIndexPattern } from '../../types';
-import { IFieldType } from '../../../common';
-import { Field } from './field';
+import { IFieldType, shortenDottedString } from '../../../common';
+import { IndexPatternField } from './index_pattern_field';
 import { OnNotification, FieldSpec } from '../types';
-import { FieldFormatsStartCommon } from '../../field_formats';
+import { IndexPattern } from '../index_patterns';
 
-type FieldMap = Map<Field['name'], Field>;
+type FieldMap = Map<IndexPatternField['name'], IndexPatternField>;
 
-interface FieldListDependencies {
-  fieldFormats: FieldFormatsStartCommon;
-  onNotification: OnNotification;
-}
-
-export interface IIndexPatternFieldList extends Array<Field> {
-  getByName(name: Field['name']): Field | undefined;
-  getByType(type: Field['type']): Field[];
+export interface IIndexPatternFieldList extends Array<IndexPatternField> {
   add(field: FieldSpec): void;
+  getByName(name: IndexPatternField['name']): IndexPatternField | undefined;
+  getByType(type: IndexPatternField['type']): IndexPatternField[];
   remove(field: IFieldType): void;
+  removeAll(): void;
+  replaceAll(specs: FieldSpec[]): void;
   update(field: FieldSpec): void;
 }
 
 export type CreateIndexPatternFieldList = (
-  indexPattern: IIndexPattern,
+  indexPattern: IndexPattern,
   specs?: FieldSpec[],
-  shortDotsEnable?: boolean
+  shortDotsEnable?: boolean,
+  onNotification?: OnNotification
 ) => IIndexPatternFieldList;
 
-export const getIndexPatternFieldListCreator = ({
-  fieldFormats,
-  onNotification,
-}: FieldListDependencies): CreateIndexPatternFieldList => (...fieldListParams) => {
-  class FieldList extends Array<Field> implements IIndexPatternFieldList {
-    private byName: FieldMap = new Map();
-    private groups: Map<Field['type'], FieldMap> = new Map();
-    private indexPattern: IIndexPattern;
-    private shortDotsEnable: boolean;
-    private setByName = (field: Field) => this.byName.set(field.name, field);
-    private setByGroup = (field: Field) => {
-      if (typeof this.groups.get(field.type) === 'undefined') {
-        this.groups.set(field.type, new Map());
-      }
-      this.groups.get(field.type)!.set(field.name, field);
-    };
-    private removeByGroup = (field: IFieldType) => this.groups.get(field.type)!.delete(field.name);
+export class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList {
+  private byName: FieldMap = new Map();
+  private groups: Map<IndexPatternField['type'], FieldMap> = new Map();
+  private indexPattern: IndexPattern;
+  private shortDotsEnable: boolean;
+  private onNotification: OnNotification;
+  private setByName = (field: IndexPatternField) => this.byName.set(field.name, field);
+  private setByGroup = (field: IndexPatternField) => {
+    if (typeof this.groups.get(field.type) === 'undefined') {
+      this.groups.set(field.type, new Map());
+    }
+    this.groups.get(field.type)!.set(field.name, field);
+  };
+  private removeByGroup = (field: IFieldType) => this.groups.get(field.type)!.delete(field.name);
+  private calcDisplayName = (name: string) =>
+    this.shortDotsEnable ? shortenDottedString(name) : name;
+  constructor(
+    indexPattern: IndexPattern,
+    specs: FieldSpec[] = [],
+    shortDotsEnable = false,
+    onNotification = () => {}
+  ) {
+    super();
+    this.indexPattern = indexPattern;
+    this.shortDotsEnable = shortDotsEnable;
+    this.onNotification = onNotification;
 
-    constructor(indexPattern: IIndexPattern, specs: FieldSpec[] = [], shortDotsEnable = false) {
-      super();
-      this.indexPattern = indexPattern;
-      this.shortDotsEnable = shortDotsEnable;
+    specs.map((field) => this.add(field));
+  }
 
-      specs.map((field) => this.add(field));
-    }
+  public readonly getByName = (name: IndexPatternField['name']) => this.byName.get(name);
+  public readonly getByType = (type: IndexPatternField['type']) => [
+    ...(this.groups.get(type) || new Map()).values(),
+  ];
+  public readonly add = (field: FieldSpec) => {
+    const newField = new IndexPatternField(
+      this.indexPattern,
+      field,
+      this.calcDisplayName(field.name),
+      this.onNotification
+    );
+    this.push(newField);
+    this.setByName(newField);
+    this.setByGroup(newField);
+  };
 
-    getByName = (name: Field['name']) => this.byName.get(name);
-    getByType = (type: Field['type']) => [...(this.groups.get(type) || new Map()).values()];
-    add = (field: FieldSpec) => {
-      const newField = new Field(this.indexPattern, field, this.shortDotsEnable, {
-        fieldFormats,
-        onNotification,
-      });
-      this.push(newField);
-      this.setByName(newField);
-      this.setByGroup(newField);
-    };
+  public readonly remove = (field: IFieldType) => {
+    this.removeByGroup(field);
+    this.byName.delete(field.name);
 
-    remove = (field: IFieldType) => {
-      this.removeByGroup(field);
-      this.byName.delete(field.name);
+    const fieldIndex = findIndex(this, { name: field.name });
+    this.splice(fieldIndex, 1);
+  };
 
-      const fieldIndex = findIndex(this, { name: field.name });
-      this.splice(fieldIndex, 1);
-    };
+  public readonly update = (field: FieldSpec) => {
+    const newField = new IndexPatternField(
+      this.indexPattern,
+      field,
+      this.calcDisplayName(field.name),
+      this.onNotification
+    );
+    const index = this.findIndex((f) => f.name === newField.name);
+    this.splice(index, 1, newField);
+    this.setByName(newField);
+    this.removeByGroup(newField);
+    this.setByGroup(newField);
+  };
 
-    update = (field: FieldSpec) => {
-      const newField = new Field(this.indexPattern, field, this.shortDotsEnable, {
-        fieldFormats,
-        onNotification,
-      });
-      const index = this.findIndex((f) => f.name === newField.name);
-      this.splice(index, 1, newField);
-      this.setByName(newField);
-      this.removeByGroup(newField);
-      this.setByGroup(newField);
-    };
+  public readonly removeAll = () => {
+    this.length = 0;
+    this.byName.clear();
+    this.groups.clear();
+  };
 
-    toSpec = () => {
-      return [...this.map((field) => field.toSpec())];
-    };
-  }
+  public readonly replaceAll = (specs: FieldSpec[]) => {
+    this.removeAll();
+    specs.forEach(this.add);
+  };
 
-  return new FieldList(...fieldListParams);
-};
+  public readonly toSpec = () => {
+    return [...this.map((field) => field.toSpec())];
+  };
+}
diff --git a/src/plugins/data/common/index_patterns/fields/index.ts b/src/plugins/data/common/index_patterns/fields/index.ts
index 1b7c87d556f59..0c3b43181c5b4 100644
--- a/src/plugins/data/common/index_patterns/fields/index.ts
+++ b/src/plugins/data/common/index_patterns/fields/index.ts
@@ -20,4 +20,4 @@
 export * from './types';
 export { isFilterable, isNestedField } from './utils';
 export * from './field_list';
-export * from './field';
+export * from './index_pattern_field';
diff --git a/src/plugins/data/common/index_patterns/fields/field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
similarity index 64%
rename from src/plugins/data/common/index_patterns/fields/field.test.ts
rename to src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
index 910f22088f43a..0cd0fe8324809 100644
--- a/src/plugins/data/common/index_patterns/fields/field.test.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Field } from './field';
+import { IndexPatternField } from './index_pattern_field';
 import { IndexPattern } from '../index_patterns';
-import { FieldFormatsStartCommon } from '../..';
-import { KBN_FIELD_TYPES, FieldSpec, FieldSpecExportFmt } from '../../../common';
+import { KBN_FIELD_TYPES } from '../../../common';
+import { FieldSpec } from '../types';
 
 describe('Field', function () {
   function flatten(obj: Record<string, any>) {
@@ -28,14 +28,11 @@ describe('Field', function () {
   }
 
   function getField(values = {}) {
-    return new Field(
+    return new IndexPatternField(
       fieldValues.indexPattern as IndexPattern,
       { ...fieldValues, ...values },
-      false,
-      {
-        fieldFormats: {} as FieldFormatsStartCommon,
-        onNotification: () => {},
-      }
+      'displayName',
+      () => {}
     );
   }
 
@@ -50,6 +47,7 @@ describe('Field', function () {
     filterable: true,
     searchable: true,
     sortable: true,
+    indexed: true,
     readFromDocValues: false,
     visualizable: true,
     scripted: true,
@@ -58,11 +56,9 @@ describe('Field', function () {
     indexPattern: ({
       fieldFormatMap: { name: {}, _source: {}, _score: {}, _id: {} },
     } as unknown) as IndexPattern,
-    format: { name: 'formatName' },
     $$spec: ({} as unknown) as FieldSpec,
     conflictDescriptions: { a: ['b', 'c'], d: ['e'] },
-    toSpec: () => (({} as unknown) as FieldSpecExportFmt),
-  } as Field;
+  };
 
   it('the correct properties are writable', () => {
     const field = getField();
@@ -84,72 +80,6 @@ describe('Field', function () {
     expect(field.conflictDescriptions).toEqual({});
   });
 
-  it('the correct properties are not writable', () => {
-    const field = getField();
-
-    expect(field.name).toEqual(fieldValues.name);
-    field.name = 'newName';
-    expect(field.name).toEqual(fieldValues.name);
-
-    expect(field.type).toEqual(fieldValues.type);
-    field.type = 'newType';
-    expect(field.type).toEqual(fieldValues.type);
-
-    expect(field.esTypes).toEqual(fieldValues.esTypes);
-    field.esTypes = ['newType'];
-    expect(field.esTypes).toEqual(fieldValues.esTypes);
-
-    expect(field.scripted).toEqual(fieldValues.scripted);
-    field.scripted = false;
-    expect(field.scripted).toEqual(fieldValues.scripted);
-
-    expect(field.searchable).toEqual(fieldValues.searchable);
-    field.searchable = false;
-    expect(field.searchable).toEqual(fieldValues.searchable);
-
-    expect(field.aggregatable).toEqual(fieldValues.aggregatable);
-    field.aggregatable = false;
-    expect(field.aggregatable).toEqual(fieldValues.aggregatable);
-
-    expect(field.readFromDocValues).toEqual(fieldValues.readFromDocValues);
-    field.readFromDocValues = true;
-    expect(field.readFromDocValues).toEqual(fieldValues.readFromDocValues);
-
-    expect(field.subType).toEqual(fieldValues.subType);
-    field.subType = {};
-    expect(field.subType).toEqual(fieldValues.subType);
-
-    // not writable, not serialized
-    expect(() => {
-      field.indexPattern = {} as IndexPattern;
-    }).toThrow();
-
-    // computed fields
-    expect(() => {
-      field.format = { name: 'newFormatName' };
-    }).toThrow();
-
-    expect(() => {
-      field.sortable = false;
-    }).toThrow();
-
-    expect(() => {
-      field.filterable = false;
-    }).toThrow();
-
-    expect(() => {
-      field.visualizable = false;
-    }).toThrow();
-
-    expect(() => {
-      field.displayName = 'newDisplayName';
-    }).toThrow();
-
-    expect(() => {
-      field.$$spec = ({ a: 'b' } as unknown) as FieldSpec;
-    }).toThrow();
-  });
-
   it('sets type field when _source field', () => {
     const field = getField({ name: '_source' });
     expect(field.type).toEqual('_source');
@@ -214,26 +144,25 @@ describe('Field', function () {
   });
 
   it('exports the property to JSON', () => {
-    const field = new Field({ fieldFormatMap: { name: {} } } as IndexPattern, fieldValues, false, {
-      fieldFormats: {} as FieldFormatsStartCommon,
-      onNotification: () => {},
-    });
+    const field = new IndexPatternField(
+      { fieldFormatMap: { name: {} } } as IndexPattern,
+      fieldValues,
+      'displayName',
+      () => {}
+    );
     expect(flatten(field)).toMatchSnapshot();
   });
 
   it('spec snapshot', () => {
-    const field = new Field(
+    const field = new IndexPatternField(
       {
         fieldFormatMap: {
           name: { toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }) },
         },
       } as IndexPattern,
       fieldValues,
-      false,
-      {
-        fieldFormats: {} as FieldFormatsStartCommon,
-        onNotification: () => {},
-      }
+      'displayName',
+      () => {}
     );
     expect(field.toSpec()).toMatchSnapshot();
   });
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
new file mode 100644
index 0000000000000..4e22332bef141
--- /dev/null
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
@@ -0,0 +1,188 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import {
+  IFieldType,
+  KbnFieldType,
+  getKbnFieldType,
+  KBN_FIELD_TYPES,
+  FieldFormat,
+} from '../../../common';
+import { OnNotification, FieldSpec } from '../types';
+
+import { IndexPattern } from '../index_patterns';
+
+export class IndexPatternField implements IFieldType {
+  readonly spec: FieldSpec;
+  // not writable or serialized
+  readonly indexPattern: IndexPattern;
+  readonly displayName: string;
+  private readonly kbnFieldType: KbnFieldType;
+
+  constructor(
+    indexPattern: IndexPattern,
+    spec: FieldSpec,
+    displayName: string,
+    onNotification: OnNotification
+  ) {
+    this.indexPattern = indexPattern;
+    this.spec = { ...spec, type: spec.name === '_source' ? '_source' : spec.type };
+    this.displayName = displayName;
+
+    this.kbnFieldType = getKbnFieldType(spec.type);
+    if (spec.type && this.kbnFieldType?.name === KBN_FIELD_TYPES.UNKNOWN) {
+      const title = i18n.translate('data.indexPatterns.unknownFieldHeader', {
+        values: { type: spec.type },
+        defaultMessage: 'Unknown field type {type}',
+      });
+      const text = i18n.translate('data.indexPatterns.unknownFieldErrorMessage', {
+        values: { name: spec.name, title: indexPattern.title },
+        defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
+      });
+      onNotification({ title, text, color: 'danger', iconType: 'alert' });
+    }
+  }
+
+  // writable attrs
+  public get count() {
+    return this.spec.count;
+  }
+
+  public set count(count) {
+    this.spec.count = count;
+  }
+
+  public get script() {
+    return this.spec.script;
+  }
+
+  public set script(script) {
+    this.spec.script = script;
+  }
+
+  public get lang() {
+    return this.spec.lang;
+  }
+
+  public set lang(lang) {
+    this.spec.lang = lang;
+  }
+
+  public get conflictDescriptions() {
+    return this.spec.conflictDescriptions;
+  }
+
+  public set conflictDescriptions(conflictDescriptions) {
+    this.spec.conflictDescriptions = conflictDescriptions;
+  }
+
+  // read only attrs
+  public get name() {
+    return this.spec.name;
+  }
+
+  public get type() {
+    return this.spec.type;
+  }
+
+  public get esTypes() {
+    return this.spec.esTypes;
+  }
+
+  public get scripted() {
+    return this.spec.scripted;
+  }
+
+  public get searchable() {
+    return !!(this.spec.searchable || this.scripted);
+  }
+
+  public get aggregatable() {
+    return !!(this.spec.aggregatable || this.scripted);
+  }
+
+  public get readFromDocValues() {
+    return !!(this.spec.readFromDocValues && !this.scripted);
+  }
+
+  public get subType() {
+    return this.spec.subType;
+  }
+
+  // not writable, not serialized
+  public get sortable() {
+    return (
+      this.name === '_score' ||
+      ((this.spec.indexed || this.aggregatable) && this.kbnFieldType.sortable)
+    );
+  }
+
+  public get filterable() {
+    return (
+      this.name === '_id' ||
+      this.scripted ||
+      ((this.spec.indexed || this.searchable) && this.kbnFieldType.filterable)
+    );
+  }
+
+  public get visualizable() {
+    return this.aggregatable;
+  }
+
+  public get format(): FieldFormat {
+    return this.indexPattern.getFormatterForField(this);
+  }
+
+  public toJSON() {
+    return {
+      count: this.count,
+      script: this.script,
+      lang: this.lang,
+      conflictDescriptions: this.conflictDescriptions,
+
+      name: this.name,
+      type: this.type,
+      esTypes: this.esTypes,
+      scripted: this.scripted,
+      searchable: this.searchable,
+      aggregatable: this.aggregatable,
+      readFromDocValues: this.readFromDocValues,
+      subType: this.subType,
+    };
+  }
+
+  public toSpec() {
+    return {
+      count: this.count,
+      script: this.script,
+      lang: this.lang,
+      conflictDescriptions: this.conflictDescriptions,
+      name: this.name,
+      type: this.type,
+      esTypes: this.esTypes,
+      scripted: this.scripted,
+      searchable: this.searchable,
+      aggregatable: this.aggregatable,
+      readFromDocValues: this.readFromDocValues,
+      subType: this.subType,
+      format: this.indexPattern?.fieldFormatMap[this.name]?.toJSON() || undefined,
+    };
+  }
+}
diff --git a/src/plugins/data/common/index_patterns/fields/obj_define.js b/src/plugins/data/common/index_patterns/fields/obj_define.js
deleted file mode 100644
index 9c9e5c8f3d55f..0000000000000
--- a/src/plugins/data/common/index_patterns/fields/obj_define.js
+++ /dev/null
@@ -1,158 +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 _ from 'lodash';
-
-export function ObjDefine(defaults, prototype) {
-  this.obj; // created by this.create()
-
-  this.descs = {};
-  this.defaults = defaults || {};
-  this.prototype = prototype || Object.prototype;
-}
-
-ObjDefine.REDEFINE_SUPPORTED = (function () {
-  const a = Object.create(Object.prototype, {
-    prop: {
-      configurable: true,
-      value: 1,
-    },
-  });
-
-  Object.defineProperty(a, 'prop', {
-    configurable: true,
-    value: 2,
-  });
-
-  return a.prop === 2;
-})();
-
-/**
- * normal value, writable and exported in JSON
- *
- * @param  {any} v - value
- * @return {object} - property descriptor
- */
-ObjDefine.prototype.writ = function (name, val) {
-  this._define(name, val, true, true);
-};
-
-/**
- * known value, exported in JSON, not changeable
- *
- * @param  {any} v - value
- * @return {object} - property descriptor
- */
-ObjDefine.prototype.fact = function (name, val) {
-  this._define(name, val, true);
-};
-
-/**
- * computed fact, not exported or changeable
- *
- * @param  {any} v - value
- * @return {object} - property descriptor
- */
-ObjDefine.prototype.comp = function (name, val) {
-  this._define(name, val);
-};
-
-/**
- * Creates an object, decorated by the property descriptors
- * created by other ObjDefine methods and inheriting form the
- * prototype
- *
- * # note:
- * If a value is writable, but the value is undefined, the property will
- * be created by not exported to JSON unless the property is written to
- *
- * @return {object} - created object
- */
-ObjDefine.prototype.create = function () {
-  const self = this;
-  self.obj = Object.create(this.prototype, self.descs);
-
-  if (!ObjDefine.REDEFINE_SUPPORTED && !self.prototype.toJSON) {
-    // since we can't redefine properties as enumerable we will
-    // clone the object on serialization and choose which properties
-    // to include or trim manually. This is currently only in use in PhantomJS
-    // due to https://github.com/ariya/phantomjs/issues/11856
-    // TODO: remove this: https://github.com/elastic/kibana/issues/27136
-    self.obj.toJSON = function () {
-      return _.transform(
-        self.obj,
-        function (json, val, key) {
-          const desc = self.descs[key];
-          if (desc && desc.enumerable && val == null) return;
-          json[key] = val;
-        },
-        {}
-      );
-    };
-  }
-
-  return self.obj;
-};
-
-/**
- * Private APIS
- */
-
-ObjDefine.prototype._define = function (name, val, exported, changeable) {
-  val = val != null ? val : this.defaults[name];
-  this.descs[name] = this._describe(name, val, !!exported, !!changeable);
-};
-
-ObjDefine.prototype._describe = function (name, val, exported, changeable) {
-  const self = this;
-  const exists = val != null;
-
-  if (exported && ObjDefine.REDEFINE_SUPPORTED) {
-    return {
-      enumerable: exists,
-      configurable: true,
-      get: _.constant(val),
-      set: function (update) {
-        if (!changeable) return false;
-
-        // change the descriptor, since the value now exists.
-        self.descs[name] = self._describe(name, update, exported, changeable);
-
-        // apply the updated descriptor
-        Object.defineProperty(self.obj, name, self.descs[name]);
-      },
-    };
-  }
-
-  if (exported && !ObjDefine.REDEFINE_SUPPORTED) {
-    return {
-      enumerable: true,
-      configurable: true,
-      writable: changeable,
-      value: val,
-    };
-  }
-
-  return {
-    enumerable: false,
-    writable: changeable,
-    configurable: true,
-    value: val,
-  };
-};
diff --git a/src/plugins/data/common/index_patterns/fields/obj_define.test.js b/src/plugins/data/common/index_patterns/fields/obj_define.test.js
deleted file mode 100644
index ec9a022253621..0000000000000
--- a/src/plugins/data/common/index_patterns/fields/obj_define.test.js
+++ /dev/null
@@ -1,149 +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 expect from '@kbn/expect';
-import { ObjDefine } from './obj_define';
-
-describe('ObjDefine Utility', function () {
-  function flatten(obj) {
-    return JSON.parse(JSON.stringify(obj));
-  }
-
-  describe('#writ', function () {
-    it('creates writeable properties', function () {
-      const def = new ObjDefine();
-      def.writ('name', 'foo');
-
-      const obj = def.create();
-      expect(obj).to.have.property('name', 'foo');
-
-      obj.name = 'bar';
-      expect(obj).to.have.property('name', 'bar');
-    });
-
-    it('exports the property to JSON', function () {
-      const def = new ObjDefine();
-      def.writ('name', 'foo');
-      expect(flatten(def.create())).to.have.property('name', 'foo');
-    });
-
-    it("does not export property to JSON it it's undefined or null", function () {
-      const def = new ObjDefine();
-      def.writ('name');
-      expect(flatten(def.create())).to.not.have.property('name');
-
-      def.writ('name', null);
-      expect(flatten(def.create())).to.not.have.property('name');
-    });
-
-    it('switched to exporting if a value is written', function () {
-      const def = new ObjDefine();
-      def.writ('name');
-
-      const obj = def.create();
-      expect(flatten(obj)).to.not.have.property('name');
-
-      obj.name = null;
-      expect(flatten(obj)).to.not.have.property('name');
-
-      obj.name = 'foo';
-      expect(flatten(obj)).to.have.property('name', 'foo');
-    });
-
-    it('setting a writ value to null prevents it from exporting', function () {
-      const def = new ObjDefine();
-      def.writ('name', 'foo');
-
-      const obj = def.create();
-      expect(flatten(obj)).to.have.property('name', 'foo');
-
-      obj.name = null;
-      expect(flatten(obj)).to.not.have.property('name');
-    });
-  });
-
-  describe('#fact', function () {
-    it('creates an immutable field', function () {
-      const def = new ObjDefine();
-      const val = 'foo';
-      const notval = 'bar';
-      def.fact('name', val);
-      const obj = def.create();
-
-      obj.name = notval; // UPDATE SHOULD BE IGNORED
-      expect(obj).to.have.property('name', val);
-    });
-
-    it('exports the fact to JSON', function () {
-      const def = new ObjDefine();
-      def.fact('name', 'foo');
-      expect(flatten(def.create())).to.have.property('name', 'foo');
-    });
-  });
-
-  describe('#comp', function () {
-    it('creates an immutable field', function () {
-      const def = new ObjDefine();
-      const val = 'foo';
-      const notval = 'bar';
-      def.comp('name', val);
-      const obj = def.create();
-
-      expect(function () {
-        'use strict'; // eslint-disable-line strict
-
-        obj.name = notval;
-      }).to.throwException();
-    });
-
-    it('does not export the computed value to JSON', function () {
-      const def = new ObjDefine();
-      def.comp('name', 'foo');
-      expect(flatten(def.create())).to.not.have.property('name');
-    });
-  });
-
-  describe('#create', function () {
-    it('creates object that inherits from the prototype', function () {
-      function SomeClass() {}
-
-      const def = new ObjDefine(null, SomeClass.prototype);
-      const obj = def.create();
-
-      expect(obj).to.be.a(SomeClass);
-    });
-
-    it('uses the defaults for property values', function () {
-      const def = new ObjDefine({ name: 'bar' });
-      def.fact('name');
-
-      const obj = def.create();
-
-      expect(obj).to.have.property('name', 'bar');
-    });
-
-    it('ignores default values that are not defined properties', function () {
-      const def = new ObjDefine({ name: 'foo', name2: 'bar' });
-      const obj = def.create();
-
-      expect(obj).to.not.have.property('name');
-      expect(obj).to.not.have.property('name2');
-    });
-  });
-});
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 ebf873b14c379..e4f297b29c372 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
@@ -26,7 +26,7 @@ import { DuplicateField } from '../../../../kibana_utils/common';
 import mockLogStashFields from '../../../../../fixtures/logstash_fields';
 // @ts-ignore
 import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_saved_object_index_pattern';
-import { Field } from '../fields';
+import { IndexPatternField } from '../fields';
 
 import { fieldFormatsMock } from '../../field_formats/mocks';
 
@@ -170,8 +170,8 @@ describe('IndexPattern', () => {
   describe('getScriptedFields', () => {
     test('should return all scripted fields', () => {
       const scriptedNames = mockLogStashFields()
-        .filter((item: Field) => item.scripted === true)
-        .map((item: Field) => item.name);
+        .filter((item: IndexPatternField) => item.scripted === true)
+        .map((item: IndexPatternField) => item.name);
       const respNames = map(indexPattern.getScriptedFields(), 'name');
 
       expect(respNames).toEqual(scriptedNames);
@@ -214,8 +214,8 @@ describe('IndexPattern', () => {
   describe('getNonScriptedFields', () => {
     test('should return all non-scripted fields', () => {
       const notScriptedNames = mockLogStashFields()
-        .filter((item: Field) => item.scripted === false)
-        .map((item: Field) => item.name);
+        .filter((item: IndexPatternField) => item.scripted === false)
+        .map((item: IndexPatternField) => item.name);
       const respNames = map(indexPattern.getNonScriptedFields(), 'name');
 
       expect(respNames).toEqual(notScriptedNames);
@@ -235,7 +235,7 @@ describe('IndexPattern', () => {
       const newFields = indexPattern.getNonScriptedFields();
 
       expect(newFields).toHaveLength(2);
-      expect(newFields.map((f) => f.name)).toEqual(['foo', 'bar']);
+      expect([...newFields.map((f) => f.name)]).toEqual(['foo', 'bar']);
     });
 
     test('should preserve the scripted fields', async () => {
@@ -249,8 +249,8 @@ describe('IndexPattern', () => {
       // sinon.assert.calledOnce(indexPattern.getScriptedFields);
       expect(indexPattern.getScriptedFields().map((f) => f.name)).toEqual(
         mockLogStashFields()
-          .filter((f: Field) => f.scripted)
-          .map((f: Field) => f.name)
+          .filter((f: IndexPatternField) => f.scripted)
+          .map((f: IndexPatternField) => f.name)
       );
     });
   });
@@ -278,7 +278,7 @@ describe('IndexPattern', () => {
       const scriptedFields = indexPattern.getScriptedFields();
       // expect(saveSpy.callCount).to.equal(1);
       expect(scriptedFields).toHaveLength(oldCount + 1);
-      expect((indexPattern.fields.getByName(scriptedField.name) as Field).name).toEqual(
+      expect((indexPattern.fields.getByName(scriptedField.name) as IndexPatternField).name).toEqual(
         scriptedField.name
       );
     });
@@ -287,9 +287,9 @@ describe('IndexPattern', () => {
       // const saveSpy = sinon.spy(indexPattern, 'save');
       const scriptedFields = indexPattern.getScriptedFields();
       const oldCount = scriptedFields.length;
-      const scriptedField = last(scriptedFields) as any;
+      const scriptedField = last(scriptedFields)!;
 
-      await indexPattern.removeScriptedField(scriptedField);
+      await indexPattern.removeScriptedField(scriptedField.name);
 
       // expect(saveSpy.callCount).to.equal(1);
       expect(indexPattern.getScriptedFields().length).toEqual(oldCount - 1);
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 2acb9d5f767ad..211919e8e6b53 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
@@ -22,10 +22,10 @@ import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
 import { DuplicateField, SavedObjectNotFound } from '../../../../kibana_utils/common';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern, IFieldType } from '../../../common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern } from '../../../common';
 import { findByTitle } from '../utils';
 import { IndexPatternMissingIndices } from '../lib';
-import { Field, IIndexPatternFieldList, getIndexPatternFieldListCreator } from '../fields';
+import { IndexPatternField, IIndexPatternFieldList, FieldList } from '../fields';
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
@@ -36,7 +36,7 @@ import {
   IIndexPatternsApiClient,
   IndexPatternAttributes,
 } from '../types';
-import { FieldFormatsStartCommon } from '../../field_formats';
+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';
@@ -138,12 +138,8 @@ export class IndexPattern implements IIndexPattern {
     this.shortDotsEnable = uiSettingsValues.shortDotsEnable;
     this.metaFields = uiSettingsValues.metaFields;
 
-    this.createFieldList = getIndexPatternFieldListCreator({
-      fieldFormats,
-      onNotification,
-    });
+    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onUnknownType);
 
-    this.fields = this.createFieldList(this, [], this.shortDotsEnable);
     this.apiClient = apiClient;
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, uiSettingsValues.metaFields);
     this.flattenHit = flattenHitWrapper(this, uiSettingsValues.metaFields);
@@ -161,49 +157,45 @@ export class IndexPattern implements IIndexPattern {
   }
 
   private deserializeFieldFormatMap(mapping: any) {
-    const FieldFormat = this.fieldFormats.getType(mapping.id);
+    const FieldFormatter = this.fieldFormats.getType(mapping.id);
 
     return (
-      FieldFormat &&
-      new FieldFormat(
+      FieldFormatter &&
+      new FieldFormatter(
         mapping.params,
         (key: string) => this.uiSettingsValues[key]?.userValue || this.uiSettingsValues[key]?.value
       )
     );
   }
 
-  private initFields(input?: any) {
-    const newValue = input || this.fields;
-
-    this.fields = this.createFieldList(this, newValue, this.shortDotsEnable);
-  }
-
-  private isFieldRefreshRequired(): boolean {
-    if (!this.fields) {
+  private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
+    if (!specs) {
       return true;
     }
 
-    return this.fields.every((field) => {
+    return specs.every((spec) => {
       // See https://github.com/elastic/kibana/pull/8421
-      const hasFieldCaps = 'aggregatable' in field && 'searchable' in field;
+      const hasFieldCaps = 'aggregatable' in spec && 'searchable' in spec;
 
       // See https://github.com/elastic/kibana/pull/11969
-      const hasDocValuesFlag = 'readFromDocValues' in field;
+      const hasDocValuesFlag = 'readFromDocValues' in spec;
 
       return !hasFieldCaps || !hasDocValuesFlag;
     });
   }
 
-  private async indexFields(forceFieldRefresh: boolean = false) {
+  private async indexFields(forceFieldRefresh: boolean = false, specs?: FieldSpec[]) {
     if (!this.id) {
       return;
     }
 
-    if (forceFieldRefresh || this.isFieldRefreshRequired()) {
+    if (forceFieldRefresh || this.isFieldRefreshRequired(specs)) {
       await this.refreshFields();
+    } else {
+      if (specs) {
+        this.fields.replaceAll(specs);
+      }
     }
-
-    this.initFields();
   }
 
   public initFromSpec(spec: IndexPatternSpec) {
@@ -223,15 +215,13 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    // ignoring this because the same thing happens elsewhere but via _.assign
-    // @ts-expect-error
-    this.fields = spec.fields || [];
+    this.fields.replaceAll(spec.fields || []);
     this.typeMeta = spec.typeMeta;
+
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
       return this.deserializeFieldFormatMap(mapping);
     });
 
-    this.initFields();
     return this;
   }
 
@@ -249,14 +239,16 @@ export class IndexPattern implements IIndexPattern {
     });
 
     // give index pattern all of the values
+    const fieldList = this.fields;
     _.assign(this, response);
+    this.fields = fieldList;
 
     if (!this.title && this.id) {
       this.title = this.id;
     }
     this.version = response.version;
 
-    return this.indexFields(forceFieldRefresh);
+    return this.indexFields(forceFieldRefresh, response.fields);
   }
 
   getComputedFields() {
@@ -359,32 +351,26 @@ export class IndexPattern implements IIndexPattern {
       throw new DuplicateField(name);
     }
 
-    this.fields.add(
-      new Field(
-        this,
-        {
-          name,
-          script,
-          fieldType,
-          scripted: true,
-          lang,
-          aggregatable: true,
-          filterable: true,
-          searchable: true,
-        },
-        false,
-        {
-          fieldFormats: this.fieldFormats,
-          onNotification: this.onNotification,
-        }
-      )
-    );
+    this.fields.add({
+      name,
+      script,
+      type: fieldType,
+      scripted: true,
+      lang,
+      aggregatable: true,
+      searchable: true,
+      count: 0,
+      readFromDocValues: false,
+    });
 
     await this.save();
   }
 
-  removeScriptedField(field: IFieldType) {
-    this.fields.remove(field);
+  removeScriptedField(fieldName: string) {
+    const field = this.fields.getByName(fieldName);
+    if (field) {
+      this.fields.remove(field);
+    }
     return this.save();
   }
 
@@ -417,11 +403,11 @@ export class IndexPattern implements IIndexPattern {
   }
 
   getNonScriptedFields() {
-    return _.filter(this.fields, { scripted: false });
+    return [...this.fields.filter((field) => !field.scripted)];
   }
 
   getScriptedFields() {
-    return _.filter(this.fields, { scripted: true });
+    return [...this.fields.filter((field) => field.scripted)];
   }
 
   isTimeBased(): boolean {
@@ -438,12 +424,12 @@ export class IndexPattern implements IIndexPattern {
   }
 
   getTimeField() {
-    if (!this.timeFieldName || !this.fields || !this.fields.getByName) return;
-    return this.fields.getByName(this.timeFieldName);
+    if (!this.timeFieldName || !this.fields || !this.fields.getByName) return undefined;
+    return this.fields.getByName(this.timeFieldName) || undefined;
   }
 
-  getFieldByName(name: string): Field | void {
-    if (!this.fields || !this.fields.getByName) return;
+  getFieldByName(name: string): IndexPatternField | undefined {
+    if (!this.fields || !this.fields.getByName) return undefined;
     return this.fields.getByName(name);
   }
 
@@ -470,6 +456,16 @@ export class IndexPattern implements IIndexPattern {
     return body;
   }
 
+  getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat {
+    return (
+      this.fieldFormatMap[field.name] ||
+      this.fieldFormats.getDefaultInstance(
+        field.type as KBN_FIELD_TYPES,
+        field.esTypes as ES_FIELD_TYPES[]
+      )
+    );
+  }
+
   async create(allowOverride: boolean = false) {
     const _create = async (duplicateId?: string) => {
       if (duplicateId) {
@@ -581,9 +577,8 @@ export class IndexPattern implements IIndexPattern {
 
   async _fetchFields() {
     const fields = await this.fieldsFetcher.fetch(this);
-    const scripted = this.getScriptedFields();
-    const all = fields.concat(scripted);
-    await this.initFields(all);
+    const scripted = this.getScriptedFields().map((field) => field.spec);
+    this.fields.replaceAll([...fields, ...scripted]);
   }
 
   refreshFields() {
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 a07ffaf92aea5..8874ce5f04b7c 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
@@ -25,14 +25,13 @@ import {
   createEnsureDefaultIndexPattern,
   EnsureDefaultIndexPattern,
 } from './ensure_default_index_pattern';
-import { getIndexPatternFieldListCreator, CreateIndexPatternFieldList, Field } from '../fields';
+import { IndexPatternField } from '../fields';
 import {
   OnNotification,
   OnError,
   UiSettingsCommon,
   IIndexPatternsApiClient,
   GetFieldsOptions,
-  FieldSpec,
   IndexPatternSpec,
 } from '../types';
 import { FieldFormatsStartCommon } from '../../field_formats';
@@ -65,12 +64,6 @@ export class IndexPatternsService {
   private onNotification: OnNotification;
   private onError: OnError;
   ensureDefaultIndexPattern: EnsureDefaultIndexPattern;
-  createFieldList: CreateIndexPatternFieldList;
-  createField: (
-    indexPattern: IndexPattern,
-    spec: FieldSpec | Field,
-    shortDotsEnable: boolean
-  ) => Field;
 
   constructor({
     uiSettings,
@@ -91,16 +84,15 @@ export class IndexPatternsService {
       uiSettings,
       onRedirectNoIndexPattern
     );
-    this.createFieldList = getIndexPatternFieldListCreator({
-      fieldFormats,
-      onNotification,
-    });
-    this.createField = (indexPattern, spec, shortDotsEnable) => {
-      return new Field(indexPattern, spec, shortDotsEnable, {
-        fieldFormats,
-        onNotification,
-      });
-    };
+  }
+
+  public createField(
+    indexPattern: IndexPattern,
+    spec: IndexPatternField['spec'],
+    displayName: string,
+    onNotification: OnNotification
+  ) {
+    return new IndexPatternField(indexPattern, spec, displayName, onNotification);
   }
 
   private async refreshSavedObjectsCache() {
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 4241df5718243..3a7cf54843dfc 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -149,8 +149,21 @@ export interface FieldSpecExportFmt {
 }
 
 export interface FieldSpec {
-  [key: string]: any;
+  count: number;
+  script?: string;
+  lang?: string;
+  conflictDescriptions?: Record<string, string[]>;
   format?: SerializedFieldFormat;
+
+  name: string;
+  type: string;
+  esTypes?: string[];
+  scripted: boolean;
+  searchable: boolean;
+  aggregatable: boolean;
+  readFromDocValues?: boolean;
+  subType?: IFieldSubType;
+  indexed?: boolean;
 }
 
 export interface IndexPatternSpec {
diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
index a3fe19fa9b2fc..6a2d6edd04692 100644
--- a/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
+++ b/src/plugins/data/common/kbn_field_types/kbn_field_types.test.ts
@@ -55,10 +55,10 @@ describe('utils/kbn_field_types', () => {
       expect(kbnFieldType).toHaveProperty('name', ES_FIELD_TYPES.STRING);
     });
 
-    test('returns undefined for invalid name', () => {
+    test('returns unknown for invalid name', () => {
       const kbnFieldType = getKbnFieldType('wrongType');
 
-      expect(kbnFieldType).toBeUndefined();
+      expect(kbnFieldType).toHaveProperty('name', KBN_FIELD_TYPES.UNKNOWN);
     });
   });
 
diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types.ts
index ce05dc796bbab..ffeb9c517daf5 100644
--- a/src/plugins/data/common/kbn_field_types/kbn_field_types.ts
+++ b/src/plugins/data/common/kbn_field_types/kbn_field_types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { createKbnFieldTypes } from './kbn_field_types_factory';
+import { createKbnFieldTypes, kbnFieldTypeUnknown } from './kbn_field_types_factory';
 import { KbnFieldType } from './kbn_field_type';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from './types';
 
@@ -30,8 +30,8 @@ const registeredKbnTypes = createKbnFieldTypes();
  *  @param  {string} typeName
  *  @return {KbnFieldType}
  */
-export const getKbnFieldType = (typeName: string): KbnFieldType | undefined =>
-  registeredKbnTypes.find((t) => t.name === typeName);
+export const getKbnFieldType = (typeName: string): KbnFieldType =>
+  registeredKbnTypes.find((t) => t.name === typeName) || kbnFieldTypeUnknown;
 
 /**
  *  Get the esTypes known by all kbnFieldTypes
diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
index cb9357eb9865e..b93ebcbbca9c8 100644
--- a/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
+++ b/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
@@ -20,6 +20,10 @@
 import { KbnFieldType } from './kbn_field_type';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from './types';
 
+export const kbnFieldTypeUnknown = new KbnFieldType({
+  name: KBN_FIELD_TYPES.UNKNOWN,
+});
+
 export const createKbnFieldTypes = (): KbnFieldType[] => [
   new KbnFieldType({
     name: KBN_FIELD_TYPES.STRING,
@@ -103,7 +107,5 @@ export const createKbnFieldTypes = (): KbnFieldType[] => [
   new KbnFieldType({
     name: KBN_FIELD_TYPES.CONFLICT,
   }),
-  new KbnFieldType({
-    name: KBN_FIELD_TYPES.UNKNOWN,
-  }),
+  kbnFieldTypeUnknown,
 ];
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index e95150e8f6f73..5a9930d2b6b56 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -249,9 +249,7 @@ export {
   IndexPatternsContract,
   IndexPattern,
   IIndexPatternFieldList,
-  Field as IndexPatternField,
-  // TODO: exported only in stub_index_pattern test. Move into data plugin and remove export.
-  getIndexPatternFieldListCreator,
+  IndexPatternField,
 } from './index_patterns';
 
 export {
@@ -264,6 +262,7 @@ export {
   UI_SETTINGS,
   TypeMeta as IndexPatternTypeMeta,
   AggregationRestrictions as IndexPatternAggRestrictions,
+  FieldList,
 } from '../common';
 
 /*
diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index a6ee71c624f5a..9cd5e5a4736f1 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -28,11 +28,7 @@ export {
 } from '../../common/index_patterns/lib';
 export { flattenHitWrapper, formatHitProvider, onRedirectNoIndexPattern } from './index_patterns';
 
-export {
-  getIndexPatternFieldListCreator,
-  Field,
-  IIndexPatternFieldList,
-} from '../../common/index_patterns';
+export { IndexPatternField, IIndexPatternFieldList } from '../../common/index_patterns';
 
 export {
   IndexPatternsService,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 2cfdab80123ed..76f88df4dd6fc 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -576,6 +576,44 @@ export type FieldFormatsContentType = 'html' | 'text';
 // @public (undocumented)
 export type FieldFormatsGetConfigFn = <T = any>(key: string, defaultOverride?: T) => T;
 
+// Warning: (ae-missing-release-tag) "FieldList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList {
+    // Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts
+    constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
+    // (undocumented)
+    readonly add: (field: FieldSpec) => void;
+    // (undocumented)
+    readonly getByName: (name: IndexPatternField['name']) => IndexPatternField | undefined;
+    // (undocumented)
+    readonly getByType: (type: IndexPatternField['type']) => any[];
+    // (undocumented)
+    readonly remove: (field: IFieldType) => void;
+    // (undocumented)
+    readonly removeAll: () => void;
+    // (undocumented)
+    readonly replaceAll: (specs: FieldSpec[]) => void;
+    // (undocumented)
+    readonly toSpec: () => {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+        format: any;
+    }[];
+    // (undocumented)
+    readonly update: (field: FieldSpec) => void;
+}
+
 // @public (undocumented)
 export interface FieldMappingSpec {
     // (undocumented)
@@ -658,13 +696,6 @@ export function getDefaultQuery(language?: QueryLanguage): {
 // @public (undocumented)
 export function getEsPreference(uiSettings: IUiSettingsClient_2, sessionId?: string): any;
 
-// Warning: (ae-forgotten-export) The symbol "FieldListDependencies" needs to be exported by the entry point index.d.ts
-// Warning: (ae-forgotten-export) The symbol "CreateIndexPatternFieldList" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "getIndexPatternFieldListCreator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const getIndexPatternFieldListCreator: ({ fieldFormats, onNotification, }: FieldListDependencies) => CreateIndexPatternFieldList;
-
 // Warning: (ae-missing-release-tag) "getKbnTypeNames" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -808,8 +839,6 @@ export interface IFieldType {
     sortable?: boolean;
     // (undocumented)
     subType?: IFieldSubType;
-    // Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
     toSpec?: () => FieldSpec;
     // (undocumented)
@@ -856,6 +885,10 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
     // (undocumented)
     remove(field: IFieldType): void;
     // (undocumented)
+    removeAll(): void;
+    // (undocumented)
+    replaceAll(specs: FieldSpec[]): void;
+    // (undocumented)
     update(field: FieldSpec): void;
 }
 
@@ -929,7 +962,9 @@ export class IndexPattern implements IIndexPattern {
         }[];
     };
     // (undocumented)
-    getFieldByName(name: string): IndexPatternField | void;
+    getFieldByName(name: string): IndexPatternField | undefined;
+    // (undocumented)
+    getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat;
     // (undocumented)
     getNonScriptedFields(): IndexPatternField[];
     // (undocumented)
@@ -967,7 +1002,7 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     refreshFields(): Promise<void | Error | never[] | undefined>;
     // (undocumented)
-    removeScriptedField(field: IFieldType): Promise<void | Error>;
+    removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
     save(saveAttempts?: number): Promise<void | Error>;
     // (undocumented)
@@ -1018,55 +1053,85 @@ export interface IndexPatternAttributes {
     typeMeta: string;
 }
 
-// Warning: (ae-missing-release-tag) "Field" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "IndexPatternField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export class IndexPatternField implements IFieldType {
+    // Warning: (ae-forgotten-export) The symbol "OnNotification" needs to be exported by the entry point index.d.ts
+    constructor(indexPattern: IndexPattern, spec: FieldSpec, displayName: string, onNotification: OnNotification);
     // (undocumented)
-    $$spec: FieldSpec;
-    // Warning: (ae-forgotten-export) The symbol "FieldSpecExportFmt" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "FieldDependencies" needs to be exported by the entry point index.d.ts
-    constructor(indexPattern: IIndexPattern, spec: FieldSpecExportFmt | FieldSpec | IndexPatternField, shortDotsEnable: boolean, { fieldFormats, onNotification }: FieldDependencies);
+    get aggregatable(): boolean;
     // (undocumented)
-    aggregatable?: boolean;
-    // Warning: (ae-forgotten-export) The symbol "FieldSpecConflictDescriptions" needs to be exported by the entry point index.d.ts
-    //
+    get conflictDescriptions(): Record<string, string[]> | undefined;
+    set conflictDescriptions(conflictDescriptions: Record<string, string[]> | undefined);
     // (undocumented)
-    conflictDescriptions?: FieldSpecConflictDescriptions;
+    get count(): number;
+    set count(count: number);
     // (undocumented)
-    count?: number;
+    readonly displayName: string;
     // (undocumented)
-    displayName?: string;
+    get esTypes(): string[] | undefined;
     // (undocumented)
-    esTypes?: string[];
+    get filterable(): boolean;
     // (undocumented)
-    filterable?: boolean;
+    get format(): FieldFormat;
     // (undocumented)
-    format: any;
+    readonly indexPattern: IndexPattern;
     // (undocumented)
-    indexPattern?: IIndexPattern;
+    get lang(): string | undefined;
+    set lang(lang: string | undefined);
     // (undocumented)
-    lang?: string;
+    get name(): string;
     // (undocumented)
-    name: string;
+    get readFromDocValues(): boolean;
     // (undocumented)
-    readFromDocValues?: boolean;
+    get script(): string | undefined;
+    set script(script: string | undefined);
     // (undocumented)
-    script?: string;
+    get scripted(): boolean;
     // (undocumented)
-    scripted?: boolean;
+    get searchable(): boolean;
     // (undocumented)
-    searchable?: boolean;
+    get sortable(): boolean;
     // (undocumented)
-    sortable?: boolean;
+    readonly spec: FieldSpec;
     // (undocumented)
-    subType?: IFieldSubType;
+    get subType(): import("../types").IFieldSubType | undefined;
+    // (undocumented)
+    toJSON(): {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+    };
     // (undocumented)
-    toSpec: () => FieldSpecExportFmt;
+    toSpec(): {
+        count: number;
+        script: string | undefined;
+        lang: string | undefined;
+        conflictDescriptions: Record<string, string[]> | undefined;
+        name: string;
+        type: string;
+        esTypes: string[] | undefined;
+        scripted: boolean;
+        searchable: boolean;
+        aggregatable: boolean;
+        readFromDocValues: boolean;
+        subType: import("../types").IFieldSubType | undefined;
+        format: any;
+    };
     // (undocumented)
-    type: string;
+    get type(): string;
     // (undocumented)
-    visualizable?: boolean;
+    get visualizable(): boolean;
 }
 
 // Warning: (ae-missing-release-tag) "indexPatterns" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -1899,21 +1964,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:370:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:370:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:370:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:370:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:372:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:373:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:382:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:383:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:384:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:385:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:389:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:390:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:394:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:397: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:54:5 - (ae-forgotten-export) The symbol "createFiltersFromValueClickAction" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:55:5 - (ae-forgotten-export) The symbol "createFiltersFromRangeSelectAction" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/data/public/search/aggs/agg_configs.test.ts b/src/plugins/data/public/search/aggs/agg_configs.test.ts
index df4a5420ae0db..ff0cc3341929e 100644
--- a/src/plugins/data/public/search/aggs/agg_configs.test.ts
+++ b/src/plugins/data/public/search/aggs/agg_configs.test.ts
@@ -22,7 +22,7 @@ import { AggConfig } from './agg_config';
 import { AggConfigs } from './agg_configs';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockAggTypesRegistry } from './test_helpers';
-import { Field as IndexPatternField, IndexPattern } from '../../index_patterns';
+import { IndexPatternField, IndexPattern } from '../../index_patterns';
 import { stubIndexPattern, stubIndexPatternWithFields } from '../../../public/stubs';
 
 describe('AggConfigs', () => {
diff --git a/src/plugins/data/public/search/aggs/param_types/field.ts b/src/plugins/data/public/search/aggs/param_types/field.ts
index cb3617b02e882..7c00bc668a39f 100644
--- a/src/plugins/data/public/search/aggs/param_types/field.ts
+++ b/src/plugins/data/public/search/aggs/param_types/field.ts
@@ -23,7 +23,7 @@ import { SavedObjectNotFound } from '../../../../../../plugins/kibana_utils/comm
 import { BaseParamType } from './base';
 import { propFilter } from '../utils';
 import { isNestedField, KBN_FIELD_TYPES } from '../../../../common';
-import { Field as IndexPatternField } from '../../../index_patterns';
+import { IndexPatternField } from '../../../index_patterns';
 
 const filterByType = propFilter('type');
 
diff --git a/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js b/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
index b30b13b1f0b6e..d85ca6a072890 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
+++ b/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
@@ -23,7 +23,7 @@ import 'angular-sanitize';
 import 'angular-route';
 import _ from 'lodash';
 import sinon from 'sinon';
-import { getFakeRow, getFakeRowVals } from 'fixtures/fake_row';
+import { getFakeRow } from 'fixtures/fake_row';
 import $ from 'jquery';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { setScopedHistory, setServices, setDocViewsRegistry } from '../../../../kibana_services';
@@ -33,6 +33,13 @@ import { navigationPluginMock } from '../../../../../../navigation/public/mocks'
 import { getInnerAngularModule } from '../../../../get_inner_angular';
 import { createBrowserHistory } from 'history';
 
+const fakeRowVals = {
+  time: 'time_formatted',
+  bytes: 'bytes_formatted',
+  '@timestamp': '@timestamp_formatted',
+  request_body: 'request_body_formatted',
+};
+
 describe('Doc Table', () => {
   const core = coreMock.createStart();
   const dataMock = dataPluginMock.createStartContract();
@@ -45,8 +52,6 @@ describe('Doc Table', () => {
   // Stub out a minimal mapping of 4 fields
   let mapping;
 
-  let fakeRowVals;
-  let stubFieldFormatConverter;
   beforeAll(() => setScopedHistory(createBrowserHistory()));
   beforeEach(() => {
     angular.element.prototype.slice = jest.fn(function (index) {
@@ -97,21 +102,15 @@ describe('Doc Table', () => {
       mapping = $parentScope.indexPattern.fields;
 
       // Stub `getConverterFor` for a field in the indexPattern to return mock data.
-      // Returns `val` if provided, otherwise generates fake data for the field.
-      fakeRowVals = getFakeRowVals('formatted', 0, mapping);
-      stubFieldFormatConverter = function ($root, field, val) {
-        const convertFn = (value, type, options) => {
-          if (val) {
-            return val;
-          }
-          const fieldName = _.get(options, 'field.name', null);
-
-          return fakeRowVals[fieldName] || '';
-        };
-
-        $root.indexPattern.fields.getByName(field).format.convert = convertFn;
-        $root.indexPattern.fields.getByName(field).format.getConverterFor = () => convertFn;
+
+      const convertFn = (value, type, options) => {
+        const fieldName = _.get(options, 'field.name', null);
+        return fakeRowVals[fieldName] || '';
       };
+      $parentScope.indexPattern.getFormatterForField = () => ({
+        convert: convertFn,
+        getConverterFor: () => convertFn,
+      });
     })
   );
 
@@ -148,9 +147,6 @@ describe('Doc Table', () => {
     test('should be able to add and remove columns', () => {
       let childElems;
 
-      stubFieldFormatConverter($parentScope, 'bytes');
-      stubFieldFormatConverter($parentScope, 'request_body');
-
       // Should include a column for toggling and the time column by default
       $parentScope.columns = ['bytes'];
       $elementScope.$digest();
@@ -302,9 +298,6 @@ describe('Doc Table', () => {
         $root.mapping = mapping;
         $root.indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
-        // Stub field format converters for every field in the indexPattern
-        $root.indexPattern.fields.forEach((f) => stubFieldFormatConverter($root, f.name));
-
         $row = $('<tr>').attr({
           'kbn-table-row': 'row',
           columns: 'columns',
@@ -417,7 +410,8 @@ describe('Doc Table', () => {
     });
 
     test('handles two columns with the same content', () => {
-      stubFieldFormatConverter($root, 'request_body', fakeRowVals.bytes);
+      const tempVal = fakeRowVals.request_body;
+      fakeRowVals.request_body = 'bytes_formatted';
 
       $root.columns.length = 0;
       $root.columns.push('bytes');
@@ -428,6 +422,7 @@ describe('Doc Table', () => {
       expect($after).toHaveLength(4);
       expect($after.eq(2).text().trim()).toMatch(/^bytes_formatted/);
       expect($after.eq(3).text().trim()).toMatch(/^bytes_formatted/);
+      fakeRowVals.request_body = tempVal;
     });
 
     test('handles two columns swapping position', () => {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
index 099ec2e5b1ffc..3f12a8c0fa769 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -28,7 +28,6 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { DiscoverField } from './discover_field';
 import { coreMock } from '../../../../../../core/public/mocks';
 import { IndexPatternField } from '../../../../../data/public';
-import { FieldSpecExportFmt } from '../../../../../data/common';
 
 jest.mock('../../../kibana_services', () => ({
   getServices: () => ({
@@ -63,20 +62,21 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals
     coreMock.createStart()
   );
 
-  const field = {
-    name: 'bytes',
-    type: 'number',
-    esTypes: ['long'],
-    count: 10,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true,
-    format: null,
-    routes: {},
-    $$spec: {},
-    toSpec: () => (({} as unknown) as FieldSpecExportFmt),
-  } as IndexPatternField;
+  const field = new IndexPatternField(
+    indexPattern,
+    {
+      name: 'bytes',
+      type: 'number',
+      esTypes: ['long'],
+      count: 10,
+      scripted: false,
+      searchable: true,
+      aggregatable: true,
+      readFromDocValues: true,
+    },
+    'bytes',
+    () => {}
+  );
 
   const props = {
     indexPattern,
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index e8ed8b80da3bb..58b468762c501 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -29,12 +29,7 @@ import { IndexPatternAttributes } from '../../../../../data/common';
 import { SavedObject } from '../../../../../../core/types';
 import { FIELDS_LIMIT_SETTING } from '../../../../common';
 import { groupFields } from './lib/group_fields';
-import {
-  IIndexPatternFieldList,
-  IndexPatternField,
-  IndexPattern,
-  UI_SETTINGS,
-} from '../../../../../data/public';
+import { IndexPatternField, IndexPattern, UI_SETTINGS } from '../../../../../data/public';
 import { AppState } from '../../angular/discover_state';
 import { getDetails } from './lib/get_details';
 import { getDefaultFieldFilter, setFieldFilterProp } from './lib/field_filter';
@@ -99,12 +94,12 @@ export function DiscoverSidebar({
 }: DiscoverSidebarProps) {
   const [openFieldMap, setOpenFieldMap] = useState(new Map());
   const [showFields, setShowFields] = useState(false);
-  const [fields, setFields] = useState<IIndexPatternFieldList | null>(null);
+  const [fields, setFields] = useState<IndexPatternField[] | null>(null);
   const [fieldFilterState, setFieldFilterState] = useState(getDefaultFieldFilter());
   const services = useMemo(() => getServices(), []);
 
   useEffect(() => {
-    const newFields = getIndexPatternFieldList(selectedIndexPattern, fieldCounts, services);
+    const newFields = getIndexPatternFieldList(selectedIndexPattern, fieldCounts);
     setFields(newFields);
   }, [selectedIndexPattern, fieldCounts, hits, services]);
 
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
index 0fcbe925e0798..751a59d982153 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
@@ -18,25 +18,23 @@
  */
 import { difference, map } from 'lodash';
 import { IndexPattern, IndexPatternField } from 'src/plugins/data/public';
-import { DiscoverServices } from '../../../../build_services';
 
 export function getIndexPatternFieldList(
   indexPattern: IndexPattern,
-  fieldCounts: Record<string, number>,
-  { data }: DiscoverServices
+  fieldCounts: Record<string, number>
 ) {
-  if (!indexPattern || !fieldCounts) return data.indexPatterns.createFieldList(indexPattern);
+  if (!indexPattern || !fieldCounts) return [];
 
-  const fieldSpecs = indexPattern.fields.slice(0);
   const fieldNamesInDocs = Object.keys(fieldCounts);
   const fieldNamesInIndexPattern = map(indexPattern.fields, 'name');
+  const unknownTypes: IndexPatternField[] = [];
 
   difference(fieldNamesInDocs, fieldNamesInIndexPattern).forEach((unknownFieldName) => {
-    fieldSpecs.push({
+    unknownTypes.push({
       name: String(unknownFieldName),
       type: 'unknown',
     } as IndexPatternField);
   });
 
-  return data.indexPatterns.createFieldList(indexPattern, fieldSpecs);
+  return [...indexPattern.fields, ...unknownTypes];
 }
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
index fab4637d87ca7..c6a06618900fd 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IIndexPatternFieldList, IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from 'src/plugins/data/public';
 import { FieldFilterState, isFieldFiltered } from './field_filter';
 
 interface GroupedFields {
@@ -29,7 +29,7 @@ interface GroupedFields {
  * group the fields into selected, popular and unpopular, filter by fieldFilterState
  */
 export function groupFields(
-  fields: IIndexPatternFieldList | null,
+  fields: IndexPatternField[] | null,
   columns: string[],
   popularLimit: number,
   fieldCounts: Record<string, number>,
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 f7b982ef1659e..22bc78ee0538e 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
@@ -21,7 +21,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 
 import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from '../../../../../../plugins/data/public';
+import { IndexPattern, IndexPatternField } from '../../../../../../plugins/data/public';
 import { useKibana } from '../../../../../../plugins/kibana_react/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { IndexHeader } from '../index_header';
@@ -44,24 +44,21 @@ const newFieldPlaceholder = i18n.translate(
 
 export const CreateEditField = withRouter(
   ({ indexPattern, mode, fieldName, history }: CreateEditFieldProps) => {
-    const { data, uiSettings, chrome, notifications } = useKibana<
+    const { uiSettings, chrome, notifications } = useKibana<
       IndexPatternManagmentContext
     >().services;
-    const field =
+    const spec =
       mode === 'edit' && fieldName
-        ? indexPattern.fields.getByName(fieldName)
-        : data.indexPatterns.createField(
-            indexPattern,
-            {
-              scripted: true,
-              type: 'number',
-            },
-            false
-          );
+        ? indexPattern.fields.getByName(fieldName)?.spec
+        : (({
+            scripted: true,
+            type: 'number',
+            name: undefined,
+          } as unknown) as IndexPatternField);
 
     const url = `/patterns/${indexPattern.id}`;
 
-    if (mode === 'edit' && !field) {
+    if (mode === 'edit' && !spec) {
       const message = i18n.translate(
         'indexPatternManagement.editIndexPattern.scripted.noFieldLabel',
         {
@@ -74,17 +71,17 @@ export const CreateEditField = withRouter(
       history.push(url);
     }
 
-    const docFieldName = field?.name || newFieldPlaceholder;
+    const docFieldName = spec?.name || newFieldPlaceholder;
 
     chrome.docTitle.change([docFieldName, indexPattern.title]);
 
     const redirectAway = () => {
       history.push(
-        `${url}#/?_a=(tab:${field?.scripted ? TAB_SCRIPTED_FIELDS : TAB_INDEXED_FIELDS})`
+        `${url}#/?_a=(tab:${spec?.scripted ? TAB_SCRIPTED_FIELDS : TAB_INDEXED_FIELDS})`
       );
     };
 
-    if (field) {
+    if (spec) {
       return (
         <EuiPanel paddingSize={'l'}>
           <EuiFlexGroup direction="column">
@@ -97,7 +94,7 @@ export const CreateEditField = withRouter(
             <EuiFlexItem>
               <FieldEditor
                 indexPattern={indexPattern}
-                field={field}
+                spec={spec}
                 services={{
                   redirectAway,
                 }}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
index db2a032b1e4d9..47cabc4df662f 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
@@ -15,7 +15,9 @@ exports[`IndexedFieldsTable should filter based on the query bar 1`] = `
           "displayName": "Elastic",
           "excluded": false,
           "format": undefined,
-          "indexPattern": undefined,
+          "indexPattern": Object {
+            "getNonScriptedFields": [Function],
+          },
           "info": Array [],
           "name": "Elastic",
           "searchable": true,
@@ -42,7 +44,9 @@ exports[`IndexedFieldsTable should filter based on the type filter 1`] = `
           "displayName": "timestamp",
           "excluded": false,
           "format": undefined,
-          "indexPattern": undefined,
+          "indexPattern": Object {
+            "getNonScriptedFields": [Function],
+          },
           "info": Array [],
           "name": "timestamp",
           "type": "date",
@@ -68,7 +72,9 @@ exports[`IndexedFieldsTable should render normally 1`] = `
           "displayName": "Elastic",
           "excluded": false,
           "format": undefined,
-          "indexPattern": undefined,
+          "indexPattern": Object {
+            "getNonScriptedFields": [Function],
+          },
           "info": Array [],
           "name": "Elastic",
           "searchable": true,
@@ -78,7 +84,9 @@ exports[`IndexedFieldsTable should render normally 1`] = `
           "displayName": "timestamp",
           "excluded": false,
           "format": undefined,
-          "indexPattern": undefined,
+          "indexPattern": Object {
+            "getNonScriptedFields": [Function],
+          },
           "info": Array [],
           "name": "timestamp",
           "type": "date",
@@ -87,7 +95,9 @@ exports[`IndexedFieldsTable should render normally 1`] = `
           "displayName": "conflictingField",
           "excluded": false,
           "format": undefined,
-          "indexPattern": undefined,
+          "indexPattern": Object {
+            "getNonScriptedFields": [Function],
+          },
           "info": Array [],
           "name": "conflictingField",
           "type": "conflict",
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
index 8c024fa7adcf5..411bbe23e4761 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { IndexPatternField, IIndexPattern } from 'src/plugins/data/public';
+import { IndexPatternField, IIndexPattern, IndexPattern } from 'src/plugins/data/public';
 import { IndexedFieldsTable } from './indexed_fields_table';
 
 jest.mock('@elastic/eui', () => ({
@@ -41,6 +41,19 @@ const helpers = {
   getFieldInfo: () => [],
 };
 
+const indexPattern = ({
+  getNonScriptedFields: () => fields,
+} as unknown) as IIndexPattern;
+
+const mockFieldToIndexPatternField = (spec: Record<string, string | boolean | undefined>) => {
+  return new IndexPatternField(
+    indexPattern as IndexPattern,
+    (spec as unknown) as IndexPatternField['spec'],
+    spec.displayName as string,
+    () => {}
+  );
+};
+
 const fields = [
   {
     name: 'Elastic',
@@ -50,11 +63,7 @@ const fields = [
   },
   { name: 'timestamp', displayName: 'timestamp', type: 'date' },
   { name: 'conflictingField', displayName: 'conflictingField', type: 'conflict' },
-] as IndexPatternField[];
-
-const indexPattern = ({
-  getNonScriptedFields: () => fields,
-} as unknown) as IIndexPattern;
+].map(mockFieldToIndexPatternField);
 
 describe('IndexedFieldsTable', () => {
   test('should render normally', async () => {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
index 3344c46c35ac6..90f81a88b3da0 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -75,7 +75,7 @@ export class IndexedFieldsTable extends Component<
       (fields &&
         fields.map((field) => {
           return {
-            ...field,
+            ...field.spec,
             displayName: field.displayName,
             indexPattern: field.indexPattern,
             format: getFieldFormat(indexPattern, field.name),
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
index 7a7545580d82a..c22160bc4036d 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`FieldEditor should render create new scripted field correctly 1`] = `
               "name": "foobar",
             },
           ],
+          "getFormatterForField": [Function],
         }
       }
       isVisible={false}
@@ -273,6 +274,7 @@ exports[`FieldEditor should render edit scripted field correctly 1`] = `
               "type": "number",
             },
           ],
+          "getFormatterForField": [Function],
         }
       }
       isVisible={false}
@@ -523,6 +525,7 @@ exports[`FieldEditor should show conflict field warning 1`] = `
               "type": "number",
             },
           ],
+          "getFormatterForField": [Function],
         }
       }
       isVisible={false}
@@ -802,6 +805,7 @@ exports[`FieldEditor should show deprecated lang warning 1`] = `
               "type": "number",
             },
           ],
+          "getFormatterForField": [Function],
         }
       }
       isVisible={false}
@@ -1133,6 +1137,7 @@ exports[`FieldEditor should show multiple type field warning with a table contai
               "type": "number",
             },
           ],
+          "getFormatterForField": [Function],
         }
       }
       isVisible={false}
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/string/string.tsx b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/string/string.tsx
index 7a3bb6f5cd398..cdc29e129c457 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/string/string.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/string/string.tsx
@@ -68,7 +68,7 @@ export class StringFormatEditor extends DefaultFormatEditor<StringFormatEditorFo
           <EuiSelect
             data-test-subj="stringEditorTransform"
             defaultValue={formatParams.transform}
-            options={format.type.transformOptions.map((option: TransformOptions) => {
+            options={(format.type.transformOptions || []).map((option: TransformOptions) => {
               return {
                 value: option.kind,
                 text: option.text,
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
index e0e053d8b606b..ba1f2ff4b665d 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
@@ -26,7 +26,7 @@ import {
 
 jest.mock('brace/mode/groovy', () => ({}));
 
-import { FieldEditor } from './field_editor';
+import { FieldEditor, FieldEdiorProps } from './field_editor';
 
 import { mockManagementPlugin } from '../../mocks';
 import { createComponentWithContext } from '../test_utils';
@@ -113,15 +113,16 @@ describe('FieldEditor', () => {
   beforeEach(() => {
     indexPattern = ({
       fields: fields as IIndexPatternFieldList,
+      getFormatterForField: () => ({ params: () => ({}) }),
     } as unknown) as IndexPattern;
   });
 
   it('should render create new scripted field correctly', async () => {
-    const component = createComponentWithContext(
+    const component = createComponentWithContext<FieldEdiorProps>(
       FieldEditor,
       {
         indexPattern,
-        field: (field as unknown) as IndexPatternField,
+        spec: (field as unknown) as IndexPatternField,
         services: { redirectAway: () => {} },
       },
       mockContext
@@ -146,11 +147,11 @@ describe('FieldEditor', () => {
       return flds[name] as IndexPatternField;
     };
 
-    const component = createComponentWithContext(
+    const component = createComponentWithContext<FieldEdiorProps>(
       FieldEditor,
       {
         indexPattern,
-        field: (testField as unknown) as IndexPatternField,
+        spec: (testField as unknown) as IndexPatternField,
         services: { redirectAway: () => {} },
       },
       mockContext
@@ -176,11 +177,11 @@ describe('FieldEditor', () => {
       return flds[name] as IndexPatternField;
     };
 
-    const component = createComponentWithContext(
+    const component = createComponentWithContext<FieldEdiorProps>(
       FieldEditor,
       {
         indexPattern,
-        field: (testField as unknown) as IndexPatternField,
+        spec: (testField as unknown) as IndexPatternField,
         services: { redirectAway: () => {} },
       },
       mockContext
@@ -193,11 +194,11 @@ describe('FieldEditor', () => {
 
   it('should show conflict field warning', async () => {
     const testField = { ...field };
-    const component = createComponentWithContext(
+    const component = createComponentWithContext<FieldEdiorProps>(
       FieldEditor,
       {
         indexPattern,
-        field: (testField as unknown) as IndexPatternField,
+        spec: (testField as unknown) as IndexPatternField,
         services: { redirectAway: () => {} },
       },
       mockContext
@@ -218,11 +219,11 @@ describe('FieldEditor', () => {
         text: ['index_name_3'],
       },
     };
-    const component = createComponentWithContext(
+    const component = createComponentWithContext<FieldEdiorProps>(
       FieldEditor,
       {
         indexPattern,
-        field: (testField as unknown) as IndexPatternField,
+        spec: (testField as unknown) as IndexPatternField,
         services: { redirectAway: () => {} },
       },
       mockContext
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 99ef83604239a..d78e1e1014581 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
@@ -76,7 +76,7 @@ import { executeScript, isScriptValid } from './lib';
 import 'brace/mode/groovy';
 
 const getFieldTypeFormatsList = (
-  field: IFieldType,
+  field: IndexPatternField['spec'],
   defaultFieldFormat: FieldFormatInstanceType,
   fieldFormats: DataPublicPluginStart['fieldFormats']
 ) => {
@@ -108,10 +108,6 @@ interface InitialFieldTypeFormat extends FieldTypeFormat {
   defaultFieldFormat: FieldFormatInstanceType;
 }
 
-interface FieldClone extends IndexPatternField {
-  format: any;
-}
-
 export interface FieldEditorState {
   isReady: boolean;
   isCreating: boolean;
@@ -120,7 +116,6 @@ export interface FieldEditorState {
   fieldTypes: string[];
   fieldTypeFormats: FieldTypeFormat[];
   existingFieldNames: string[];
-  field: FieldClone;
   fieldFormatId?: string;
   fieldFormatParams: { [key: string]: unknown };
   showScriptingHelp: boolean;
@@ -129,11 +124,13 @@ export interface FieldEditorState {
   hasScriptError: boolean;
   isSaving: boolean;
   errors?: string[];
+  format: any;
+  spec: IndexPatternField['spec'];
 }
 
 export interface FieldEdiorProps {
   indexPattern: IndexPattern;
-  field: IndexPatternField;
+  spec: IndexPatternField['spec'];
   services: {
     redirectAway: () => void;
   };
@@ -149,7 +146,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   constructor(props: FieldEdiorProps, context: IndexPatternManagmentContextValue) {
     super(props, context);
 
-    const { field, indexPattern } = props;
+    const { spec, indexPattern } = props;
 
     this.state = {
       isReady: false,
@@ -159,7 +156,6 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
       fieldTypes: [],
       fieldTypeFormats: [],
       existingFieldNames: indexPattern.fields.map((f: IFieldType) => f.name),
-      field: { ...field, format: field.format },
       fieldFormatId: undefined,
       fieldFormatParams: {},
       showScriptingHelp: false,
@@ -167,6 +163,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
       hasFormatError: false,
       hasScriptError: false,
       isSaving: false,
+      format: props.indexPattern.getFormatterForField(spec),
+      spec: { ...spec },
     };
     this.supportedLangs = getSupportedScriptingLanguages();
     this.deprecatedLangs = getDeprecatedScriptingLanguages();
@@ -175,7 +173,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
 
   async init(context: IndexPatternManagmentContextValue) {
     const { http, notifications, data } = context.services;
-    const { field } = this.state;
+    const { format, spec } = this.state;
     const { indexPattern } = this.props;
 
     const enabledLangs = await getEnabledScriptingLanguages(http, notifications.toasts);
@@ -183,60 +181,64 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
       enabledLangs,
       union(this.supportedLangs, this.deprecatedLangs)
     );
-    field.lang = field.lang && scriptingLangs.includes(field.lang) ? field.lang : undefined;
 
-    const fieldTypes = get(FIELD_TYPES_BY_LANG, field.lang || '', DEFAULT_FIELD_TYPES);
-    field.type = fieldTypes.includes(field.type) ? field.type : fieldTypes[0];
+    spec.lang = spec.lang && scriptingLangs.includes(spec.lang) ? spec.lang : undefined;
+    if (spec.scripted && !spec.lang) {
+      spec.lang = scriptingLangs[0];
+    }
+
+    const fieldTypes = get(FIELD_TYPES_BY_LANG, spec.lang || '', DEFAULT_FIELD_TYPES);
+    spec.type = fieldTypes.includes(spec.type) ? spec.type : fieldTypes[0];
 
     const DefaultFieldFormat = data.fieldFormats.getDefaultType(
-      field.type as KBN_FIELD_TYPES,
-      field.esTypes as ES_FIELD_TYPES[]
+      spec.type as KBN_FIELD_TYPES,
+      spec.esTypes as ES_FIELD_TYPES[]
     );
 
     this.setState({
       isReady: true,
-      isCreating: !indexPattern.fields.find((f) => f.name === field.name),
-      isDeprecatedLang: this.deprecatedLangs.includes(field.lang || ''),
+      isCreating: !indexPattern.fields.find((f) => f.name === spec.name),
+      isDeprecatedLang: this.deprecatedLangs.includes(spec.lang || ''),
       errors: [],
       scriptingLangs,
       fieldTypes,
       fieldTypeFormats: getFieldTypeFormatsList(
-        field,
+        spec,
         DefaultFieldFormat as FieldFormatInstanceType,
         data.fieldFormats
       ),
-      fieldFormatId: get(indexPattern, ['fieldFormatMap', field.name, 'type', 'id']),
-      fieldFormatParams: field.format.params(),
+      fieldFormatId: get(indexPattern, ['fieldFormatMap', spec.name, 'type', 'id']),
+      fieldFormatParams: format.params(),
     });
   }
 
   onFieldChange = (fieldName: string, value: string | number) => {
-    const { field } = this.state;
-    (field as any)[fieldName] = value;
+    const { spec } = this.state;
+    (spec as any)[fieldName] = value;
     this.forceUpdate();
   };
 
   onTypeChange = (type: KBN_FIELD_TYPES) => {
     const { uiSettings, data } = this.context.services;
-    const { field } = this.state;
+    const { spec, format } = this.state;
     const DefaultFieldFormat = data.fieldFormats.getDefaultType(type) as FieldFormatInstanceType;
 
-    field.type = type;
+    spec.type = type;
 
-    field.format = new DefaultFieldFormat(null, (key) => uiSettings.get(key));
+    spec.format = new DefaultFieldFormat(null, (key) => uiSettings.get(key));
 
     this.setState({
-      fieldTypeFormats: getFieldTypeFormatsList(field, DefaultFieldFormat, data.fieldFormats),
+      fieldTypeFormats: getFieldTypeFormatsList(spec, DefaultFieldFormat, data.fieldFormats),
       fieldFormatId: DefaultFieldFormat.id,
-      fieldFormatParams: field.format.params(),
+      fieldFormatParams: format.params(),
     });
   };
 
   onLangChange = (lang: string) => {
-    const { field } = this.state;
+    const { spec } = this.state;
     const fieldTypes = get(FIELD_TYPES_BY_LANG, lang, DEFAULT_FIELD_TYPES);
-    field.lang = lang;
-    field.type = fieldTypes.includes(field.type) ? field.type : fieldTypes[0];
+    spec.lang = lang;
+    spec.type = fieldTypes.includes(spec.type) ? spec.type : fieldTypes[0];
 
     this.setState({
       fieldTypes,
@@ -244,18 +246,20 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   onFormatChange = (formatId: string, params?: any) => {
-    const { field, fieldTypeFormats } = this.state;
+    const { spec, fieldTypeFormats } = this.state;
     const { uiSettings, data } = this.context.services;
 
     const FieldFormat = data.fieldFormats.getType(
       formatId || (fieldTypeFormats[0] as InitialFieldTypeFormat).defaultFieldFormat.id
     ) as FieldFormatInstanceType;
 
-    field.format = new FieldFormat(params, (key) => uiSettings.get(key));
+    const newFormat = new FieldFormat(params, (key) => uiSettings.get(key));
+    spec.format = newFormat;
 
     this.setState({
       fieldFormatId: FieldFormat.id,
-      fieldFormatParams: field.format.params(),
+      fieldFormatParams: newFormat.params(),
+      format: newFormat,
     });
   };
 
@@ -271,13 +275,13 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   isDuplicateName() {
-    const { isCreating, field, existingFieldNames } = this.state;
-    return isCreating && existingFieldNames.includes(field.name);
+    const { isCreating, spec, existingFieldNames } = this.state;
+    return isCreating && existingFieldNames.includes(spec.name);
   }
 
   renderName() {
-    const { isCreating, field } = this.state;
-    const isInvalid = !field.name || !field.name.trim();
+    const { isCreating, spec } = this.state;
+    const isInvalid = !spec.name || !spec.name.trim();
 
     return isCreating ? (
       <EuiFormRow
@@ -300,7 +304,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
                       />
                     </strong>
                   ),
-                  fieldName: <EuiCode>{field.name}</EuiCode>,
+                  fieldName: <EuiCode>{spec.name}</EuiCode>,
                 }}
               />
             </span>
@@ -316,7 +320,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         }
       >
         <EuiFieldText
-          value={field.name || ''}
+          value={spec.name || ''}
           placeholder={i18n.translate('indexPatternManagement.namePlaceholder', {
             defaultMessage: 'New scripted field',
           })}
@@ -331,9 +335,9 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   renderLanguage() {
-    const { field, scriptingLangs, isDeprecatedLang } = this.state;
+    const { spec, scriptingLangs, isDeprecatedLang } = this.state;
 
-    return field.scripted ? (
+    return spec.scripted ? (
       <EuiFormRow
         label={i18n.translate('indexPatternManagement.languageLabel', {
           defaultMessage: 'Language',
@@ -355,7 +359,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
                 defaultMessage="{language} is deprecated and support will be removed in the next major version of Kibana and Elasticsearch.
               We recommend using {painlessLink} for new scripted fields."
                 values={{
-                  language: <EuiCode>{field.lang}</EuiCode>,
+                  language: <EuiCode>{spec.lang}</EuiCode>,
                   painlessLink: (
                     <EuiLink
                       target="_blank"
@@ -374,7 +378,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         }
       >
         <EuiSelect
-          value={field.lang}
+          value={spec.lang}
           options={scriptingLangs.map((lang) => {
             return { value: lang, text: lang };
           })}
@@ -388,15 +392,15 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   renderType() {
-    const { field, fieldTypes } = this.state;
+    const { spec, fieldTypes } = this.state;
 
     return (
       <EuiFormRow
         label={i18n.translate('indexPatternManagement.typeLabel', { defaultMessage: 'Type' })}
       >
         <EuiSelect
-          value={field.type}
-          disabled={!field.scripted}
+          value={spec.type}
+          disabled={!spec.scripted}
           options={fieldTypes.map((type) => {
             return { value: type, text: type };
           })}
@@ -414,8 +418,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
    * in case there are indices with different types
    */
   renderTypeConflict() {
-    const { field } = this.state;
-    if (!field.conflictDescriptions || typeof field.conflictDescriptions !== 'object') {
+    const { spec } = this.state;
+    if (!spec.conflictDescriptions || typeof spec.conflictDescriptions !== 'object') {
       return null;
     }
 
@@ -433,7 +437,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
       },
     ];
 
-    const items = Object.entries(field.conflictDescriptions).map(([type, indices]) => ({
+    const items = Object.entries(spec.conflictDescriptions).map(([type, indices]) => ({
       type,
       indices: Array.isArray(indices) ? indices.join(', ') : 'Index names unavailable',
     }));
@@ -466,7 +470,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   renderFormat() {
-    const { field, fieldTypeFormats, fieldFormatId, fieldFormatParams } = this.state;
+    const { spec, fieldTypeFormats, fieldFormatId, fieldFormatParams, format } = this.state;
     const { indexPatternManagementStart } = this.context.services;
     const defaultFormat = (fieldTypeFormats[0] as InitialFieldTypeFormat).defaultFieldFormat.title;
 
@@ -496,8 +500,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         >
           <EuiSelect
             value={fieldFormatId}
-            options={fieldTypeFormats.map((format) => {
-              return { value: format.id || '', text: format.title };
+            options={fieldTypeFormats.map((fmt) => {
+              return { value: fmt.id || '', text: fmt.title };
             })}
             data-test-subj="editorSelectedFormatId"
             onChange={(e) => {
@@ -507,8 +511,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         </EuiFormRow>
         {fieldFormatId ? (
           <FieldFormatEditor
-            fieldType={field.type}
-            fieldFormat={field.format}
+            fieldType={spec.type}
+            fieldFormat={format}
             fieldFormatId={fieldFormatId}
             fieldFormatParams={fieldFormatParams}
             fieldFormatEditors={indexPatternManagementStart.fieldFormatEditors}
@@ -521,7 +525,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   renderPopularity() {
-    const { field } = this.state;
+    const { spec } = this.state;
 
     return (
       <EuiFormRow
@@ -532,7 +536,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
         })}
       >
         <EuiFieldNumber
-          value={field.count}
+          value={spec.count}
           data-test-subj="editorFieldCount"
           onChange={(e) => {
             this.onFieldChange('count', e.target.value ? Number(e.target.value) : '');
@@ -550,8 +554,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   renderScript() {
-    const { field, hasScriptError } = this.state;
-    const isInvalid = !field.script || !field.script.trim() || hasScriptError;
+    const { spec, hasScriptError } = this.state;
+    const isInvalid = !spec.script || !spec.script.trim() || hasScriptError;
     const errorMsg = hasScriptError ? (
       <span data-test-subj="invalidScriptError">
         <FormattedMessage
@@ -566,7 +570,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
       />
     );
 
-    return field.scripted ? (
+    return spec.scripted ? (
       <Fragment>
         <EuiFormRow
           fullWidth
@@ -575,7 +579,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
           error={isInvalid ? errorMsg : null}
         >
           <EuiCodeEditor
-            value={field.script}
+            value={spec.script}
             data-test-subj="editorFieldScript"
             onChange={this.onScriptChange}
             mode="groovy"
@@ -619,14 +623,14 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   renderDeleteModal = () => {
-    const { field } = this.state;
+    const { spec } = this.state;
 
     return this.state.showDeleteModal ? (
       <EuiOverlayMask>
         <EuiConfirmModal
           title={i18n.translate('indexPatternManagement.deleteFieldHeader', {
             defaultMessage: "Delete field '{fieldName}'",
-            values: { fieldName: field.name },
+            values: { fieldName: spec.name },
           })}
           onCancel={this.hideDeleteModal}
           onConfirm={() => {
@@ -674,7 +678,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   renderActions() {
-    const { isCreating, field, isSaving } = this.state;
+    const { isCreating, spec, isSaving } = this.state;
     const { redirectAway } = this.props.services;
 
     return (
@@ -709,7 +713,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
               />
             </EuiButtonEmpty>
           </EuiFlexItem>
-          {!isCreating && field.scripted ? (
+          {!isCreating && spec.scripted ? (
             <EuiFlexItem>
               <EuiFlexGroup justifyContent="flexEnd">
                 <EuiFlexItem grow={false}>
@@ -729,9 +733,9 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   renderScriptingPanels = () => {
-    const { scriptingLangs, field, showScriptingHelp } = this.state;
+    const { scriptingLangs, spec, showScriptingHelp } = this.state;
 
-    if (!field.scripted) {
+    if (!spec.scripted) {
       return;
     }
 
@@ -743,9 +747,9 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
           isVisible={showScriptingHelp}
           onClose={this.hideScriptingHelp}
           indexPattern={this.props.indexPattern}
-          lang={field.lang as string}
-          name={field.name}
-          script={field.script}
+          lang={spec.lang as string}
+          name={spec.name}
+          script={spec.script}
           executeScript={executeScript}
         />
       </Fragment>
@@ -755,14 +759,14 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   deleteField = () => {
     const { redirectAway } = this.props.services;
     const { indexPattern } = this.props;
-    const { field } = this.state;
-    const remove = indexPattern.removeScriptedField(field);
+    const { spec } = this.state;
+    const remove = indexPattern.removeScriptedField(spec.name);
 
     if (remove) {
       remove.then(() => {
         const message = i18n.translate('indexPatternManagement.deleteField.deletedHeader', {
           defaultMessage: "Deleted '{fieldName}'",
-          values: { fieldName: field.name },
+          values: { fieldName: spec.name },
         });
         this.context.services.notifications.toasts.addSuccess(message);
         redirectAway();
@@ -773,7 +777,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   saveField = async () => {
-    const field = this.state.field;
+    const field = this.state.spec;
     const { indexPattern } = this.props;
     const { fieldFormatId } = this.state;
 
@@ -802,10 +806,10 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
     const { redirectAway } = this.props.services;
     const index = indexPattern.fields.findIndex((f: IFieldType) => f.name === field.name);
 
-    let oldField: IFieldType | undefined;
+    let oldField: IndexPatternField['spec'];
 
     if (index > -1) {
-      oldField = indexPattern.fields.getByName(field.name);
+      oldField = indexPattern.fields.getByName(field.name)!.spec;
       indexPattern.fields.update(field);
     } else {
       indexPattern.fields.add(field);
@@ -837,14 +841,14 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   };
 
   isSavingDisabled() {
-    const { field, hasFormatError, hasScriptError } = this.state;
+    const { spec, hasFormatError, hasScriptError } = this.state;
 
     if (
       hasFormatError ||
       hasScriptError ||
-      !field.name ||
-      !field.name.trim() ||
-      (field.scripted && (!field.script || !field.script.trim()))
+      !spec.name ||
+      !spec.name.trim() ||
+      (spec.scripted && (!spec.script || !spec.script.trim()))
     ) {
       return true;
     }
@@ -853,7 +857,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
   }
 
   render() {
-    const { isReady, isCreating, field } = this.state;
+    const { isReady, isCreating, spec } = this.state;
 
     return isReady ? (
       <div>
@@ -868,7 +872,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
               <FormattedMessage
                 id="indexPatternManagement.editHeader"
                 defaultMessage="Edit {fieldName}"
-                values={{ fieldName: field.name }}
+                values={{ fieldName: spec.name }}
               />
             )}
           </h3>
diff --git a/src/plugins/index_pattern_management/public/components/test_utils.tsx b/src/plugins/index_pattern_management/public/components/test_utils.tsx
index 938547cca04ab..6aa71785d779c 100644
--- a/src/plugins/index_pattern_management/public/components/test_utils.tsx
+++ b/src/plugins/index_pattern_management/public/components/test_utils.tsx
@@ -23,9 +23,9 @@ import { shallow } from 'enzyme';
 
 // since the 'shallow' from 'enzyme' doesn't support context API for React 16 and above (https://github.com/facebook/react/pull/14329)
 // we use this workaround where define legacy contextTypes for react class component
-export function createComponentWithContext(
+export function createComponentWithContext<Props = Record<string, any>>(
   MyComponent: React.ComponentClass<any>,
-  props: Record<string, any>,
+  props: Props,
   mockedContext: Record<string, any>
 ) {
   MyComponent.contextTypes = {
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index 5a81139157cef..f7b65930b683d 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -22,12 +22,7 @@ import sinon from 'sinon';
 // because it is one of the few places that we need to access the IndexPattern class itself, rather
 // than just the type. Doing this as a temporary measure; it will be left behind when migrating to NP.
 
-import {
-  IndexPattern,
-  indexPatterns,
-  KBN_FIELD_TYPES,
-  getIndexPatternFieldListCreator,
-} from '../../plugins/data/public';
+import { IndexPattern, indexPatterns, KBN_FIELD_TYPES, FieldList } from '../../plugins/data/public';
 
 import { setFieldFormats } from '../../plugins/data/public/services';
 
@@ -42,16 +37,6 @@ import { getFieldFormatsRegistry } from './stub_field_formats';
 
 export default function StubIndexPattern(pattern, getConfig, timeField, fields, core) {
   const registeredFieldFormats = getFieldFormatsRegistry(core);
-  const createFieldList = getIndexPatternFieldListCreator({
-    fieldFormats: {
-      getDefaultInstance: () => ({
-        convert: (val) => String(val),
-      }),
-    },
-    toastNotifications: {
-      addDanger: () => {},
-    },
-  });
 
   this.id = pattern;
   this.title = pattern;
@@ -74,9 +59,12 @@ export default function StubIndexPattern(pattern, getConfig, timeField, fields,
   );
   this.fieldsFetcher = { apiClient: { baseUrl: '' } };
   this.formatField = this.formatHit.formatField;
+  this.getFormatterForField = () => ({
+    convert: () => '',
+  });
 
   this._reindexFields = function () {
-    this.fields = createFieldList(this, this.fields || fields, false);
+    this.fields = new FieldList(this, this.fields || fields, false);
   };
 
   this.stubSetFieldFormat = function (fieldName, id, params) {
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index 530b8e1111a0c..e2fcf50ef2c12 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('0');
+      expect(popularity).to.be('');
     });
 
     it('can be saved', async function () {
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 2727313ab2336..116d1eac90cea 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -36,6 +36,7 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService, getPageObjects }) {
+  const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const log = getService('log');
   const browser = getService('browser');
@@ -57,9 +58,9 @@ export default function ({ getService, getPageObjects }) {
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
+      await esArchiver.load('discover');
       // delete .kibana index and then wait for Kibana to re-create it
       await kibanaServer.uiSettings.replace({});
-      await PageObjects.settings.createIndexPattern();
       await kibanaServer.uiSettings.update({});
     });
 
diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js
index 2eb53508c2846..2d59d2ba57d5b 100644
--- a/test/functional/apps/management/_scripted_fields_filter.js
+++ b/test/functional/apps/management/_scripted_fields_filter.js
@@ -27,7 +27,9 @@ export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['settings']);
 
-  describe('filter scripted fields', function describeIndexTests() {
+  // this functionality is no longer functional as of 7.0 but still needs cleanup
+  // https://github.com/elastic/kibana/issues/74118
+  describe.skip('filter scripted fields', function describeIndexTests() {
     before(async function () {
       // delete .kibana index and then wait for Kibana to re-create it
       await browser.setWindowSize(1200, 800);

From 244ed04b249a3c0559cf0274ac07481596dc9bb5 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Mon, 10 Aug 2020 15:02:35 +0200
Subject: [PATCH 07/10] [Uptime] Fix full reloads while navigating to alert/ml
 (#73796)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/uptime/public/apps/uptime_app.tsx |  15 ++-
 .../__tests__/link_events.test.ts             | 102 ++++++++++++++++++
 .../__tests__/link_for_eui.test.tsx           |  77 +++++++++++++
 .../common/react_router_helpers/index.ts      |  12 +++
 .../react_router_helpers/link_events.ts       |  31 ++++++
 .../react_router_helpers/link_for_eui.tsx     |  74 +++++++++++++
 .../ml_integerations.test.tsx.snap            |   5 +-
 .../__snapshots__/ml_manage_job.test.tsx.snap |   5 +-
 .../components/monitor/ml/manage_ml_job.tsx   |   8 +-
 .../components/monitor/ml/translations.tsx    |   8 ++
 .../uptime/public/lib/__mocks__/index.ts      |   7 ++
 .../__mocks__/react_router_history.mock.ts    |  25 +++++
 .../uptime/public/pages/certificates.tsx      |   8 +-
 .../uptime/public/pages/page_header.tsx       |   9 +-
 .../plugins/uptime/public/pages/settings.tsx  |  10 +-
 .../__test__/get_histogram_interval.test.ts   |   4 +-
 16 files changed, 371 insertions(+), 29 deletions(-)
 create mode 100644 x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_events.test.ts
 create mode 100644 x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts
 create mode 100644 x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts
 create mode 100644 x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx
 create mode 100644 x-pack/plugins/uptime/public/lib/__mocks__/index.ts
 create mode 100644 x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts

diff --git a/x-pack/plugins/uptime/public/apps/uptime_app.tsx b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
index 41370f9fff492..1dc34b44b7c64 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_app.tsx
+++ b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
@@ -10,7 +10,10 @@ import React, { useEffect } from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { I18nStart, ChromeBreadcrumb, CoreStart } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import {
+  KibanaContextProvider,
+  RedirectAppLinks,
+} from '../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsSetup, ClientPluginsStart } from './plugin';
 import { UMUpdateBadge } from '../lib/lib';
 import {
@@ -103,10 +106,12 @@ const Application = (props: UptimeAppProps) => {
                     <UptimeStartupPluginsContextProvider {...startPlugins}>
                       <UptimeAlertsContextProvider>
                         <EuiPage className="app-wrapper-panel " data-test-subj="uptimeApp">
-                          <main>
-                            <UptimeAlertsFlyoutWrapper />
-                            <PageRouter />
-                          </main>
+                          <RedirectAppLinks application={core.application}>
+                            <main>
+                              <UptimeAlertsFlyoutWrapper />
+                              <PageRouter />
+                            </main>
+                          </RedirectAppLinks>
                         </EuiPage>
                       </UptimeAlertsContextProvider>
                     </UptimeStartupPluginsContextProvider>
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_events.test.ts b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_events.test.ts
new file mode 100644
index 0000000000000..3e857c7c20904
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_events.test.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { letBrowserHandleEvent } from '../index';
+
+describe('letBrowserHandleEvent', () => {
+  const event = {
+    defaultPrevented: false,
+    metaKey: false,
+    altKey: false,
+    ctrlKey: false,
+    shiftKey: false,
+    button: 0,
+    target: {
+      getAttribute: () => '_self',
+    },
+  } as any;
+
+  describe('the browser should handle the link when', () => {
+    it('default is prevented', () => {
+      expect(letBrowserHandleEvent({ ...event, defaultPrevented: true })).toBe(true);
+    });
+
+    it('is modified with metaKey', () => {
+      expect(letBrowserHandleEvent({ ...event, metaKey: true })).toBe(true);
+    });
+
+    it('is modified with altKey', () => {
+      expect(letBrowserHandleEvent({ ...event, altKey: true })).toBe(true);
+    });
+
+    it('is modified with ctrlKey', () => {
+      expect(letBrowserHandleEvent({ ...event, ctrlKey: true })).toBe(true);
+    });
+
+    it('is modified with shiftKey', () => {
+      expect(letBrowserHandleEvent({ ...event, shiftKey: true })).toBe(true);
+    });
+
+    it('it is not a left click event', () => {
+      expect(letBrowserHandleEvent({ ...event, button: 2 })).toBe(true);
+    });
+
+    it('the target is anything value other than _self', () => {
+      expect(
+        letBrowserHandleEvent({
+          ...event,
+          target: targetValue('_blank'),
+        })
+      ).toBe(true);
+    });
+  });
+
+  describe('the browser should NOT handle the link when', () => {
+    it('default is not prevented', () => {
+      expect(letBrowserHandleEvent({ ...event, defaultPrevented: false })).toBe(false);
+    });
+
+    it('is not modified', () => {
+      expect(
+        letBrowserHandleEvent({
+          ...event,
+          metaKey: false,
+          altKey: false,
+          ctrlKey: false,
+          shiftKey: false,
+        })
+      ).toBe(false);
+    });
+
+    it('it is a left click event', () => {
+      expect(letBrowserHandleEvent({ ...event, button: 0 })).toBe(false);
+    });
+
+    it('the target is a value of _self', () => {
+      expect(
+        letBrowserHandleEvent({
+          ...event,
+          target: targetValue('_self'),
+        })
+      ).toBe(false);
+    });
+
+    it('the target has no value', () => {
+      expect(
+        letBrowserHandleEvent({
+          ...event,
+          target: targetValue(null),
+        })
+      ).toBe(false);
+    });
+  });
+});
+
+const targetValue = (value: string | null) => {
+  return {
+    getAttribute: () => value,
+  };
+};
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
new file mode 100644
index 0000000000000..4a681f6fa60bf
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow, mount } from 'enzyme';
+import { EuiLink, EuiButton } from '@elastic/eui';
+
+import '../../../../lib/__mocks__/react_router_history.mock';
+
+import { ReactRouterEuiLink, ReactRouterEuiButton } from '../link_for_eui';
+import { mockHistory } from '../../../../lib/__mocks__';
+
+describe('EUI & React Router Component Helpers', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders', () => {
+    const wrapper = shallow(<ReactRouterEuiLink to="/" />);
+
+    expect(wrapper.find(EuiLink)).toHaveLength(1);
+  });
+
+  it('renders an EuiButton', () => {
+    const wrapper = shallow(<ReactRouterEuiButton to="/" />);
+
+    expect(wrapper.find(EuiButton)).toHaveLength(1);
+  });
+
+  it('passes down all ...rest props', () => {
+    const wrapper = shallow(<ReactRouterEuiLink to="/" data-test-subj="foo" external={true} />);
+    const link = wrapper.find(EuiLink);
+
+    expect(link.prop('external')).toEqual(true);
+    expect(link.prop('data-test-subj')).toEqual('foo');
+  });
+
+  it('renders with the correct href and onClick props', () => {
+    const wrapper = mount(<ReactRouterEuiLink to="/foo/bar" />);
+    const link = wrapper.find(EuiLink);
+
+    expect(link.prop('onClick')).toBeInstanceOf(Function);
+    expect(link.prop('href')).toEqual('/enterprise_search/foo/bar');
+    expect(mockHistory.createHref).toHaveBeenCalled();
+  });
+
+  describe('onClick', () => {
+    it('prevents default navigation and uses React Router history', () => {
+      const wrapper = mount(<ReactRouterEuiLink to="/bar/baz" />);
+
+      const simulatedEvent = {
+        button: 0,
+        target: { getAttribute: () => '_self' },
+        preventDefault: jest.fn(),
+      };
+      wrapper.find(EuiLink).simulate('click', simulatedEvent);
+
+      expect(simulatedEvent.preventDefault).toHaveBeenCalled();
+      expect(mockHistory.push).toHaveBeenCalled();
+    });
+
+    it('does not prevent default browser behavior on new tab/window clicks', () => {
+      const wrapper = mount(<ReactRouterEuiLink to="/bar/baz" />);
+
+      const simulatedEvent = {
+        shiftKey: true,
+        target: { getAttribute: () => '_blank' },
+      };
+      wrapper.find(EuiLink).simulate('click', simulatedEvent);
+
+      expect(mockHistory.push).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts b/x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts
new file mode 100644
index 0000000000000..a1885eaee4cbe
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { letBrowserHandleEvent } from './link_events';
+export {
+  ReactRouterEuiLink,
+  ReactRouterEuiButton,
+  ReactRouterEuiButtonEmpty,
+} from './link_for_eui';
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts
new file mode 100644
index 0000000000000..93da2ab71d952
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { MouseEvent } from 'react';
+
+/**
+ * Helper functions for determining which events we should
+ * let browsers handle natively, e.g. new tabs/windows
+ */
+
+type THandleEvent = (event: MouseEvent) => boolean;
+
+export const letBrowserHandleEvent: THandleEvent = (event) =>
+  event.defaultPrevented ||
+  isModifiedEvent(event) ||
+  !isLeftClickEvent(event) ||
+  isTargetBlank(event);
+
+const isModifiedEvent: THandleEvent = (event) =>
+  !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);
+
+const isLeftClickEvent: THandleEvent = (event) => event.button === 0;
+
+const isTargetBlank: THandleEvent = (event) => {
+  const element = event.target as HTMLElement;
+  const target = element.getAttribute('target');
+  return !!target && target !== '_self';
+};
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx
new file mode 100644
index 0000000000000..7adc8be4533bc
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_for_eui.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import {
+  EuiLink,
+  EuiButton,
+  EuiButtonProps,
+  EuiButtonEmptyProps,
+  EuiLinkAnchorProps,
+  EuiButtonEmpty,
+} from '@elastic/eui';
+
+import { letBrowserHandleEvent } from './link_events';
+
+/**
+ * Generates either an EuiLink or EuiButton with a React-Router-ified link
+ *
+ * Based off of EUI's recommendations for handling React Router:
+ * https://github.com/elastic/eui/blob/master/wiki/react-router.md#react-router-51
+ */
+
+interface IEuiReactRouterProps {
+  to: string;
+}
+
+export const ReactRouterHelperForEui: React.FC<IEuiReactRouterProps> = ({ to, children }) => {
+  const history = useHistory();
+
+  const onClick = (event: React.MouseEvent) => {
+    if (letBrowserHandleEvent(event)) return;
+
+    // Prevent regular link behavior, which causes a browser refresh.
+    event.preventDefault();
+
+    // Push the route to the history.
+    history.push(to);
+  };
+
+  // Generate the correct link href (with basename etc. accounted for)
+  const href = history.createHref({ pathname: to });
+
+  const reactRouterProps = { href, onClick };
+  return React.cloneElement(children as React.ReactElement, reactRouterProps);
+};
+
+type TEuiReactRouterLinkProps = EuiLinkAnchorProps & IEuiReactRouterProps;
+type TEuiReactRouterButtonProps = EuiButtonProps & IEuiReactRouterProps;
+type TEuiReactRouterButtonEmptyProps = EuiButtonEmptyProps & IEuiReactRouterProps;
+
+export const ReactRouterEuiLink: React.FC<TEuiReactRouterLinkProps> = ({ to, ...rest }) => (
+  <ReactRouterHelperForEui to={to}>
+    <EuiLink {...rest} />
+  </ReactRouterHelperForEui>
+);
+
+export const ReactRouterEuiButton: React.FC<TEuiReactRouterButtonProps> = ({ to, ...rest }) => (
+  <ReactRouterHelperForEui to={to}>
+    <EuiButton {...rest} />
+  </ReactRouterHelperForEui>
+);
+
+export const ReactRouterEuiButtonEmpty: React.FC<TEuiReactRouterButtonEmptyProps> = ({
+  to,
+  ...rest
+}) => (
+  <ReactRouterHelperForEui to={to}>
+    <EuiButtonEmpty {...rest} />
+  </ReactRouterHelperForEui>
+);
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
index 15f5c03512bf1..e7ad86f72dab6 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`ML Integrations renders without errors 1`] = `
     class="euiPopover__anchor"
   >
     <button
+      aria-label="You can enable anomaly detection job or if job is already there you can manage the job or alert."
       class="euiButton euiButton--primary euiButton--small"
       data-test-subj="uptimeEnableAnomalyBtn"
       type="button"
@@ -20,9 +21,7 @@ exports[`ML Integrations renders without errors 1`] = `
         />
         <span
           class="euiButton__text"
-        >
-          Enable anomaly detection
-        </span>
+        />
       </span>
     </button>
   </div>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
index fabe94763e07d..cc3417e09987e 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`Manage ML Job renders without errors 1`] = `
     class="euiPopover__anchor"
   >
     <button
+      aria-label="You can enable anomaly detection job or if job is already there you can manage the job or alert."
       class="euiButton euiButton--primary euiButton--small"
       data-test-subj="uptimeManageMLJobBtn"
       type="button"
@@ -20,9 +21,7 @@ exports[`Manage ML Job renders without errors 1`] = `
         />
         <span
           class="euiButton__text"
-        >
-          Anomaly detection
-        </span>
+        />
       </span>
     </button>
   </div>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
index 7a2899558891d..f4382b37b3d30 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
@@ -54,6 +54,10 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
   const deleteAnomalyAlert = () =>
     dispatch(deleteAlertAction.get({ alertId: anomalyAlert?.id as string }));
 
+  const showLoading = isMLJobCreating || isMLJobLoading;
+
+  const btnText = hasMLJob ? labels.ANOMALY_DETECTION : labels.ENABLE_ANOMALY_DETECTION;
+
   const button = (
     <EuiButton
       data-test-subj={hasMLJob ? 'uptimeManageMLJobBtn' : 'uptimeEnableAnomalyBtn'}
@@ -61,8 +65,9 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
       disabled={hasMLJob && !canDeleteMLJob}
       isLoading={isMLJobCreating || isMLJobLoading}
       size="s"
+      aria-label={labels.ENABLE_MANAGE_JOB}
     >
-      {hasMLJob ? labels.ANOMALY_DETECTION : labels.ENABLE_ANOMALY_DETECTION}
+      {showLoading ? '' : btnText}
     </EuiButton>
   );
 
@@ -79,7 +84,6 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
             monitorId,
             dateRange: { from: dateRangeStart, to: dateRangeEnd },
           }),
-          target: '_blank',
         },
         {
           name: anomalyAlert ? labels.DISABLE_ANOMALY_ALERT : labels.ENABLE_ANOMALY_ALERT,
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
index 90ebdf10a73f5..dfc912e6be9ee 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
@@ -162,3 +162,11 @@ export const START_TRAIL_DESC = i18n.translate(
       'In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.',
   }
 );
+
+export const ENABLE_MANAGE_JOB = i18n.translate(
+  'xpack.uptime.ml.enableAnomalyDetectionPanel.enable_or_manage_job',
+  {
+    defaultMessage:
+      'You can enable anomaly detection job or if job is already there you can manage the job or alert.',
+  }
+);
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/index.ts b/x-pack/plugins/uptime/public/lib/__mocks__/index.ts
new file mode 100644
index 0000000000000..45ef5787927e1
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/__mocks__/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { mockHistory } from './react_router_history.mock';
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts b/x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts
new file mode 100644
index 0000000000000..fd422465d87f1
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * NOTE: This variable name MUST start with 'mock*' in order for
+ * Jest to accept its use within a jest.mock()
+ */
+export const mockHistory = {
+  createHref: jest.fn(({ pathname }) => `/enterprise_search${pathname}`),
+  push: jest.fn(),
+  location: {
+    pathname: '/current-path',
+  },
+};
+
+jest.mock('react-router-dom', () => ({
+  useHistory: jest.fn(() => mockHistory),
+}));
+
+/**
+ * For example usage, @see public/applications/shared/react_router_helpers/eui_link.test.tsx
+ */
diff --git a/x-pack/plugins/uptime/public/pages/certificates.tsx b/x-pack/plugins/uptime/public/pages/certificates.tsx
index e46d228c6d21f..a524ce6ba9b71 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.tsx
+++ b/x-pack/plugins/uptime/public/pages/certificates.tsx
@@ -29,6 +29,7 @@ import { certificatesSelector, getCertificatesAction } from '../state/certificat
 import { CertificateList, CertificateSearch, CertSort } from '../components/certificates';
 import { ToggleAlertFlyoutButton } from '../components/overview/alerts/alerts_containers';
 import { CLIENT_ALERT_TYPES } from '../../common/constants/alerts';
+import { ReactRouterEuiButtonEmpty } from '../components/common/react_router_helpers';
 
 const DEFAULT_PAGE_SIZE = 10;
 const LOCAL_STORAGE_KEY = 'xpack.uptime.certList.pageSize';
@@ -79,15 +80,16 @@ export const CertificatesPage: React.FC = () => {
     <>
       <EuiFlexGroup responsive={false} gutterSize="s">
         <EuiFlexItem grow={false} style={{ marginRight: 'auto', alignSelf: 'center' }}>
-          <EuiButtonEmpty
+          <ReactRouterEuiButtonEmpty
             color="primary"
             data-test-subj="uptimeCertificatesToOverviewLink"
-            href={history.createHref({ pathname: OVERVIEW_ROUTE })}
+            to={OVERVIEW_ROUTE}
             iconType="arrowLeft"
             size="s"
+            aria-label={labels.RETURN_TO_OVERVIEW}
           >
             {labels.RETURN_TO_OVERVIEW}
-          </EuiButtonEmpty>
+          </ReactRouterEuiButtonEmpty>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <ToggleAlertFlyoutButton alertOptions={[CLIENT_ALERT_TYPES.TLS]} />
diff --git a/x-pack/plugins/uptime/public/pages/page_header.tsx b/x-pack/plugins/uptime/public/pages/page_header.tsx
index 16279a63b5f40..325d82696d47c 100644
--- a/x-pack/plugins/uptime/public/pages/page_header.tsx
+++ b/x-pack/plugins/uptime/public/pages/page_header.tsx
@@ -7,12 +7,12 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiSpacer, EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 import { UptimeDatePicker } from '../components/common/uptime_date_picker';
 import { SETTINGS_ROUTE } from '../../common/constants';
 import { ToggleAlertFlyoutButton } from '../components/overview/alerts/alerts_containers';
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { ReactRouterEuiButtonEmpty } from '../components/common/react_router_helpers';
 
 interface PageHeaderProps {
   headingText: string | JSX.Element;
@@ -58,7 +58,6 @@ export const PageHeader = React.memo(
       ) : null;
 
     const kibana = useKibana();
-    const history = useHistory();
 
     const extraLinkComponents = !extraLinks ? null : (
       <EuiFlexGroup alignItems="flexEnd" responsive={false}>
@@ -66,13 +65,13 @@ export const PageHeader = React.memo(
           <ToggleAlertFlyoutButton />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiButtonEmpty
+          <ReactRouterEuiButtonEmpty
             data-test-subj="settings-page-link"
             iconType="gear"
-            href={history.createHref({ pathname: SETTINGS_ROUTE })}
+            to={SETTINGS_ROUTE}
           >
             {SETTINGS_LINK_TEXT}
-          </EuiButtonEmpty>
+          </ReactRouterEuiButtonEmpty>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiButtonEmpty
diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx
index 89c12d0efdac1..83a465af55d9c 100644
--- a/x-pack/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/uptime/public/pages/settings.tsx
@@ -17,7 +17,6 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
 import { selectDynamicSettings } from '../state/selectors';
 import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings';
 import { DynamicSettings } from '../../common/runtime_types';
@@ -34,6 +33,7 @@ import {
   VALUE_MUST_BE_GREATER_THAN_ZERO,
   VALUE_MUST_BE_AN_INTEGER,
 } from '../../common/translations';
+import { ReactRouterEuiButtonEmpty } from '../components/common/react_router_helpers';
 
 interface SettingsPageFieldErrors {
   heartbeatIndices: string | '';
@@ -143,19 +143,17 @@ export const SettingsPage: React.FC = () => {
     </>
   );
 
-  const history = useHistory();
-
   return (
     <>
-      <EuiButtonEmpty
+      <ReactRouterEuiButtonEmpty
         color="primary"
         data-test-subj="uptimeSettingsToOverviewLink"
         iconType="arrowLeft"
-        href={history.createHref({ pathname: OVERVIEW_ROUTE })}
+        to={OVERVIEW_ROUTE}
         size="s"
       >
         {Translations.settings.returnToOverviewLinkLabel}
-      </EuiButtonEmpty>
+      </ReactRouterEuiButtonEmpty>
       <EuiSpacer size="s" />
       <EuiPanel>
         <EuiFlexGroup>
diff --git a/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts b/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
index bddca1b863ce4..09b857f37e1df 100644
--- a/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
+++ b/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
@@ -10,11 +10,11 @@ import { assertCloseTo } from '../assert_close_to';
 describe('getHistogramInterval', () => {
   it('specifies the interval necessary to divide a given timespan into equal buckets, rounded to the nearest integer, expressed in ms', () => {
     const interval = getHistogramInterval('now-15m', 'now', 10);
-    assertCloseTo(interval, 90000, 10);
+    assertCloseTo(interval, 90000, 20);
   });
 
   it('will supply a default constant value for bucketCount when none is provided', () => {
     const interval = getHistogramInterval('now-15m', 'now');
-    assertCloseTo(interval, 36000, 10);
+    assertCloseTo(interval, 36000, 20);
   });
 });

From c1b55d57399ded6dbca4415db9077dda7cfccbc9 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Mon, 10 Aug 2020 15:06:58 +0200
Subject: [PATCH 08/10] [Lens] Clear out all attribute properties before
 updating (#74483)

---
 .../persistence/saved_object_store.test.ts    | 47 +++++++++++++------
 .../public/persistence/saved_object_store.ts  | 44 +++++++++--------
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
index f7caac6549389..f8f8d889233a7 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
@@ -4,19 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { SavedObjectsClientContract, SavedObjectsBulkUpdateObject } from 'kibana/public';
 import { SavedObjectIndexStore } from './saved_object_store';
 
 describe('LensStore', () => {
   function testStore(testId?: string) {
     const client = {
       create: jest.fn(() => Promise.resolve({ id: testId || 'testid' })),
-      update: jest.fn((_type: string, id: string) => Promise.resolve({ id })),
+      bulkUpdate: jest.fn(([{ id }]: SavedObjectsBulkUpdateObject[]) =>
+        Promise.resolve({ savedObjects: [{ id }, { id }] })
+      ),
       get: jest.fn(),
     };
 
     return {
       client,
-      store: new SavedObjectIndexStore(client),
+      store: new SavedObjectIndexStore((client as unknown) as SavedObjectsClientContract),
     };
   }
 
@@ -108,19 +111,35 @@ describe('LensStore', () => {
         },
       });
 
-      expect(client.update).toHaveBeenCalledTimes(1);
-      expect(client.update).toHaveBeenCalledWith('lens', 'Gandalf', {
-        title: 'Even the very wise cannot see all ends.',
-        visualizationType: 'line',
-        expression: '',
-        state: {
-          datasourceMetaData: { filterableIndexPatterns: [] },
-          datasourceStates: { indexpattern: { type: 'index_pattern', indexPattern: 'lotr' } },
-          visualization: { gear: ['staff', 'pointy hat'] },
-          query: { query: '', language: 'lucene' },
-          filters: [],
+      expect(client.bulkUpdate).toHaveBeenCalledTimes(1);
+      expect(client.bulkUpdate).toHaveBeenCalledWith([
+        {
+          type: 'lens',
+          id: 'Gandalf',
+          attributes: {
+            title: null,
+            visualizationType: null,
+            expression: null,
+            state: null,
+          },
         },
-      });
+        {
+          type: 'lens',
+          id: 'Gandalf',
+          attributes: {
+            title: 'Even the very wise cannot see all ends.',
+            visualizationType: 'line',
+            expression: '',
+            state: {
+              datasourceMetaData: { filterableIndexPatterns: [] },
+              datasourceStates: { indexpattern: { type: 'index_pattern', indexPattern: 'lotr' } },
+              visualization: { gear: ['staff', 'pointy hat'] },
+              query: { query: '', language: 'lucene' },
+              filters: [],
+            },
+          },
+        },
+      ]);
     });
   });
 
diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
index af90634874fb1..59ead53956a8d 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectAttributes } from 'kibana/server';
+import { SavedObjectAttributes, SavedObjectsClientContract } from 'kibana/public';
 import { Query, Filter } from '../../../../../src/plugins/data/public';
 
 export interface Document {
@@ -27,20 +27,6 @@ export interface Document {
 
 export const DOC_TYPE = 'lens';
 
-interface SavedObjectClient {
-  create: (type: string, object: SavedObjectAttributes) => Promise<{ id: string }>;
-  update: (type: string, id: string, object: SavedObjectAttributes) => Promise<{ id: string }>;
-  get: (
-    type: string,
-    id: string
-  ) => Promise<{
-    id: string;
-    type: string;
-    attributes: SavedObjectAttributes;
-    error?: { statusCode: number; message: string };
-  }>;
-}
-
 export interface DocumentSaver {
   save: (vis: Document) => Promise<{ id: string }>;
 }
@@ -52,9 +38,9 @@ export interface DocumentLoader {
 export type SavedObjectStore = DocumentLoader & DocumentSaver;
 
 export class SavedObjectIndexStore implements SavedObjectStore {
-  private client: SavedObjectClient;
+  private client: SavedObjectsClientContract;
 
-  constructor(client: SavedObjectClient) {
+  constructor(client: SavedObjectsClientContract) {
     this.client = client;
   }
 
@@ -63,13 +49,33 @@ export class SavedObjectIndexStore implements SavedObjectStore {
     // TODO: SavedObjectAttributes should support this kind of object,
     // remove this workaround when SavedObjectAttributes is updated.
     const attributes = (rest as unknown) as SavedObjectAttributes;
+
     const result = await (id
-      ? this.client.update(DOC_TYPE, id, attributes)
+      ? this.safeUpdate(id, attributes)
       : this.client.create(DOC_TYPE, attributes));
 
     return { ...vis, id: result.id };
   }
 
+  // As Lens is using an object to store its attributes, using the update API
+  // will merge the new attribute object with the old one, not overwriting deleted
+  // keys. As Lens is using objects as maps in various places, this is a problem because
+  // deleted subtrees make it back into the object after a load.
+  // This function fixes this by doing two updates - one to empty out the document setting
+  // every key to null, and a second one to load the new content.
+  private async safeUpdate(id: string, attributes: SavedObjectAttributes) {
+    const resetAttributes: SavedObjectAttributes = {};
+    Object.keys(attributes).forEach((key) => {
+      resetAttributes[key] = null;
+    });
+    return (
+      await this.client.bulkUpdate([
+        { type: DOC_TYPE, id, attributes: resetAttributes },
+        { type: DOC_TYPE, id, attributes },
+      ])
+    ).savedObjects[1];
+  }
+
   async load(id: string): Promise<Document> {
     const { type, attributes, error } = await this.client.get(DOC_TYPE, id);
 
@@ -78,7 +84,7 @@ export class SavedObjectIndexStore implements SavedObjectStore {
     }
 
     return {
-      ...attributes,
+      ...(attributes as SavedObjectAttributes),
       id,
       type,
     } as Document;

From 23adb256bb4799f61e8ae9914e2ee8231e7b7598 Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Mon, 10 Aug 2020 16:29:29 +0300
Subject: [PATCH 09/10] [i18n] revert reverted changes (#74633)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/dev/i18n/integrate_locale_files.test.ts |  3 ++-
 src/dev/i18n/integrate_locale_files.ts      | 21 +++++++++++++++++++-
 src/dev/i18n/tasks/check_compatibility.ts   |  4 +++-
 src/dev/i18n/utils.js                       | 22 +++++++++++++++++++++
 src/dev/run_i18n_check.ts                   |  5 ++++-
 src/dev/run_i18n_integrate.ts               |  7 ++++---
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/dev/i18n/integrate_locale_files.test.ts b/src/dev/i18n/integrate_locale_files.test.ts
index 7ff1d87f1bc55..3bd3dc61c044f 100644
--- a/src/dev/i18n/integrate_locale_files.test.ts
+++ b/src/dev/i18n/integrate_locale_files.test.ts
@@ -21,7 +21,7 @@ import { mockMakeDirAsync, mockWriteFileAsync } from './integrate_locale_files.t
 
 import path from 'path';
 import { integrateLocaleFiles, verifyMessages } from './integrate_locale_files';
-// @ts-ignore
+// @ts-expect-error
 import { normalizePath } from './utils';
 
 const localePath = path.resolve(__dirname, '__fixtures__', 'integrate_locale_files', 'fr.json');
@@ -36,6 +36,7 @@ const defaultIntegrateOptions = {
   sourceFileName: localePath,
   dryRun: false,
   ignoreIncompatible: false,
+  ignoreMalformed: false,
   ignoreMissing: false,
   ignoreUnused: false,
   config: {
diff --git a/src/dev/i18n/integrate_locale_files.ts b/src/dev/i18n/integrate_locale_files.ts
index d8ccccca15559..f9cd6dd1971c7 100644
--- a/src/dev/i18n/integrate_locale_files.ts
+++ b/src/dev/i18n/integrate_locale_files.ts
@@ -31,7 +31,8 @@ import {
   normalizePath,
   readFileAsync,
   writeFileAsync,
-  // @ts-ignore
+  verifyICUMessage,
+  // @ts-expect-error
 } from './utils';
 
 import { I18nConfig } from './config';
@@ -41,6 +42,7 @@ export interface IntegrateOptions {
   sourceFileName: string;
   targetFileName?: string;
   dryRun: boolean;
+  ignoreMalformed: boolean;
   ignoreIncompatible: boolean;
   ignoreUnused: boolean;
   ignoreMissing: boolean;
@@ -105,6 +107,23 @@ export function verifyMessages(
     }
   }
 
+  for (const messageId of localizedMessagesIds) {
+    const defaultMessage = defaultMessagesMap.get(messageId);
+    if (defaultMessage) {
+      try {
+        const message = localizedMessagesMap.get(messageId)!;
+        verifyICUMessage(message);
+      } catch (err) {
+        if (options.ignoreMalformed) {
+          localizedMessagesMap.delete(messageId);
+          options.log.warning(`Malformed translation ignored (${messageId}): ${err}`);
+        } else {
+          errorMessage += `\nMalformed translation (${messageId}): ${err}\n`;
+        }
+      }
+    }
+  }
+
   if (errorMessage) {
     throw createFailError(errorMessage);
   }
diff --git a/src/dev/i18n/tasks/check_compatibility.ts b/src/dev/i18n/tasks/check_compatibility.ts
index 5900bf5aff252..afaf3cd875a8a 100644
--- a/src/dev/i18n/tasks/check_compatibility.ts
+++ b/src/dev/i18n/tasks/check_compatibility.ts
@@ -22,13 +22,14 @@ import { integrateLocaleFiles, I18nConfig } from '..';
 
 export interface I18nFlags {
   fix: boolean;
+  ignoreMalformed: boolean;
   ignoreIncompatible: boolean;
   ignoreUnused: boolean;
   ignoreMissing: boolean;
 }
 
 export function checkCompatibility(config: I18nConfig, flags: I18nFlags, log: ToolingLog) {
-  const { fix, ignoreIncompatible, ignoreUnused, ignoreMissing } = flags;
+  const { fix, ignoreIncompatible, ignoreUnused, ignoreMalformed, ignoreMissing } = flags;
   return config.translations.map((translationsPath) => ({
     task: async ({ messages }: { messages: Map<string, { message: string }> }) => {
       // If `fix` is set we should try apply all possible fixes and override translations file.
@@ -37,6 +38,7 @@ export function checkCompatibility(config: I18nConfig, flags: I18nFlags, log: To
         ignoreIncompatible: fix || ignoreIncompatible,
         ignoreUnused: fix || ignoreUnused,
         ignoreMissing: fix || ignoreMissing,
+        ignoreMalformed: fix || ignoreMalformed,
         sourceFileName: translationsPath,
         targetFileName: fix ? translationsPath : undefined,
         config,
diff --git a/src/dev/i18n/utils.js b/src/dev/i18n/utils.js
index 1d1c3118e0852..11a002fdbf4a8 100644
--- a/src/dev/i18n/utils.js
+++ b/src/dev/i18n/utils.js
@@ -208,6 +208,28 @@ export function checkValuesProperty(prefixedValuesKeys, defaultMessage, messageI
   }
 }
 
+/**
+ * Verifies valid ICU message.
+ * @param message ICU message.
+ * @param messageId ICU message id
+ * @returns {undefined}
+ */
+export function verifyICUMessage(message) {
+  try {
+    parser.parse(message);
+  } catch (error) {
+    if (error.name === 'SyntaxError') {
+      const errorWithContext = createParserErrorMessage(message, {
+        loc: {
+          line: error.location.start.line,
+          column: error.location.start.column - 1,
+        },
+        message: error.message,
+      });
+      throw errorWithContext;
+    }
+  }
+}
 /**
  * Extracts value references from the ICU message.
  * @param message ICU message.
diff --git a/src/dev/run_i18n_check.ts b/src/dev/run_i18n_check.ts
index 97ea988b1de3a..70eeedac2b8b6 100644
--- a/src/dev/run_i18n_check.ts
+++ b/src/dev/run_i18n_check.ts
@@ -36,6 +36,7 @@ run(
   async ({
     flags: {
       'ignore-incompatible': ignoreIncompatible,
+      'ignore-malformed': ignoreMalformed,
       'ignore-missing': ignoreMissing,
       'ignore-unused': ignoreUnused,
       'include-config': includeConfig,
@@ -48,12 +49,13 @@ run(
       fix &&
       (ignoreIncompatible !== undefined ||
         ignoreUnused !== undefined ||
+        ignoreMalformed !== undefined ||
         ignoreMissing !== undefined)
     ) {
       throw createFailError(
         `${chalk.white.bgRed(
           ' I18N ERROR '
-        )} none of the --ignore-incompatible, --ignore-unused or --ignore-missing is allowed when --fix is set.`
+        )} none of the --ignore-incompatible, --ignore-malformed, --ignore-unused or --ignore-missing is allowed when --fix is set.`
       );
     }
 
@@ -99,6 +101,7 @@ run(
               checkCompatibility(
                 config,
                 {
+                  ignoreMalformed: !!ignoreMalformed,
                   ignoreIncompatible: !!ignoreIncompatible,
                   ignoreUnused: !!ignoreUnused,
                   ignoreMissing: !!ignoreMissing,
diff --git a/src/dev/run_i18n_integrate.ts b/src/dev/run_i18n_integrate.ts
index ac1e957adfc99..25c3ea32783aa 100644
--- a/src/dev/run_i18n_integrate.ts
+++ b/src/dev/run_i18n_integrate.ts
@@ -31,6 +31,7 @@ run(
       'ignore-incompatible': ignoreIncompatible = false,
       'ignore-missing': ignoreMissing = false,
       'ignore-unused': ignoreUnused = false,
+      'ignore-malformed': ignoreMalformed = false,
       'include-config': includeConfig,
       path,
       source,
@@ -66,12 +67,13 @@ run(
       typeof ignoreIncompatible !== 'boolean' ||
       typeof ignoreUnused !== 'boolean' ||
       typeof ignoreMissing !== 'boolean' ||
+      typeof ignoreMalformed !== 'boolean' ||
       typeof dryRun !== 'boolean'
     ) {
       throw createFailError(
         `${chalk.white.bgRed(
           ' I18N ERROR '
-        )} --ignore-incompatible, --ignore-unused, --ignore-missing, and --dry-run can't have values`
+        )} --ignore-incompatible, --ignore-unused, --ignore-malformed, --ignore-missing, and --dry-run can't have values`
       );
     }
 
@@ -97,6 +99,7 @@ run(
             ignoreIncompatible,
             ignoreUnused,
             ignoreMissing,
+            ignoreMalformed,
             config,
             log,
           });
@@ -108,7 +111,6 @@ run(
       const reporter = new ErrorReporter();
       const messages: Map<string, { message: string }> = new Map();
       await list.run({ messages, reporter });
-      process.exitCode = 0;
     } catch (error) {
       process.exitCode = 1;
       if (error instanceof ErrorReporter) {
@@ -118,7 +120,6 @@ run(
         log.error(error);
       }
     }
-    process.exit();
   },
   {
     flags: {

From 708ba4ce4c5862f7be474cd61abc878caa3ef2ab Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Mon, 10 Aug 2020 08:17:04 -0600
Subject: [PATCH 10/10] [App Arch]: remove legacy karma tests (#74599)

---
 .../public/storage/__tests__/storage.js       | 124 ------------------
 .../public/storage/storage.test.ts            | 109 +++++++++++++++
 ...gauge_objs.js => vis_update_state.stub.js} |   0
 .../public/legacy/vis_update_state.test.js    |   2 +-
 4 files changed, 110 insertions(+), 125 deletions(-)
 delete mode 100644 src/plugins/kibana_utils/public/storage/__tests__/storage.js
 create mode 100644 src/plugins/kibana_utils/public/storage/storage.test.ts
 rename src/plugins/visualizations/public/legacy/{__tests__/vis_update_objs/gauge_objs.js => vis_update_state.stub.js} (100%)

diff --git a/src/plugins/kibana_utils/public/storage/__tests__/storage.js b/src/plugins/kibana_utils/public/storage/__tests__/storage.js
deleted file mode 100644
index 073ed275b9aac..0000000000000
--- a/src/plugins/kibana_utils/public/storage/__tests__/storage.js
+++ /dev/null
@@ -1,124 +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 sinon from 'sinon';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import '..';
-
-let storage;
-let $window;
-const payload = { first: 'john', last: 'smith' };
-
-function init() {
-  ngMock.module('kibana/storage', function ($provide) {
-    // mock $window.localStorage for storage
-    $provide.value('$window', {
-      localStorage: {
-        getItem: sinon.stub(),
-        setItem: sinon.spy(),
-        removeItem: sinon.spy(),
-        clear: sinon.spy(),
-      },
-    });
-  });
-
-  ngMock.inject(function ($injector) {
-    storage = $injector.get('localStorage');
-    $window = $injector.get('$window');
-  });
-}
-
-describe('StorageService', function () {
-  beforeEach(function () {
-    init();
-  });
-
-  describe('expected API', function () {
-    it('should have expected methods', function () {
-      expect(storage.get).to.be.a('function');
-      expect(storage.set).to.be.a('function');
-      expect(storage.remove).to.be.a('function');
-      expect(storage.clear).to.be.a('function');
-    });
-  });
-
-  describe('call behavior', function () {
-    it('should call getItem on the store', function () {
-      storage.get('name');
-
-      expect($window.localStorage.getItem.callCount).to.equal(1);
-    });
-
-    it('should call setItem on the store', function () {
-      storage.set('name', 'john smith');
-
-      expect($window.localStorage.setItem.callCount).to.equal(1);
-    });
-
-    it('should call removeItem on the store', function () {
-      storage.remove('name');
-
-      expect($window.localStorage.removeItem.callCount).to.equal(1);
-    });
-
-    it('should call clear on the store', function () {
-      storage.clear();
-
-      expect($window.localStorage.clear.callCount).to.equal(1);
-    });
-  });
-
-  describe('json data', function () {
-    it('should parse JSON when reading from the store', function () {
-      const getItem = $window.localStorage.getItem;
-      getItem.returns(JSON.stringify(payload));
-
-      const data = storage.get('name');
-      expect(data).to.eql(payload);
-    });
-
-    it('should write JSON string to the store', function () {
-      const setItem = $window.localStorage.setItem;
-      const key = 'name';
-      const value = payload;
-
-      storage.set(key, value);
-
-      const call = setItem.getCall(0);
-      expect(call.args[0]).to.equal(key);
-      expect(call.args[1]).to.equal(JSON.stringify(value));
-    });
-  });
-
-  describe('expected responses', function () {
-    it('should return null when not exists', function () {
-      const data = storage.get('notexists');
-      expect(data).to.equal(null);
-    });
-
-    it('should return null when invalid JSON', function () {
-      const getItem = $window.localStorage.getItem;
-      getItem.returns('not: json');
-
-      const data = storage.get('name');
-      expect(data).to.equal(null);
-    });
-  });
-});
diff --git a/src/plugins/kibana_utils/public/storage/storage.test.ts b/src/plugins/kibana_utils/public/storage/storage.test.ts
new file mode 100644
index 0000000000000..8c5d3d11a21fe
--- /dev/null
+++ b/src/plugins/kibana_utils/public/storage/storage.test.ts
@@ -0,0 +1,109 @@
+/*
+ * 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 { Storage } from './storage';
+import { IStorage, IStorageWrapper } from './types';
+
+const payload = { first: 'john', last: 'smith' };
+const createMockStore = (): MockedKeys<IStorage> => {
+  let store: Record<string, any> = {};
+  return {
+    getItem: jest.fn().mockImplementation((key) => store[key]),
+    setItem: jest.fn().mockImplementation((key, value) => (store[key] = value)),
+    removeItem: jest.fn().mockImplementation((key: string) => delete store[key]),
+    clear: jest.fn().mockImplementation(() => (store = {})),
+  };
+};
+
+describe('StorageService', () => {
+  let storage: IStorageWrapper;
+  let mockStore: MockedKeys<IStorage>;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    mockStore = createMockStore();
+    storage = new Storage(mockStore);
+  });
+
+  describe('expected API', () => {
+    test('should have expected methods', () => {
+      expect(typeof storage.get).toBe('function');
+      expect(typeof storage.set).toBe('function');
+      expect(typeof storage.remove).toBe('function');
+      expect(typeof storage.clear).toBe('function');
+    });
+  });
+
+  describe('call behavior', () => {
+    test('should call getItem on the store', () => {
+      storage.get('name');
+
+      expect(mockStore.getItem).toHaveBeenCalledTimes(1);
+    });
+
+    test('should call setItem on the store', () => {
+      storage.set('name', 'john smith');
+
+      expect(mockStore.setItem).toHaveBeenCalledTimes(1);
+    });
+
+    test('should call removeItem on the store', () => {
+      storage.remove('name');
+
+      expect(mockStore.removeItem).toHaveBeenCalledTimes(1);
+    });
+
+    test('should call clear on the store', () => {
+      storage.clear();
+
+      expect(mockStore.clear).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('json data', () => {
+    test('should parse JSON when reading from the store', () => {
+      mockStore.getItem = jest.fn().mockImplementationOnce(() => JSON.stringify(payload));
+
+      const data = storage.get('name');
+      expect(data).toEqual(payload);
+    });
+
+    test('should write JSON string to the store', () => {
+      const key = 'name';
+      const value = payload;
+
+      storage.set(key, value);
+      expect(mockStore.setItem).toHaveBeenCalledWith(key, JSON.stringify(value));
+    });
+  });
+
+  describe('expected responses', () => {
+    test('should return null when not exists', () => {
+      const data = storage.get('notexists');
+      expect(data).toBe(null);
+    });
+
+    test('should return null when invalid JSON', () => {
+      mockStore.getItem = jest.fn().mockImplementationOnce(() => 'not: json');
+
+      const data = storage.get('name');
+      expect(data).toBe(null);
+    });
+  });
+});
diff --git a/src/plugins/visualizations/public/legacy/__tests__/vis_update_objs/gauge_objs.js b/src/plugins/visualizations/public/legacy/vis_update_state.stub.js
similarity index 100%
rename from src/plugins/visualizations/public/legacy/__tests__/vis_update_objs/gauge_objs.js
rename to src/plugins/visualizations/public/legacy/vis_update_state.stub.js
diff --git a/src/plugins/visualizations/public/legacy/vis_update_state.test.js b/src/plugins/visualizations/public/legacy/vis_update_state.test.js
index 7ddf0cc6e33e1..d0a735fbacdc2 100644
--- a/src/plugins/visualizations/public/legacy/vis_update_state.test.js
+++ b/src/plugins/visualizations/public/legacy/vis_update_state.test.js
@@ -21,7 +21,7 @@ import _ from 'lodash';
 import { updateOldState } from './vis_update_state';
 
 // eslint-disable-next-line camelcase
-import { pre_6_1, since_6_1 } from './__tests__/vis_update_objs/gauge_objs';
+import { pre_6_1, since_6_1 } from './vis_update_state.stub';
 
 function watchForChanges(obj) {
   const originalObject = _.cloneDeep(obj);